merging

Author: previ

camera.py

@@ -202,7 +202,6 @@ def get_photo_thumb_file(self, filename):
     def delete_photo(self, filename):
         logging.info("delete photo: " + filename)
         os.remove(PHOTO_PATH + "/" + filename)
-<<<<<<< HEAD
         os.remove(PHOTO_PATH + "/" + filename[:filename.rfind(".")] + PHOTO_THUMB_SUFFIX + self._camera.PHOTO_FILE_EXT)
         for photo in self._photos:
             if photo["name"] == filename:

cnn_test.py

@@ -11,4 +11,4 @@
 while True:
     i = cam.get_image().resize(128, 128).mat()
     results = classifier.classify_image(i, 128, 128)
-    print "results: " + str(results)
+    print("results: " + str(results))

main.py

@@ -41,7 +41,6 @@
 from flask_babel import Babel
 from flask_cors import CORS
 from werkzeug.datastructures import Headers
-from flask_sockets import Sockets
 
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)

requirements.txt

@@ -20,5 +20,5 @@ Pypubsub==4.0.0
 pytz==2018.4
 six==1.11.0
 smbus2==0.2.0
-tensorflow==0.11.0
 Werkzeug==0.14.1
+pylint==1.9.2

wifi.py

@@ -49,40 +49,40 @@ def start_hostapd(cls):
         adapter = cls.get_adapter_type()
         hostapd_type = cls.hostapds.get(adapter)
         try:
-            print "starting hostapd..."
+            print("starting hostapd...")
             out = os.system("/usr/sbin/" + hostapd_type + " -B /etc/hostapd/" + hostapd_type + ".conf")
-            print "hostapd out: " + str(out)
+            print("hostapd out: " + str(out))
 
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
 
     @classmethod
     def start_dnsmasq(cls):
         try:
-            print "starting dnsmasq..."
+            print("starting dnsmasq...")
             out = os.system("systemctl start dnsmasq")
-            print "dnsmasq out: " + str(out)
+            print("dnsmasq out: " + str(out))
 
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
 
     @classmethod
     def stop_hostapd(cls):
         try:
-            print "stopping hostapd..."
+            print("stopping hostapd...")
             out = subprocess.check_output(["sudo", "pkill", "-9", "hostapd"])
-            print "hostapd out: " + str(out)
+            print("hostapd out: " + str(out))
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
 
     @classmethod
     def stop_dnsmasq(cls):
         try:
-            print "stopping dnsmasq..."
+            print("stopping dnsmasq...")
             out = subprocess.check_output(["systemctl", "stop", "dnsmasq"])
-            print "dnsmasq out: " + str(out)
+            print("dnsmasq out: " + str(out))
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
 
     @classmethod
     def get_ipaddr(cls, ifname):
@@ -112,7 +112,7 @@ def register_ipaddr(cls, bot_uid, bot_name, bot_ipaddr, user_email):
             if ret.getcode() != 200:
                 raise Exception()
         except Exception as e:
-            print "except: " + str(e)
+            print("except: " + str(e))
             raise
 
     @classmethod
@@ -149,14 +149,14 @@ def start_as_client(cls):
             time.sleep(1.0)
             out = os.system("wpa_supplicant -B -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf > /dev/null 2>&1")
             out += os.system("dhclient -1 wlan0")
-            print out
+            print(out)
             try:
                 cls.register_ipaddr(cls.get_macaddr("wlan0"), cls.get_config().get('bot_name', 'CoderBot'), cls.get_ipaddr("wlan0"), "roberto.previtera@gmail.com")
-                print "registered bot, ip: " + str(cls.get_ipaddr("wlan0") + " name: " + cls.get_config().get('bot_name', 'CoderBot'))
+                print("registered bot, ip: " + str(cls.get_ipaddr("wlan0") + " name: " + cls.get_config().get('bot_name', 'CoderBot')))
             except:
                 pass
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod
@@ -171,22 +171,22 @@ def start_as_ap(cls):
         out += subprocess.check_output(["ip", "a", "add", "10.0.0.1/24", "dev", "wlan0"])
         out += subprocess.check_output(["ip", "link", "set", "dev", "wlan0", "up"])
         out += subprocess.check_output(["ifconfig"])
-        print out
+        print(out)
         cls.start_hostapd()
         cls.start_dnsmasq()
 
     @classmethod
     def start_service(cls):
         config = cls.load_config()
         if config["wifi_mode"] == "ap":
-            print "starting as ap..."
+            print("starting as ap...")
             cls.start_as_ap()
         elif config["wifi_mode"] == "client":
-            print "starting as client..."
+            print("starting as client...")
             try:
                 cls.start_as_client()
             except:
-                print "Unable to register ip, revert to ap mode"
+                print("Unable to register ip, revert to ap mode")
                 cls.start_as_ap()
 
 def main():