fix: pylint and format

Author: costowell

.pylintrc

@@ -1,7 +1,6 @@
 [MASTER]
 ignore = ,input
 persistent = yes
-load-plugins = pylint_quotes
 
 [MESSAGES CONTROL]
 disable =
@@ -10,7 +9,6 @@ disable =
 	duplicate-code,
 	no-member,
 	parse-error,
-	bad-continuation,
 	too-few-public-methods,
 	global-statement,
 	cyclic-import,
@@ -28,23 +26,20 @@ disable =
 	consider-iterating-dictionary,
 	inconsistent-return-statements,
 	consider-using-dict-items,
-	modified-iterating-dict
+	modified-iterating-dict,
+	too-many-arguments,
+	broad-exception-caught,
+	R0917
 
 [REPORTS]
 output-format = text
-files-output = no
 reports = no
 
 [FORMAT]
 max-line-length = 120
-max-statement-lines = 75
 single-line-if-stmt = no
-no-space-check = trailing-comma,dict-separator
 max-module-lines = 1000
 indent-string = '    '
-string-quote=single-avoid-escape
-triple-quote=single
-docstring-quote=double
 
 [MISCELLANEOUS]
 notes = FIXME,XXX,TODO
@@ -91,7 +86,6 @@ good-names=logger,id,ID
 bad-names=foo,bar,baz,toto,tutu,tata
 
 # List of builtins function names that should not be used, separated by a comma
-bad-functions=apply,input
 
 [DESIGN]
 max-args = 10
@@ -106,4 +100,4 @@ min-public-methods = 2
 max-public-methods = 20
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = builtins.Exception

config.py

@@ -50,7 +50,10 @@
 
 # REDIS
 REDIS_HOST = environ.get('PROXSTAR_REDIS_HOST', 'localhost')
-RQ_DASHBOARD_REDIS_URL = "redis://" + environ.get('PROXSTAR_REDIS_HOST', 'localhost') + ":" + environ.get('PROXSTAR_REDIS_PORT', '6379') + "/0"
+RQ_DASHBOARD_REDIS_URL = (
+    "redis://" + environ.get('PROXSTAR_REDIS_HOST', 'localhost') + ":" +
+    environ.get('PROXSTAR_REDIS_PORT', '6379') + "/0"
+)
 REDIS_PORT = int(environ.get('PROXSTAR_REDIS_PORT', '6379'))
 
 # VNC

gunicorn.conf.py

@@ -14,7 +14,7 @@
 
 
 def start_websockify(websockify_path, target_file):
-    result = subprocess.run(['pgrep', 'websockify'], stdout=subprocess.PIPE)
+    result = subprocess.run(['pgrep', 'websockify'], stdout=subprocess.PIPE, check=False)
     if not result.stdout:
         print("Websockify is stopped. Starting websockify.")
         proxstar_port = app.config.get('WEBSOCKIFY_PORT')
@@ -34,6 +34,6 @@ def start_websockify(websockify_path, target_file):
         print("Websockify started.")
 
 
-def on_starting(server):
+def on_starting(server):  # pylint: disable=unused-argument
     print("Booting Websockify server in daemon mode...")
     start_websockify(app.config['WEBSOCKIFY_PATH'], app.config['WEBSOCKIFY_TARGET_FILE'])

proxstar/__init__.py

@@ -102,6 +102,8 @@
             app.config['STARRS_DB_PASS'],
         )
     )
+else:
+    starrs = None
 
 from proxstar.vm import VM
 from proxstar.user import User

proxstar/starrs.py

@@ -1,6 +1,3 @@
-import psycopg2
-
-
 def get_next_ip(starrs, range_name):
     c = starrs.cursor()
     try:

proxstar/tasks.py

@@ -60,7 +60,7 @@ def set_job_status(job, status):
     job.save_meta()
 
 
-def create_vm_task(user, name, cores, memory, disk, iso):
+def create_vm_task(user, name, cores, memory, disk, iso):  # pylint: disable=too-many-arguments
     with app.app_context():
         job = get_current_job()
         proxmox = connect_proxmox()
@@ -177,7 +177,9 @@ def generate_pool_cache_task():
         store_pool_cache(db, pools)
 
 
-def setup_template_task(template_id, name, user, ssh_key, cores, memory):
+def setup_template_task(
+    template_id, name, user, ssh_key, cores, memory
+):  # pylint: disable=too-many-arguments
     with app.app_context():
         job = get_current_job()
         proxmox = connect_proxmox()
@@ -249,6 +251,7 @@ def cleanup_vnc_task():
             'https://{}/console/cleanup'.format(app.config['SERVER_NAME']),
             data={'token': app.config['VNC_CLEANUP_TOKEN']},
             verify=False,
+            timeout=30,
         )
     except Exception as e:  # pylint: disable=W0703
         print(e)

proxstar/vm.py

@@ -372,7 +372,7 @@ def set_ci_network(self):
 
 # Will create a new VM with the given parameters, does not guarantee
 # the VM is done provisioning when returning
-def create_vm(proxmox, user, name, cores, memory, disk, iso):
+def create_vm(proxmox, user, name, cores, memory, disk, iso):  # pylint: disable=too-many-arguments
     node = proxmox.nodes(get_node_least_mem(proxmox))
     vmid = get_free_vmid(proxmox)
     # Make sure lingering expirations are deleted

requirements.txt

@@ -19,7 +19,6 @@ sqlalchemy==2.0.43
 tenacity==9.1.2
 websockify==0.13.0
 pylint==3.3.8
-pylint-quotes==0.2.3
 sentry-sdk[rq]
 sentry-sdk[flask]
 sentry-sdk~=2.38.0

rqsettings.py

@@ -5,7 +5,10 @@
 from sentry_sdk.integrations.redis import RedisIntegration
 
 if os.path.exists('config_local.py'):
-    import config_local as config
+    try:
+        import config_local as config  # pylint: disable=import-error
+    except ImportError:
+        import config
 else:
     import config