Fix string return in adapted types + update tests to python3.8.

Author: guzman-raphael

.travis.yml

@@ -13,14 +13,15 @@ services:
 main: &main
       stage: Alpine
       os: linux
+      dist: bionic # precise, trusty, xenial, bionic
       language: shell
       script:
         - docker-compose -f LNX-docker-compose.yml up --build --exit-code-from dj
 jobs:
   include:
     - <<: *main
       env:
-      - PY_VER: "3.8-rc"
+      - PY_VER: "3.8"
       - MYSQL_VER: "5.7"
     - <<: *main
       env:
@@ -36,7 +37,7 @@ jobs:
       - MYSQL_VER: "5.7"
     - <<: *main
       env:
-      - PY_VER: "3.8-rc"
+      - PY_VER: "3.8"
       - MYSQL_VER: "8.0"
     - <<: *main
       env:
@@ -52,7 +53,7 @@ jobs:
       - MYSQL_VER: "8.0"
     - <<: *main
       env:
-      - PY_VER: "3.8-rc"
+      - PY_VER: "3.8"
       - MYSQL_VER: "5.6"
     - <<: *main
       env:

datajoint/fetch.py

@@ -50,7 +50,7 @@ def _get(connection, attr, data, squeeze, download_path):
     adapt = attr.adapter.get if attr.adapter else lambda x: x
 
     if attr.is_filepath:
-        return str(adapt(extern.download_filepath(uuid.UUID(bytes=data))[0]))
+        return adapt(str(extern.download_filepath(uuid.UUID(bytes=data))[0]))
 
     if attr.is_attachment:
         # Steps:
@@ -65,22 +65,22 @@ def _get(connection, attr, data, squeeze, download_path):
         if local_filepath.is_file():
             attachment_checksum = _uuid if attr.is_external else hash.uuid_from_buffer(data)
             if attachment_checksum == hash.uuid_from_file(local_filepath, init_string=attachment_name + '\0'):
-                return str(adapt(local_filepath))  # checksum passed, no need to download again
+                return adapt(str(local_filepath))  # checksum passed, no need to download again
             # generate the next available alias filename
             for n in itertools.count():
                 f = local_filepath.parent / (local_filepath.stem + '_%04x' % n + local_filepath.suffix)
                 if not f.is_file():
                     local_filepath = f
                     break
                 if attachment_checksum == hash.uuid_from_file(f, init_string=attachment_name + '\0'):
-                    return str(adapt(f))  # checksum passed, no need to download again
+                    return adapt(str(f))  # checksum passed, no need to download again
         # Save attachment
         if attr.is_external:
             extern.download_attachment(_uuid, attachment_name, local_filepath)
         else:
             # write from buffer
             safe_write(local_filepath, data.split(b"\0", 1)[1])
-        return str(adapt(local_filepath))  # download file from remote store
+        return adapt(str(local_filepath))  # download file from remote store
 
     return adapt(uuid.UUID(bytes=data) if attr.uuid else (
             blob.unpack(extern.get(uuid.UUID(bytes=data)) if attr.is_external else data, squeeze=squeeze)