Merged in simonpercivall/python-tabulate (pull request astanin#22 + regression test)

astanin · astanin · commit cf1bd4801069 · 2015-08-18T14:47:28.000+02:00
diff --git a/tabulate.py b/tabulate.py
@@ -388,7 +388,7 @@ def _type(string, has_invisible=True):
     elif _isint(string):
         return int
     elif _isint(string, _long_type):
-        return _long_type
+        return int
     elif _isnumber(string):
         return float
     elif isinstance(string, _binary_type):
@@ -568,7 +568,7 @@ def _format(val, valtype, floatfmt, missingval="", has_invisible=True):
     if val is None:
         return missingval
 
-    if valtype in [int, _long_type, _text_type]:
+    if valtype in [int, _text_type]:
         return "{0}".format(val)
     elif valtype is _binary_type:
         try:
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -216,6 +216,15 @@ def test_long_integers():
     assert_equal(result, expected)
 
 
+def test_align_long_integers():
+    "Regression: long integers should be aligned as integers (issue #61)"
+    table = [[long(1)], [long(234)]]
+    result = tabulate(table, tablefmt="plain")
+    expected = "\n".join(["  1",
+                          "234"])
+    assert_equal(result, expected)
+
+
 def test_colorclass_colors():
     "Regression: ANSI colors in a unicode/str subclass (issue #49)"
     try:
