Dev/switch to python3

README.md

@@ -51,7 +51,7 @@ git clone git@github.com:TartuNLP/neurotolge.git
 The last step is installation requirements:
 
 ```
-pip install requirements.txt
+pip install -r requirements.txt
 ```
 
 which can be found in the project.

neurotolge.py

@@ -63,7 +63,7 @@ def main_page(default_language=app_default_language):
 @app.route("/play", methods=['GET'])
 def play():
     request_args = request.args
-    print "Play request arguments :", request_args
+    print("Play request arguments :", request_args)
 
     translation_google = ''
     translation_tilde = ''
@@ -80,16 +80,16 @@ def play():
         translation_tilde = translations['translation_tilde']
         translation_ut = translations['translation_ut']
 
-        print {"from": language_translate_from,
+        print({"from": language_translate_from,
                "to": language_translate_to,
-               "source_text": source_text}
+               "source_text": source_text})
 
-        print {"google": translation_google,
+        print({"google": translation_google,
                "tilde": translation_tilde,
-               "ut": translation_ut}
+               "ut": translation_ut})
 
     except BadRequestKeyError as e:
-        print "BadRequestKeyError occurred: ", e.message
+        print("BadRequestKeyError occurred: ", e.message)
 
     end_translation_time = time.time()
     print("Total translation time : ", end_translation_time - start_translation_time)
@@ -121,15 +121,15 @@ def translate():
         language_translate_to = request_args['to']
         source_text = request_args['q']
 
-        print {"from": language_translate_from,
+        print({"from": language_translate_from,
                "to": language_translate_to,
-               "source_text": source_text}
+               "source_text": source_text})
         ut = UT(source_text, language_translate_from, language_translate_to)
         ut_translation = ut.get_translation()
     except BadRequestKeyError as e:
-        print "BadRequestKeyError occurred: ", e.message
+        print("BadRequestKeyError occurred: ", e.message)
 
-    print "UT translation", ut_translation
+    print("UT translation", ut_translation)
 
     if ut_translation == "":
         return json.dumps({

parallel_translation/parallel_translation_requests.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #  -*- encoding: utf-8 -*-
 
-import Queue
+import queue
 import threading
 
 from translators.google import Google
@@ -18,7 +18,7 @@ def start_thread(object):
 
 
 def get_translations(source_text, language_translate_from, language_translate_to, timeout=3, num_translators=3):
-    queue = Queue.Queue()
+    queue = queue.Queue()
     print("get_translations : language_translate_from", language_translate_from)
     print("get_translations : language_translate_to", language_translate_to)
 

translators/google.py

@@ -3,7 +3,7 @@
 
 import time
 import datetime
-from abstract_translator import AbstractTranslator
+from .abstract_translator import AbstractTranslator
 
 
 class Google(AbstractTranslator):

translators/tilde.py

@@ -4,8 +4,7 @@
 
 import time
 import datetime
-from abstract_translator import AbstractTranslator
-
+from .abstract_translator import AbstractTranslator
 
 class Tilde(AbstractTranslator):
     class ValidationError(Exception):

translators/ut.py

@@ -4,11 +4,11 @@
 
 import time
 import datetime
-from abstract_translator import AbstractTranslator
+from .abstract_translator import AbstractTranslator
 
 
 class UT(AbstractTranslator):
-    def __init__(self, source_text, translate_from, translate_to, queue):
+    def __init__(self, source_text, translate_from, translate_to, queue=None):
         AbstractTranslator.__init__(self, source_text, translate_from, translate_to, queue)
         self.translation_object = {}
 
@@ -48,6 +48,6 @@ def get_translation_object(self):
         try:
             self._external_api_integration()
         except Exception as e:
-            print e.message
+            print(e.message)
 
         return self.translation_object