From 54bfe289362e4ce0cd68bfbe3cebf38073b65c48 Mon Sep 17 00:00:00 2001
From: Chris Halls <halls.chris@gmail.com>
Date: Wed, 7 Jan 2015 13:28:49 -0200
Subject: [PATCH 1/2] [FIX] uk_hsbc statement import was not parsing detail
 lines

Fixed a problem with a recent change to the regexp string causing it
to no longer match against statement lines due to backslash.

Also fixed testing code when running from the command line
---
 account_banking_uk_hsbc/mt940_parser.py | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/account_banking_uk_hsbc/mt940_parser.py b/account_banking_uk_hsbc/mt940_parser.py
index 65449f8c0..cd880f00f 100644
--- a/account_banking_uk_hsbc/mt940_parser.py
+++ b/account_banking_uk_hsbc/mt940_parser.py
@@ -50,18 +50,18 @@ class HSBCParser(object):
                            r"(?P<startingbalance>[\d,]{1,15})")
 
         # Transaction
-        recparse["61"] = r"""\
-:(?P<recordid>61):\
-(?P<valuedate>\d{6})(?P<bookingdate>\d{4})?\
-(?P<creditmarker>R?[CD])\
-(?P<currency>[A-Z])?\
-(?P<amount>[\d,]{1,15})\
-(?P<bookingcode>[A-Z][A-Z0-9]{3})\
-(?P<custrefno>[%(ebcdic)s]{1,16})\
-(?://)\
-(?P<bankref>[%(ebcdic)s]{1,16})?\
-(?:\n(?P<furtherinfo>[%(ebcdic)s]))?\
-""" % (patterns)
+        recparse["61"] = (r"""
+:(?P<recordid>61):
+(?P<valuedate>\d{6})(?P<bookingdate>\d{4})?
+(?P<creditmarker>R?[CD])
+(?P<currency>[A-Z])?
+(?P<amount>[\d,]{1,15})
+(?P<bookingcode>[A-Z][A-Z0-9]{3})
+(?P<custrefno>[%(ebcdic)s]{1,16})
+(?://)
+(?P<bankref>[%(ebcdic)s]{1,16})?
+(?:\n(?P<furtherinfo>[%(ebcdic)s]))?
+""" % (patterns)).replace('\n','')
 
         # Further info
         recparse["86"] = (r":(?P<recordid>86):"
@@ -156,7 +156,7 @@ class HSBCParser(object):
 
 def parse_file(filename):
     with open(filename, "r") as hsbcfile:
-        HSBCParser().parse(hsbcfile.readlines())
+        HSBCParser().parse(None, hsbcfile.readlines())
 
 
 def main():

From 5de112de8dc0e547af283a73e25d48554255dd2a Mon Sep 17 00:00:00 2001
From: Chris Halls <halls.chris@gmail.com>
Date: Mon, 19 Jan 2015 12:00:54 -0200
Subject: [PATCH 2/2] [PEP8] Add a space after comma
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks Stéphane Bidoul for the feedback
---
 account_banking_uk_hsbc/mt940_parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_banking_uk_hsbc/mt940_parser.py b/account_banking_uk_hsbc/mt940_parser.py
index cd880f00f..9735ddd88 100644
--- a/account_banking_uk_hsbc/mt940_parser.py
+++ b/account_banking_uk_hsbc/mt940_parser.py
@@ -61,7 +61,7 @@ class HSBCParser(object):
 (?://)
 (?P<bankref>[%(ebcdic)s]{1,16})?
 (?:\n(?P<furtherinfo>[%(ebcdic)s]))?
-""" % (patterns)).replace('\n','')
+""" % (patterns)).replace('\n', '')
 
         # Further info
         recparse["86"] = (r":(?P<recordid>86):"