Merge pull request #195 from iraf-community/issue194

Fix parsing integers with defined length

Author: olebole

pyraf/scanf.py

@@ -40,14 +40,6 @@
 
 DEBUG = False
 
-def sint(s):
-    if s.startswith("0o"):
-        return int(s[2:], 8)
-    elif s.startswith("0x"):
-        return int(s[2:], 16)
-    else:
-        return int(s)
-
 # As you can probably see it is relatively easy to add more format types.
 # Make sure you add a second entry for each new item that adds the extra
 #   few characters needed to handle the field ommision.
@@ -68,32 +60,26 @@ def sint(s):
         (r"%\[([^\]]+)\]", r"([%s]+)", lambda x:x),
         (r"%\*\[([^\]]+)\]", r"(?:[%s]+)", None),
 
-        (r"%l?[dil]", r"([+-]?(?:0o[0-7]+|0x[\da-fA-F]+|\d+))", sint),
-        (r"%\*l?[dil]", r"(?:[+-]?0o[0-7]+|0x[\da-fA-F]+|\d+)", None),
-
-        (r"%(\d+)l?[dil]", r"([+-]?(?:0o[0-7]+|0x[\da-fA-F]+|\d+)", sint),
-        (r"%\*(\d+)l?[dil]", r"(?:[+-]?(?:0o[0-7]+|0x[\da-fA-F]+|\d+)", None),
-
-        (r"%l?u", r"(\d+)", int),
-        (r"%\*l?u", r"(?:\d+)", None),
+        (r"%l?d", r"([+-]?\d+)", int),
+        (r"%\*l?d", r"(?:[+-]?\d+)", None),
 
-        (r"%(\d+)l?u", r"(\d{1,%s})", int),
-        (r"%\*(\d+)l?u", r"(?:\d{1,%s})", None),
+        (r"%(\d+)l?d", r"([+-]?\d{1,%s})", int),
+        (r"%\*(\d+)l?d", r"(?:[+-]?\d{1,%s})", None),
 
-        (r"%[fgeE]", r"([-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", float),
-        (r"%\*[fgeE]", r"(?:[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", None),
+        (r"%[fge]", r"([-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", float),
+        (r"%\*[fge]", r"(?:[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", None),
 
-        (r"%(\d+)[fgeE]", r"([-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", float),
-        (r"%\*(\d+)[fgeE]", r"(?:[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", None),
+        (r"%(\d+)[fge]", r"([-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", float),
+        (r"%\*(\d+)[fge]", r"(?:[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?)", None),
 
-        (r"%l?[xX]", r"((?:0[xX])?[\dA-Za-f]+)", lambda x: int(x, 16)),
-        (r"%\*l?[xX]", r"(?:(?:0[xX])?[\dA-Za-f]+)", None),
+        (r"%l?x", r"([\dA-Za-f]+)", lambda x: int(x, 16)),
+        (r"%\*l?x", r"[\dA-Za-f]+)", None),
 
-        (r"%(\d+)l?[xX]", r"((?:0[xX])?[\dA-Za-f]{1,%s})", lambda x: int(x, 16)),
-        (r"%\*(\d+)l?[xX]", r"(?:(?:0[xX])?[\dA-Za-f]{1,%s})", None),
+        (r"%(\d+)l?x", r"([\dA-Za-f]{1,%s})", lambda x: int(x, 16)),
+        (r"%\*(\d+)l?x", r"[\dA-Za-f]{1,%s})", None),
 
-        (r"%l?o", r"([0-7]*)", lambda x:int(x, 8)),
-        (r"%\*l?o", r"(?:[0-7]*)", None),
+        (r"%l?o", r"([0-7]+)", lambda x:int(x, 8)),
+        (r"%\*l?o", r"(?:[0-7]+)", None),
 
         (r"%(\d+)l?o", r"([0-7]{1,%s})", lambda x: int(x, 8)),
         (r"%\*(\d+)l?o", r"(?:[0-7]{1,%s})", None),
@@ -161,11 +147,10 @@ def scanf(format, s=None, collapseWhitespace=True):
     %c            Fixed width character string.
     %s            String of non-whitespace characters with leading
                      whitespace skipped.
-    %d, %i, %l    Signed integer (leading 0 => octal, 0x => hex).
+    %d            Signed integer
     %o            Octal integer.
-    %u            Unsigned integer.
     %x            Hexadecimal integer.
-    %f, %g, %e    Python float
+    %f, %g, %e    Float
     %[]           Character scan set
 
     scanf.scanf returns a tuple of found values or None if the format

pyraf/tests/test_cli.py

@@ -60,11 +60,12 @@ def test_division(arg, expected, ecl_flag):
 
 @pytest.mark.parametrize('arg,fmt,expected', [
     ("seven 6 4.0 -7", "%s %d %g %d", ('seven', 6, 4.0, -7)), # aliveness
-    ("0 0xf2 0o23 095", "%d %d %d %d", (0, 0xf2, 0o23, 95)),
+    ("0 095", "%d %d", (0, 95)),
+    ("1234", "%2d%2d", (12,34)),
     ("seven", "%d", None),
     ("seven", "%c%3c%99c", ('s', 'eve', 'n')),
     ("seven", "%[sev]", ('seve', )),
-    ("0xabc90", "%x", (0xabc90, )),
+    ("abc90 177", "%x %o", (0xabc90, 0o177)),
 ])  
 def test_scanf(arg, fmt, expected):
     """A basic unit test that sscanf was built/imported correctly and