merging lint

Author: previ

MPU6050.py

@@ -1,13 +1,12 @@
-from __future__ import print_function
 """This program handles the communication over I2C
 between a Raspberry Pi and a MPU-6050 Gyroscope / Accelerometer combo.
 Made by: MrTijn/Tijndagamer
 Released under the MIT License
 Copyright 2015
 """
 
-import smbus2 as smbus
 import time
+import smbus2 as smbus
 
 class MPU6050:
 
@@ -88,10 +87,9 @@ def read_i2c_word(self, register):
 
         value = (high << 8) + low
 
-        if (value >= 0x8000):
+        if value >= 0x8000:
             return -((65535 - value) + 1)
-        else:
-            return value
+        return value
 
     # MPU-6050 Methods
 
@@ -120,7 +118,7 @@ def set_accel_range(self, accel_range):
         # Write the new range to the ACCEL_CONFIG register
         self.bus.write_byte_data(self.address, self.ACCEL_CONFIG, accel_range)
 
-    def read_accel_range(self, raw = False):
+    def read_accel_range(self, raw=False):
         """Reads the range the accelerometer is set to.
         If raw is True, it will return the raw value from the ACCEL_CONFIG
         register
@@ -141,10 +139,9 @@ def read_accel_range(self, raw = False):
                 return 8
             elif raw_data == self.ACCEL_RANGE_16G:
                 return 16
-            else:
-                return -1
+        return -1
 
-    def get_accel_data(self, g = False):
+    def get_accel_data(self, g=False):
         """Gets and returns the X, Y and Z values from the accelerometer.
         If g is True, it will return the data in g
         If g is False, it will return the data in m/s^2
@@ -174,13 +171,11 @@ def get_accel_data(self, g = False):
         y = y / accel_scale_modifier
         z = z / accel_scale_modifier
 
-        if g is True:
-            return {'x': x, 'y': y, 'z': z}
-        elif g is False:
+        if g is False:
             x = x * self.GRAVITIY_MS2
             y = y * self.GRAVITIY_MS2
             z = z * self.GRAVITIY_MS2
-            return {'x': x, 'y': y, 'z': z}
+        return {'x': x, 'y': y, 'z': z}
 
     def set_gyro_range(self, gyro_range):
         """Sets the range of the gyroscope to range.
@@ -193,7 +188,7 @@ def set_gyro_range(self, gyro_range):
         # Write the new range to the ACCEL_CONFIG register
         self.bus.write_byte_data(self.address, self.GYRO_CONFIG, gyro_range)
 
-    def read_gyro_range(self, raw = False):
+    def read_gyro_range(self, raw=False):
         """Reads the range the gyroscope is set to.
         If raw is True, it will return the raw value from the GYRO_CONFIG
         register.
@@ -214,8 +209,7 @@ def read_gyro_range(self, raw = False):
                 return 1000
             elif raw_data == self.GYRO_RANGE_2000DEG:
                 return 2000
-            else:
-                return -1
+        return -1
 
     def get_gyro_data(self):
         """Gets and returns the X, Y and Z values from the gyroscope.
@@ -249,9 +243,9 @@ def get_gyro_data(self):
 
     def get_all_data(self):
         """Reads and returns all the available data."""
-        temp = get_temp()
-        accel = get_accel_data()
-        gyro = get_gyro_data()
+        temp = self.get_temp()
+        accel = self.get_accel_data()
+        gyro = self.get_gyro_data()
 
         return [accel, gyro, temp]
 
@@ -267,4 +261,4 @@ def get_all_data(self):
         if abs(gyro_data['z']) > mpu.GYRO_THRESHOLD_Z:
             dz = gyro_data['z'] * dt
             z = z + dz
-            print( "z: ", z, end="\r")
+            print("z: ", z, end="\r")

api.py

@@ -3,19 +3,16 @@
 This file contains every method called by the API defined in v2.yml
 """
 
-from flask import jsonify
+import os
+import subprocess
 import json
-from coderbot import CoderBot
-from program import ProgramEngine, Program
-from config import Config
 import connexion
-import time
-import sqlite3
 from tinydb import TinyDB, Query
 from tinydb.operations import delete
-import os
-import subprocess
 from cachetools import cached, TTLCache
+from coderbot import CoderBot
+from program import ProgramEngine
+from config import Config
 
 bot_config = Config.get()
 bot = CoderBot.get_instance(
@@ -24,20 +21,20 @@
 )
 
 def get_serial():
-  """
-  Extract serial from cpuinfo file
-  """
-  cpuserial = "0000000000000000"
-  try:
-    f = open('/proc/cpuinfo','r')
-    for line in f:
-      if line[0:6]=='Serial':
-        cpuserial = line[10:26]
-    f.close()
-  except:
-    cpuserial = "ERROR000000000"
-
-  return cpuserial
+    """
+    Extract serial from cpuinfo file
+    """
+    cpuserial = "0000000000000000"
+    try:
+        f = open('/proc/cpuinfo', 'r')
+        for line in f:
+            if line[0:6] == 'Serial':
+                cpuserial = line[10:26]
+        f.close()
+    except Exception:
+        cpuserial = "ERROR000000000"
+
+    return cpuserial
 
 @cached(cache=TTLCache(maxsize=1, ttl=10))
 def get_status():
@@ -47,10 +44,10 @@ def get_status():
     (Cached method)
     """
     try:
-        temp = os.popen("vcgencmd measure_temp").readline().replace("temp=","")
-    except:
+        temp = os.popen("vcgencmd measure_temp").readline().replace("temp=", "")
+    except Exception:
         temp = "undefined"
-    
+
     uptime = subprocess.check_output(["uptime"]).decode('utf-8').replace('\n', '')
     internet_status = subprocess.check_output(["./utils/check_conn.sh"]).decode('utf-8').replace('\n', '')
     return {'internet_status': internet_status,
@@ -68,28 +65,28 @@ def get_info():
         with open('manifest.json', 'r') as f:
             metadata = json.load(f)
         backend_commit = metadata["backendCommit"][0:7]
-    except:
+    except Exception:
         backend_commit = "undefined"
 
     try:
         coderbot_version = subprocess.check_output(["cat", "/etc/coderbot/version"]).decode('utf-8').replace('\n', '')
-    except:
-        coderbot_version  = 'undefined'
+    except Exception:
+        coderbot_version = 'undefined'
     try:
         kernel = subprocess.check_output(["uname", "-r"]).decode('utf-8').replace('\n', '')
-    except:
+    except Exception:
         kernel = 'undefined'
     try:
         update_status = subprocess.check_output(["cat", "/etc/coderbot/update_status"]).decode('utf-8').replace('\n', '')
-    except:
+    except Exception:
         update_status = 'undefined'
 
-    serial = get_serial();
-    return {'backend_commit':backend_commit,
-            'coderbot_version':coderbot_version,
+    serial = get_serial()
+    return {'backend_commit': backend_commit,
+            'coderbot_version': coderbot_version,
             'update_status': update_status,
-            'kernel':kernel,
-            'serial':serial}
+            'kernel': kernel,
+            'serial': serial}
 
 prog = None
 prog_engine = ProgramEngine.get_instance()
@@ -100,7 +97,7 @@ def get_info():
 
 query = Query()
 
-## Robot control 
+## Robot control
 
 def stop():
     bot.stop()
@@ -117,43 +114,43 @@ def turn(data):
     return 200
 
 def exec(data):
-    prog = prog_engine.create(data["name"], data["code"])
-    return json.dumps(prog.execute())
+    program = prog_engine.create(data["name"], data["code"])
+    return json.dumps(program.execute())
 
 ## System
 
 def status():
-    status = get_status()
+    sts = get_status()
 
     return {
         "status": "ok",
-        "internetConnectivity": status["internet_status"],
-        "temp": status["temp"],
-        "uptime": status["uptime"],
+        "internetConnectivity": sts["internet_status"],
+        "temp": sts["temp"],
+        "uptime": sts["uptime"],
     }
 
 def info():
-    info = get_info()
+    inf = get_info()
     return {
         "model": 1,
-        "version": info["coderbot_version"],
-        "backend commit build": info["backend_commit"],
-        "kernel" : info["kernel"],
-        "update status": info["update_status"],
-        "serial": info["serial"]
+        "version": inf["coderbot_version"],
+        "backend commit build": inf["backend_commit"],
+        "kernel" : inf["kernel"],
+        "update status": inf["update_status"],
+        "serial": inf["serial"]
     }
 
 def restoreSettings():
     with open("data/defaults/config.json") as f:
         Config.write(json.loads(f.read()))
-    bot_config = Config.get()
+    Config.get()
     return "ok"
 
 def updateFromPackage():
     os.system('sudo bash /home/pi/clean-update.sh')
     file_to_upload = connexion.request.files['file_to_upload']
     file_to_upload.save(os.path.join('/home/pi/', 'update.tar'))
-    os.system('sudo coderbot_update /home/pi/update.tar && sudo reboot')
+    os.system('sudo reboot')
     return 200
 
 
@@ -171,7 +168,7 @@ def saveProgram(data, overwrite):
             return "defaultOverwrite"
         # Overwrite existing program with the same name
         else:
-            if (overwrite == "1"):
+            if overwrite == "1":
                 programs.update(data, query.name == data["name"])
                 return 200
             else:
@@ -218,4 +215,4 @@ def resetDefaultPrograms():
         if filename.endswith(".json"):
             with open("data/defaults/programs/" + filename) as p:
                 q = p.read()
-                programs.insert(json.loads(q))
+                programs.insert(json.loads(q))