up

class/core/common.py

@@ -46,8 +46,8 @@ def initDB():
         for index in range(len(csql_list)):
             sql.execute(csql_list[index], ())
 
-    except Exception, ex:
-        print str(ex)
+    except Exception as ex:
+        print(str(ex))
 
 
 def initInitD():

class/core/config_api.py

@@ -278,7 +278,7 @@ class config_api:
         if len(cert_ca) > 100 and len(private_key) > 100:
             mw.writeFile('ssl/certificate.pem', cert_ca)
             mw.writeFile('ssl/privateKey.pem', private_key)
-            print cert_ca, private_key
+            print(cert_ca, private_key)
             return True
         return False
 

class/core/db.py

@@ -26,7 +26,7 @@ class Sql():
         try:
             if self.__DB_CONN == None:
                 self.__DB_CONN = sqlite3.connect(self.__DB_FILE)
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def dbfile(self, name):
@@ -96,7 +96,7 @@ class Sql():
                 del(tmp)
             self.__close()
             return data
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def getField(self, keyName):
@@ -142,7 +142,7 @@ class Sql():
             self.__close()
             self.__DB_CONN.commit()
             return id
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def checkInput(self, data):
@@ -176,7 +176,7 @@ class Sql():
                 "(" + keys + ") " + "VALUES(" + values + ")"
             result = self.__DB_CONN.execute(sql, param)
             return True
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def commit(self):
@@ -206,7 +206,7 @@ class Sql():
             self.__close()
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def delete(self, id=None):
@@ -221,7 +221,7 @@ class Sql():
             self.__close()
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def execute(self, sql, param):
@@ -232,7 +232,7 @@ class Sql():
             result = self.__DB_CONN.execute(sql, param)
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def query(self, sql, param):
@@ -243,7 +243,7 @@ class Sql():
             # 将元组转换成列表
             data = map(list, result)
             return data
-        except Exception, ex:
+        except Exception as ex:
             return "error: " + str(ex)
 
     def create(self, name):

class/core/mw.py

@@ -301,7 +301,7 @@ def writeLog(type, logMsg, args=()):
         data = (type, logMsg, mDate)
         result = sql.table('logs').add('type,log,addtime', data)
     except Exception as e:
-        print e
+        print(e)
 
 
 def writeFile(filename, str):
@@ -529,8 +529,8 @@ def downloadFile(url, filename):
 
 def downloadHook(count, blockSize, totalSize):
     speed = {'total': totalSize, 'block': blockSize, 'count': count}
-    print speed
-    print '%02d%%' % (100.0 * count * blockSize / totalSize)
+    print(speed)
+    print('%02d%%' % (100.0 * count * blockSize / totalSize))
 
 
 def getLocalIp():

requirements.txt

@@ -1,11 +1,11 @@
-werkzeug==0.16.1
+werkzeug==1.0.1
 setuptools==33.1.1
 wheel==0.33.6
 flask==1.0.2
 flask-session==0.3.2
 flask-helper==0.19
 cache==1.0.3
-flask-caching==1.8.0
+flask-caching==1.10.1
 gunicorn==19.9
 gevent==21.1.2
 gevent-websocket
@@ -20,4 +20,5 @@ MySQL-python==1.2.5
 mysql-connector-python
 flask-socketio==3.0.1
 python-engineio==3.9.0
+zmq==0.0.0
 # pytest-shutil

route/__init__.py

@@ -7,8 +7,8 @@ import time
 import shutil
 import uuid
 
-reload(sys)
-sys.setdefaultencoding('utf-8')
+# reload(sys)
+#  sys.setdefaultencoding('utf-8')
 
 
 from datetime import timedelta
@@ -277,7 +277,7 @@ done
 '''
     if not mw.isAppleSystem():
         info = mw.execShell(sh)
-        print info[0], info[1]
+        print(info[0], info[1])
 
 
 def connect_ssh():