ソースを参照

compatibility to python 3.6 ...

Steve Nyemba 6 年 前
コミット
d0a0334f7a
5 ファイル変更45 行追加17 行削除
  1. 20 8
      transport/__init__.py
  2. 5 1
      transport/couch.py
  3. 5 1
      transport/mongo.py
  4. 9 5
      transport/queue.py
  5. 6 2
      transport/s3.py

+ 20 - 8
transport/__init__.py

@@ -45,12 +45,24 @@ __author__ = 'The Phi Technology'
 import numpy as np
 import json
 import importlib 
-from common import Reader, Writer #, factory
-import disk
-import queue
-import couch
-import mongo
-import s3
+import sys 
+
+if sys.version_info[0] > 2 : 
+    from transport.common import Reader, Writer #, factory
+    from transport import disk
+    from transport import queue as queue
+    from transport import couch as couch
+    from transport import mongo as mongo
+    from transport import s3 as s3
+else:
+    from common import Reader, Writer #, factory
+    import disk
+    import queue
+    import couch
+    import mongo
+    import s3
+
+
 class factory :
 	@staticmethod
 	def instance(**args):
@@ -78,7 +90,7 @@ class factory :
 		try:
 			anObject = eval( aClassName)
 			#setattr(anObject,'name',source)
-		except Exception,e:
+		except Exception as e:
 			print ['Error ',e]
 		return anObject
 
@@ -207,4 +219,4 @@ class factory :
 # 			#setattr(anObject,'name',source)
 # 		except Exception,e:
 # 			print ['Error ',e]
-# 		return anObject
+# 		return anObject

+ 5 - 1
transport/couch.py

@@ -7,7 +7,11 @@ This file is a wrapper around couchdb using IBM Cloudant SDK that has an interfa
 """
 import cloudant
 import json
-from common import Reader,Writer
+import sys
+if sys.version_info[0] > 2 :
+	from transport.common import Reader, Writer
+else:
+	from common import Reader, Writer
 class Couch:
 	"""
 	This class is a wrapper for read/write against couchdb. The class captures common operations for read/write.

+ 5 - 1
transport/mongo.py

@@ -6,7 +6,11 @@ This file is a wrapper around mongodb for reading/writing content against a mong
 """
 from pymongo import MongoClient
 # from transport import Reader,Writer
-from common import Reader, Writer
+import sys
+if sys.version_info[0] > 2 :
+	from transport.common import Reader, Writer
+else:
+	from common import Reader, Writer
 import json
 class Mongo :
     """

+ 9 - 5
transport/queue.py

@@ -10,7 +10,11 @@ from datetime import datetime
 import re
 import json
 import os
-from common import Reader, Writer
+import sys
+if sys.version_info[0] > 2 :
+	from transport.common import Reader, Writer
+else:
+	from common import Reader, Writer
 import json
 
 class MessageQueue:
@@ -31,9 +35,9 @@ class MessageQueue:
 		self.close()
 		return resp
 	def close(self):
-            if self.connection.is_closed == False :
-		self.channel.close()
-		self.connection.close()
+		if self.connection.is_closed == False :
+			self.channel.close()
+			self.connection.close()
 
 class QueueWriter(MessageQueue,Writer):
 	"""
@@ -204,4 +208,4 @@ class QueueListener(QueueReader):
 		self.init(self.qid)
 		self.channel.basic_consume(self.callback,queue=self.qid,no_ack=True);
 		self.channel.start_consuming()
- 
+ 

+ 6 - 2
transport/s3.py

@@ -8,9 +8,13 @@ from datetime import datetime
 import boto
 import botocore
 from smart_open import smart_open
-from common import Reader, Writer
+import sys
+if sys.version_info[0] > 2 :
+	from transport.common import Reader, Writer
+else:
+	from common import Reader, Writer
 import json
-from common import Reader, Writer
+
 
 class s3 :
 	"""