Merge branch 'compatibility' into 'master'

Bring old imports back for more compatibility

See merge request !37

bob/io/base/__init__.py

@@ -3,7 +3,7 @@ import numpy as np
 import h5py
 import imageio
 
-from .utils import to_bob, to_matplotlib, opencvbgr_to_bob, bob_to_opencvbgr, imshow
+from ..image import to_bob, to_matplotlib
 
 import logging
 
@@ -34,17 +34,8 @@ image_extensions = [
 
 
 def _is_string(s):
-    """Returns ``True`` if the given object is a string
-
-    This method can be used with Python-2.x or 3.x and returns a string
-    respecting each environment's constraints.
-    """
-
-    from sys import version_info
-
-    return (version_info[0] < 3 and isinstance(s, (str, unicode))) or isinstance(
-        s, (bytes, str)
-    )
+    """Returns ``True`` if the given object is a string or bytes."""
+    return isinstance(s, (bytes, str))
 
 
 @np.deprecate(new_name="os.makedirs(directory, exist_ok=True)")

bob/io/base/test/test_hdf5.py

@@ -9,7 +9,7 @@
 
 import os
 from bob.io.base import load, save
-from .test_utils import temporary_filename
+from ..test_utils import temporary_filename
 
 
 import numpy as np

bob/io/base/test/test_image_support.py

@@ -12,7 +12,7 @@ import os
 import numpy
 
 from bob.io.base import load, write
-from .test_utils import datafile, temporary_filename
+from ..test_utils import datafile, temporary_filename
 
 # import bob.io.image
 import nose

bob/io/base/test/test_io.py

@@ -2,7 +2,7 @@ import nose
 import numpy as np
 import os
 from bob.io.base import vstack_features, save, load
-from .test_utils import temporary_filename
+from ..test_utils import temporary_filename
 
 
 def test_io_vstack():