use next version of pyexcel-io

Author: chfw

pyexcel_pdfr/pdfr.py

@@ -6,13 +6,11 @@
     :copyright: (c) 2015-2017 by Onni Software Ltd & its contributors
     :license: New BSD License
 """
-import re
-import datetime
-
 from pdftables import get_tables
 from pyexcel_io.book import BookReader
 from pyexcel_io.sheet import SheetReader, NamedContent
 from pyexcel_io._compact import OrderedDict
+import pyexcel_io.service as service
 
 
 class PdfTable(SheetReader):
@@ -84,17 +82,17 @@ def column_iterator(self, row):
     def __convert_cell(self, cell_text):
         ret = None
         if self.__auto_detect_int:
-            ret = _detect_int_value(cell_text)
+            ret = service.detect_int_value(cell_text)
         if ret is None and self.__auto_detect_float:
-            ret = _detect_float_value(cell_text)
+            ret = service.detect_float_value(cell_text)
             shall_we_ignore_the_conversion = (
                 (ret in [float('inf'), float('-inf')]) and
                 self.__ignore_infinity
             )
             if shall_we_ignore_the_conversion:
                 ret = None
         if ret is None and self.__auto_detect_datetime:
-            ret = _detect_date_value(cell_text)
+            ret = service.detect_date_value(cell_text)
         if ret is None:
             ret = cell_text
         return ret
@@ -142,55 +140,3 @@ def _parse_pdf(self, file_handle):
     def close(self):
         if self._file_handle:
             self._file_handle.close()
-
-
-def _detect_date_value(csv_cell_text):
-    """
-    Read the date formats that were written by csv.writer
-    """
-    ret = None
-    try:
-        if len(csv_cell_text) == 10:
-            ret = datetime.datetime.strptime(
-                csv_cell_text,
-                "%Y-%m-%d")
-            ret = ret.date()
-        elif len(csv_cell_text) == 19:
-            ret = datetime.datetime.strptime(
-                csv_cell_text,
-                "%Y-%m-%d %H:%M:%S")
-        elif len(csv_cell_text) > 19:
-            ret = datetime.datetime.strptime(
-                csv_cell_text[0:26],
-                "%Y-%m-%d %H:%M:%S.%f")
-    except ValueError:
-        pass
-    return ret
-
-
-def _detect_float_value(csv_cell_text):
-    try:
-        should_we_skip_it = (csv_cell_text.startswith('0') and
-                             csv_cell_text.startswith('0.') is False)
-        if should_we_skip_it:
-            # do not convert if a number starts with 0
-            # e.g. 014325
-            return None
-        else:
-            return float(csv_cell_text)
-    except ValueError:
-        return None
-
-
-def _detect_int_value(csv_cell_text):
-    if csv_cell_text.startswith('0') and len(csv_cell_text) > 1:
-        return None
-    try:
-        return int(csv_cell_text)
-    except ValueError:
-        pattern = '([0-9]+,)*[0-9]+$'
-        if re.match(pattern, csv_cell_text):
-            integer_string = csv_cell_text.replace(',', '')
-            return int(integer_string)
-        else:
-            return None

rnd_requirements.txt

@@ -0,0 +1 @@
+https://github.com/pyexcel/pyexcel-io/archive/dev.zip