Merge pull request #9 from natalieda/master

python 3 support

picas/clients.py

@@ -6,7 +6,7 @@
 @author: Jan Bot
 @author: Joris Borgdorff
 """
-from __future__ import print_function
+
 from .documents import Document
 import random
 import sys

picas/couchdblogger.py

@@ -4,7 +4,7 @@
 @licence: The MIT License (MIT)
 @Copyright (c) 2016, Jan Bot
 """
-from __future__ import print_function
+
 
 # Python imports
 import logging

picas/iterators.py

@@ -31,7 +31,7 @@ def stop(self):
     def is_stopped(self):
         return self._stop
 
-    def next(self):
+    def __next__(self):
         return self.__next__()
 
     def __next__(self):
@@ -152,7 +152,7 @@ def is_cancelled(self):
     def __next__(self):
         while not self.is_cancelled():
             try:
-                return self.iterator.next()
+                return next(self.iterator)
             except StopIteration:
                 self.iterator.reset()
                 time.sleep(self.sleep_sec)

picas/srm.py

@@ -4,12 +4,12 @@
 @licence: The MIT License (MIT)
 @Copyright (c) 2016, Jan Bot
 """
-from __future__ import print_function
+
 
 # Python imports
 import threading
 import logging
-import Queue
+import queue
 from os import path
 
 from .executers import execute, execute_old
@@ -34,7 +34,7 @@ def download_many(files, poolsize=10, logger=None):
     be established. Default: 10.
     @param logger: a Python logger object. Default: None.
     """
-    q = Queue.Queue()
+    q = queue.Queue()
     for v in files:
         q.put(v)
 

picas/srmclient.py

@@ -4,18 +4,18 @@
 @licence: The MIT License (MIT)
 @Copyright (c) 2016, Jan Bot
 """
-from __future__ import print_function
+
 
 import threading
 import logging
-import Queue
+import queue
 
 from picas import SRMClient
 
 
 def download(files, threads=10):
-    q = Queue.Queue()
-    for k, v in files.iteritems():
+    q = queue.Queue()
+    for k, v in files.items():
         q.put(v)
 
     thread_pool = []

scripts/example.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 
 from picas.actors import RunActor
 from picas.clients import CouchDB