Refactor for Py3, add dependencies, locate variables in .env

Author: ansakoy

.gitignore

@@ -1,3 +1,4 @@
+.env
 .idea
-
+__pycache__/
 .venv

api/readabilityio.py

@@ -1,38 +1,36 @@
-import tornado.httpserver
-import tornado.ioloop
+import json
+import time
+
 import tornado.web
-#import memcache
-import chardet
-import urllib
 import html2text
 import requests
-import json
-from django.utils.feedgenerator import Rss201rev2Feed, Atom1Feed
-from pymongo import Connection
+
+from pymongo import MongoClient
 from readability.readability import Document
+
+from settings import MONGO_HOST, MONGO_PORT
 from textmetric.metric import calc_readability_metrics
-import time
+
 
 READ_DB = 'readability'
 LOG_COLL = 'log'
 
 ERROR_NONE = 0
 ERROR_INVALID_DATA = 101
 
+
 class RusMeasureHandler(tornado.web.RequestHandler):
     def initialize(self):
-        self.conn = Connection()
+        self.conn = MongoClient(MONGO_HOST, MONGO_PORT)
         self.db = self.conn[READ_DB]
         self.log = self.db[LOG_COLL]
         self.log.ensure_index("reqtime", 1)
 
     def __log(self, logrec):
-        self.conn = Connection()
         self.db = self.conn[READ_DB]
         self.log = self.db[LOG_COLL]
         self.log.save(logrec)
 
-
     def get(self):
         rtime = time.time()
         url = self.get_argument('url')
@@ -41,7 +39,7 @@ def get(self):
         debug = int(debug) if debug.isdigit() else 0
         r = requests.get(url)
         ctype = r.headers['content-type'].lower() if 'content-type' in r.headers.keys() else 'text/html'
-        print ctype
+        print(ctype)
         ctype = ctype.split(';', 1)[0]
         if ctype == 'text/html':
             ht = html2text.HTML2Text()
@@ -51,8 +49,7 @@ def get(self):
             text = ht.handle(Document(r.text).summary())
             status = ERROR_NONE
         elif ctype == 'text/plain':
-           
-            print type(r.content)
+            print(type(r.content))
             text = r.content.decode('utf8', 'ignore')
 #            text = r.text.decode('utf8', 'ignore')
             status = ERROR_NONE
@@ -95,8 +92,6 @@ def post(self):
         self.__log(logreq)
 
 
-
-
 application = tornado.web.Application([
     (r"/api/1.0/ru/measure/", RusMeasureHandler),
 ])

api/textmetric/metric.py

@@ -55,7 +55,7 @@ def daemon():
     import tornado.wsgi
 
     #~ # настраиваем Джанго
-    from readabilityio import application
+    from api.readabilityio import application
 #
 #    container = tornado.wsgi.WSGIContainer(application) 
     http_server = tornado.httpserver.HTTPServer(application) 
@@ -68,18 +68,18 @@ def start():
     if not started:
         pid = Popen([HOST, os.path.abspath(__file__), 'daemon'],
             executable='python').pid
-        print 'Server started at port %s (pid: %i)...' % (PORT, pid)
+        print('Server started at port %s (pid: %i)...' % (PORT, pid))
     else:
-        print 'Server alegry started (pid: %i)' % started
+        print('Server alegry started (pid: %i)' % started)
 
 
 def stop():
     started = alegry_started()
     if started:
         os.kill(started, signal.SIGKILL)
-        print 'Server stoped (pid %i)' % started
+        print('Server stoped (pid %i)' % started)
     else:
-        print 'Server not started'
+        print('Server not started')
 
 
 def restart():
@@ -114,5 +114,5 @@ def alegry_started():
     cmd = sys.argv[1]
     globals()[cmd]()
 else:
-    print 'Error: invalid command'
-    print 'Usage: python tornader.py {%s}.' % '|'.join(COMMANDS)
+    print('Error: invalid command')
+    print('Usage: python tornader.py {%s}.' % '|'.join(COMMANDS))