code reordering

Author: chfw

pyexcel_xls/xls.py

@@ -28,39 +28,6 @@
 DEFAULT_DATETIME_FORMAT = "%s %s" % (DEFAULT_DATE_FORMAT, DEFAULT_TIME_FORMAT)
 
 
-def is_integer_ok_for_xl_float(value):
-    """check if a float value had zero value in digits"""
-    return value == math.floor(value)
-
-
-def xldate_to_python_date(value):
-    """
-    convert xl date to python date
-    """
-    date_tuple = xlrd.xldate_as_tuple(value, 0)
-    ret = None
-    if date_tuple == (0, 0, 0, 0, 0, 0):
-        ret = datetime.datetime(1900, 1, 1, 0, 0, 0)
-    elif date_tuple[0:3] == (0, 0, 0):
-        ret = datetime.time(date_tuple[3],
-                            date_tuple[4],
-                            date_tuple[5])
-    elif date_tuple[3:6] == (0, 0, 0):
-        ret = datetime.date(date_tuple[0],
-                            date_tuple[1],
-                            date_tuple[2])
-    else:
-        ret = datetime.datetime(
-            date_tuple[0],
-            date_tuple[1],
-            date_tuple[2],
-            date_tuple[3],
-            date_tuple[4],
-            date_tuple[5]
-        )
-    return ret
-
-
 class XLSheet(SheetReader):
     """
     xls, xlsx, xlsm sheet reader
@@ -242,6 +209,39 @@ def close(self):
         self.work_book.save(self.file_alike_object)
 
 
+def is_integer_ok_for_xl_float(value):
+    """check if a float value had zero value in digits"""
+    return value == math.floor(value)
+
+
+def xldate_to_python_date(value):
+    """
+    convert xl date to python date
+    """
+    date_tuple = xlrd.xldate_as_tuple(value, 0)
+    ret = None
+    if date_tuple == (0, 0, 0, 0, 0, 0):
+        ret = datetime.datetime(1900, 1, 1, 0, 0, 0)
+    elif date_tuple[0:3] == (0, 0, 0):
+        ret = datetime.time(date_tuple[3],
+                            date_tuple[4],
+                            date_tuple[5])
+    elif date_tuple[3:6] == (0, 0, 0):
+        ret = datetime.date(date_tuple[0],
+                            date_tuple[1],
+                            date_tuple[2])
+    else:
+        ret = datetime.datetime(
+            date_tuple[0],
+            date_tuple[1],
+            date_tuple[2],
+            date_tuple[3],
+            date_tuple[4],
+            date_tuple[5]
+        )
+    return ret
+
+
 _xls_reader_registry = {
     "file_type": "xls",
     "reader": XLSBook,

tests/base.py

@@ -107,7 +107,7 @@ def test_iterate_through_sheets(self):
         for s in b:
             data = pyexcel.utils.to_array(s)
             assert self.content[s.name] == data
-        si = pyexcel.iterators.SheetIterator(b)
+        si = pyexcel.sheets.iterators.SheetIterator(b)
         for s in si:
             data = pyexcel.utils.to_array(s)
             assert self.content[s.name] == data

tests/test_bug_fixes.py

@@ -52,5 +52,5 @@ def custom_row_renderer(row):
                 for e in row:
                     yield e
             for i in range(2):
-                yield custom_row_renderer([1,2])
+                yield custom_row_renderer([1, 2])
         save_data("test.xls", {"sheet": data_gen()})