Merge pull request #14 from jgiannuzzi/longstring-toBytes

Fix toBytes regression
LudovicRousseau · Oct 9, 2015 · 680e400 · 680e400
2 parents 11502a1 + b7dc50a
commit 680e400
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/smartcard/util/__init__.py b/smartcard/util/__init__.py
@@ -97,7 +97,7 @@ def toBytes(bytestring):
     >>> toBytes("3B6500   009C1101  0103")
     [59, 101, 0, 0, 156, 17, 1, 1, 3]
     """
-    packedstring = bytestring.replace(' ', '').replace('	','')
+    packedstring = bytestring.replace(' ', '').replace('	','').replace('\n', '')
     try:
         return list(map(lambda x: int(''.join(x), 16), zip(*[iter(packedstring)] * 2)))
     except KeyError:

diff --git a/test/test_util.py b/test/test_util.py
@@ -21,6 +21,12 @@ def test_toBytes(self):
         data_in = "3B6500   009C1101  0103"
         self.assertEqual(toBytes(data_in), data_out)
 
+        data_in = '''
+                    3B 65 00
+                    00 9C 11 01
+                    01 03
+                  '''
+        self.assertEqual(toBytes(data_in), data_out)
 
     def test_padd(self):
         data_in = toBytes("3B 65 00 00 9C 11 01 01 03")