Python 3 compatibility fixes

ckan · Jan 4, 2022 · d3ec0b9 · d3ec0b9
1 parent 46a6e10
commit d3ec0b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ckanext/qa/model.py b/ckanext/qa/model.py
@@ -1,5 +1,6 @@
 import uuid
 import datetime
+import six
 
 from sqlalchemy import Column
 from sqlalchemy import types
@@ -15,7 +16,7 @@
 
 
 def make_uuid():
-    return unicode(uuid.uuid4())
+    return six.text_type(uuid.uuid4())
 
 
 class QA(Base):
@@ -40,7 +41,7 @@ class QA(Base):
 
     def __repr__(self):
         summary = 'score=%s format=%s' % (self.openness_score, self.format)
-        details = unicode(self.openness_score_reason).encode('unicode_escape')
+        details = six.text_type(self.openness_score_reason).encode('unicode_escape')
         package = model.Package.get(self.package_id)
         package_name = package.name if package else '?%s?' % self.package_id
         return '<QA %s /dataset/%s/resource/%s %s>' % \

diff --git a/ckanext/qa/tests/mock_remote_server.py b/ckanext/qa/tests/mock_remote_server.py
@@ -6,8 +6,10 @@
 from threading import Thread
 from time import sleep
 from wsgiref.simple_server import make_server
+from functools import reduce
 import urllib2
 import socket
+import six
 
 
 class MockHTTPServer(object):
@@ -116,7 +118,7 @@ def __call__(self, environ, start_response):
         else:
             content = request.str_params.get('content', '')
 
-        if isinstance(content, unicode):
+        if isinstance(content, six.text_type):
             raise TypeError("Expected raw byte string for content")
 
         headers = [