Little fixes

Author: turicas

rows/compat.py

@@ -14,13 +14,15 @@
 
 from __future__ import unicode_literals
 
+import platform
 import sys
 from collections import OrderedDict
 
 
 DEFAULT_SAMPLE_ROWS = 20480  # Number of rows to sample from files when no schema is provided
 
 PYTHON_VERSION = (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)
+PYTHON_IMPLEMENTATION = platform.python_implementation()
 
 if PYTHON_VERSION < (3, 0, 0):
     TEXT_TYPE = unicode
@@ -61,8 +63,7 @@ def func(*args, **kwargs):
 }
 # Take from: `import keyword; set(key.lower() for key in keyword.kwlist)`
 
-@lru_cache
-def library_installed(module_name):
+def _library_installed(module_name):
     if PYTHON_VERSION >= (3, 0, 0):
         from importlib.util import find_spec
 
@@ -77,3 +78,8 @@ def library_installed(module_name):
             return False
         else:
             return True
+
+if PYTHON_VERSION < (3, 0, 0):
+    library_installed = lru_cache(_library_installed)
+else:
+    library_installed = lru_cache(maxsize=128)(_library_installed)

smoke-tests.sh

@@ -3,7 +3,11 @@ set -xe
 
 TMPDIR=$(mktemp -d)
 PYTHON_VERSION=$(python --version | sed 's/Python //; s/\./_/g')
-ROWS="python3 -m rows"
+if [[ $(which python2.7) ]]; then
+  ROWS="python2.7 -m rows"
+else
+  ROWS="python3 -m rows"
+fi
 echo "Python version: ${PYTHON_VERSION}"
 echo "Using temp directory: $TMPDIR"
 

tests/tests_fields.py

@@ -61,7 +61,7 @@ def test_BinaryField(self):
         with self.assertRaises(ValueError):
             fields.BinaryField.serialize("123")
 
-        assert fields.BinaryField.deserialize(None) is b""
+        assert fields.BinaryField.deserialize(None) == b""
         assert fields.BinaryField.deserialize(serialized) == deserialized
         assert type(fields.BinaryField.deserialize(serialized)) is BINARY_TYPE
         with self.assertRaises(ValueError):
@@ -286,7 +286,7 @@ def test_TextField(self):
 
         assert fields.TextField.deserialize("Álvaro") == "Álvaro"
         assert fields.TextField.deserialize(None) is None
-        assert fields.TextField.deserialize("") is ""
+        assert fields.TextField.deserialize("") == ""
         assert fields.TextField.serialize("Álvaro") == "Álvaro"
         assert type(fields.TextField.serialize("Álvaro")) is TEXT_TYPE
 

tests/tests_plugin_postgresql.py

@@ -258,7 +258,7 @@ def test_export_to_postgresql_prepare_to_export(self, mocked_prepare_to_export):
         assert mocked_prepare_to_export.called
         assert mocked_prepare_to_export.call_count == 1
         call = mocked_prepare_to_export.call_args
-        assert call[0] == utils.table
+        assert call[0] == (utils.table,)
         kwargs["encoding"] = encoding
         assert call[1] == kwargs
 

tests/utils.py

@@ -28,7 +28,7 @@
 
 process = None
 try:
-    process = subprocess.Popen(["psqxxxl", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    process = subprocess.Popen(["psql", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 except OSError:
     PSQL_FOUND = False
 else: