Replace function calls which no longer supported

thombashi · Jul 9, 2016 · 93480b1 · 93480b1
1 parent 1b43871
commit 93480b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/simplesqlite/loader/csv/core.py b/simplesqlite/loader/csv/core.py
@@ -53,10 +53,12 @@ def __init__(self, source):
         self.encoding = "utf-8"
 
     def _to_data_matrix(self):
+        from dataproperty.type import FloatTypeChecker
+
         return [
             [
                 six.b(data).decode(self.encoding, "ignore")
-                if not dataproperty.is_float(data) else data
+                if not FloatTypeChecker(data).is_type() else data
                 for data in row
             ]
             for row in self._csv_reader

diff --git a/simplesqlite/sqlquery.py b/simplesqlite/sqlquery.py
@@ -174,11 +174,16 @@ def to_value_str(cls, value):
             >>> SqlQuery.to_value_str(None)
             'NULL'
         """
+        from dataproperty.type import IntegerTypeChecker
+        from dataproperty.type import FloatTypeChecker
 
         if value is None:
             return "NULL"
 
-        if dataproperty.is_integer(value) or dataproperty.is_float(value):
+        if any([
+            IntegerTypeChecker(value).is_type(),
+            FloatTypeChecker(value).is_type()
+        ]):
             return str(value)
 
         return "'%s'" % (value)