From 29f783492164eecb249086e016c61d88680e84d2 Mon Sep 17 00:00:00 2001 From: Josh Washburne Date: Thu, 28 Dec 2017 14:44:01 -0500 Subject: [PATCH] PEP8 cleanup. --- savepointradio/core/admin.py | 2 +- savepointradio/core/utils.py | 13 +++++++++---- savepointradio/savepointradio/settings/base.py | 14 +++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/savepointradio/core/admin.py b/savepointradio/core/admin.py index 4365793..0d572eb 100644 --- a/savepointradio/core/admin.py +++ b/savepointradio/core/admin.py @@ -7,4 +7,4 @@ from .models import RadioUser @admin.register(RadioUser) class RadioUserAdmin(UserAdmin): - pass \ No newline at end of file + pass diff --git a/savepointradio/core/utils.py b/savepointradio/core/utils.py index 10bf49c..0794689 100644 --- a/savepointradio/core/utils.py +++ b/savepointradio/core/utils.py @@ -8,9 +8,10 @@ from .models import Setting def generate_password(length=32): - possible_characters = string.ascii_letters + string.digits + string.punctuation + chars = string.ascii_letters + string.digits + string.punctuation rng = random.SystemRandom() - return ''.join([rng.choice(possible_characters) for i in range(length)]) + return ''.join([rng.choice(chars) for i in range(length)]) + def get_len(rawqueryset): """ @@ -19,17 +20,21 @@ def get_len(rawqueryset): """ def __len__(self): params = ['{}'.format(p) for p in self.params] - sql = 'SELECT COUNT(*) FROM (' + rawqueryset.raw_query.format(tuple(params)) + ') B;' + sql = ''.join(('SELECT COUNT(*) FROM (', + rawqueryset.raw_query.format(tuple(params)), + ') B;')) cursor = connection.cursor() cursor.execute(sql) row = cursor.fetchone() return row[0] return __len__ + def get_setting(name): setting = Setting.objects.get(name=name) return setting.get() + def set_setting(name, value, setting_type=None): setting_types = {'Integer': 0, 'Float': 1, 'String': 2, 'Bool': 3} try: @@ -44,6 +49,6 @@ def set_setting(name, value, setting_type=None): setting_type=setting_types[setting_type], data=str(value)) else: - error_msg = 'New settings need a type (Integer, Float, String, Bool)' + error_msg = 'New settings need type (Integer, Float, String, Bool)' raise TypeError(error_msg) return diff --git a/savepointradio/savepointradio/settings/base.py b/savepointradio/savepointradio/settings/base.py index 05d6022..0a8d1dd 100644 --- a/savepointradio/savepointradio/settings/base.py +++ b/savepointradio/savepointradio/settings/base.py @@ -8,9 +8,9 @@ CONFIG_DIR = os.path.dirname(SETTINGS_DIR) PROJECT_DIR = os.path.dirname(CONFIG_DIR) BASE_DIR = os.path.dirname(PROJECT_DIR) -### -### Django-specific settings -### +# +# Django-specific settings +# AUTH_PASSWORD_VALIDATORS = [ { @@ -88,10 +88,10 @@ USE_TZ = True WSGI_APPLICATION = 'savepointradio.wsgi.application' -### -### Radio-specific settings -### +# +# Radio-specific settings +# RADIO_DJ_EMAIL = config('RADIO_DJ_EMAIL', default='dj@radiostation.net') -RADIO_DJ_NAME = config('RADIO_DJ_NAME', default='DJ Reinhardt') \ No newline at end of file +RADIO_DJ_NAME = config('RADIO_DJ_NAME', default='DJ Reinhardt')