Sourcery Starbot ⭐ refactored ahmadfikrimasyhur/flask-admin

examples/auth-flask-login/app.py

@@ -108,9 +108,11 @@ class MyAdminIndexView(admin.AdminIndexView):
 
     @expose('/')
     def index(self):
-        if not login.current_user.is_authenticated:
-            return redirect(url_for('.login_view'))
-        return super(MyAdminIndexView, self).index()
+        return (
+            super(MyAdminIndexView, self).index()
+            if login.current_user.is_authenticated
+            else redirect(url_for('.login_view'))
+        )
 
     @expose('/login/', methods=('GET', 'POST'))
     def login_view(self):
@@ -201,8 +203,14 @@ def build_sample_db():
         user.first_name = first_names[i]
         user.last_name = last_names[i]
         user.login = user.first_name.lower()
-        user.email = user.login + "@example.com"
-        user.password = generate_password_hash(''.join(random.choice(string.ascii_lowercase + string.digits) for i in range(10)))
+        user.email = f"{user.login}@example.com"
+        user.password = generate_password_hash(
+            ''.join(
+                random.choice(string.ascii_lowercase + string.digits)
+                for _ in range(10)
+            )
+        )
+
         db.session.add(user)
 
     db.session.commit()

examples/auth/app.py

@@ -138,8 +138,12 @@ def build_sample_db():
         ]
 
         for i in range(len(first_names)):
-            tmp_email = first_names[i].lower() + "." + last_names[i].lower() + "@example.com"
-            tmp_pass = ''.join(random.choice(string.ascii_lowercase + string.digits) for i in range(10))
+            tmp_email = f"{first_names[i].lower()}.{last_names[i].lower()}@example.com"
+            tmp_pass = ''.join(
+                random.choice(string.ascii_lowercase + string.digits)
+                for _ in range(10)
+            )
+
             user_datastore.create_user(
                 first_name=first_names[i],
                 last_name=last_names[i],

examples/auth/config.py

@@ -3,7 +3,7 @@
 
 # Create in-memory database
 DATABASE_FILE = 'sample_db.sqlite'
-SQLALCHEMY_DATABASE_URI = 'sqlite:///' + DATABASE_FILE
+SQLALCHEMY_DATABASE_URI = f'sqlite:///{DATABASE_FILE}'
 SQLALCHEMY_ECHO = True
 
 # Flask-Security config

examples/babel/app.py

@@ -23,9 +23,7 @@
 
 @babel.localeselector
 def get_locale():
-    override = request.args.get('lang')
-
-    if override:
+    if override := request.args.get('lang'):
         session['lang'] = override
 
     return session.get('lang', 'en')
@@ -58,7 +56,7 @@ def __unicode__(self):
 # Flask views
 @app.route('/')
 def index():
-    tmp = u"""
+    return u"""
 <p><a href="/admin/?lang=en">Click me to get to Admin! (English)</a></p>
 <p><a href="/admin/?lang=cs">Click me to get to Admin! (Czech)</a></p>
 <p><a href="/admin/?lang=de">Click me to get to Admin! (German)</a></p>
@@ -71,7 +69,6 @@ def index():
 <p><a href="/admin/?lang=zh_CN">Click me to get to Admin! (Chinese - Simplified)</a></p>
 <p><a href="/admin/?lang=zh_TW">Click me to get to Admin! (Chinese - Traditional)</a></p>
 """
-    return tmp
 
 if __name__ == '__main__':
     # Create admin

examples/bootstrap4/app.py

@@ -92,8 +92,8 @@ def build_sample_db():
 
     for i in range(len(first_names)):
         user = User()
-        user.name = first_names[i] + " " + last_names[i]
-        user.email = first_names[i].lower() + "@example.com"
+        user.name = f"{first_names[i]} {last_names[i]}"
+        user.email = f"{first_names[i].lower()}@example.com"
         db.session.add(user)
 
     sample_text = [

examples/custom-layout/app.py

@@ -86,8 +86,8 @@ def build_sample_db():
 
     for i in range(len(first_names)):
         user = User()
-        user.name = first_names[i] + " " + last_names[i]
-        user.email = first_names[i].lower() + "@example.com"
+        user.name = f"{first_names[i]} {last_names[i]}"
+        user.email = f"{first_names[i].lower()}@example.com"
         db.session.add(user)
 
     sample_text = [

examples/forms-files-images/app.py

@@ -111,7 +111,7 @@ class CKTextAreaWidget(widgets.TextArea):
     def __call__(self, field, **kwargs):
         # add WYSIWYG class to existing classes
         existing_classes = kwargs.pop('class', '') or kwargs.pop('class_', '')
-        kwargs['class'] = '{} {}'.format(existing_classes, "ckeditor")
+        kwargs['class'] = f'{existing_classes} ckeditor'
         return super(CKTextAreaWidget, self).__call__(field, **kwargs)
 
 
@@ -144,12 +144,15 @@ class FileView(sqla.ModelView):
 
 
 class ImageView(sqla.ModelView):
-    def _list_thumbnail(view, context, model, name):
-        if not model.path:
-            return ''
-
-        return Markup('<img src="%s">' % url_for('static',
-                                                 filename=form.thumbgen_filename(model.path)))
+    def _list_thumbnail(self, context, model, name):
+        return (
+            Markup(
+                '<img src="%s">'
+                % url_for('static', filename=form.thumbgen_filename(model.path))
+            )
+            if model.path
+            else ''
+        )
 
     column_formatters = {
         'path': _list_thumbnail
@@ -256,9 +259,9 @@ def build_sample_db():
         user = User()
         user.first_name = first_names[i]
         user.last_name = last_names[i]
-        user.email = user.first_name.lower() + "@example.com"
-        tmp = ''.join(random.choice(string.digits) for i in range(10))
-        user.phone = "(" + tmp[0:3] + ") " + tmp[3:6] + " " + tmp[6::]
+        user.email = f"{user.first_name.lower()}@example.com"
+        tmp = ''.join(random.choice(string.digits) for _ in range(10))
+        user.phone = "(" + tmp[:3] + ") " + tmp[3:6] + " " + tmp[6::]
         user.city = locations[i][0]
         user.country = locations[i][1]
         db.session.add(user)
@@ -267,13 +270,13 @@ def build_sample_db():
     for name in images:
         image = Image()
         image.name = name
-        image.path = name.lower() + ".jpg"
+        image.path = f"{name.lower()}.jpg"
         db.session.add(image)
 
     for i in [1, 2, 3]:
         file = File()
-        file.name = "Example " + str(i)
-        file.path = "example_" + str(i) + ".pdf"
+        file.name = f"Example {str(i)}"
+        file.path = f"example_{str(i)}.pdf"
         db.session.add(file)
 
     sample_text = "<h2>This is a test</h2>" + \

examples/peewee/app.py

@@ -32,7 +32,7 @@ class UserInfo(BaseModel):
     user = peewee.ForeignKeyField(User)
 
     def __unicode__(self):
-        return '%s - %s' % (self.key, self.value)
+        return f'{self.key} - {self.value}'
 
 
 class Post(BaseModel):

examples/pymongo/app.py

@@ -77,7 +77,7 @@ def get_list(self, *args, **kwargs):
         users = db.user.find(query, fields=('name',))
 
         # Contribute user names to the models
-        users_map = dict((x['_id'], x['name']) for x in users)
+        users_map = {x['_id']: x['name'] for x in users}
 
         for item in data:
             item['user_name'] = users_map.get(item['user_id'])

examples/sqla-association_proxy/app.py

@@ -67,7 +67,7 @@ def __init__(self, keyword=None):
         self.keyword = keyword
 
     def __repr__(self):
-        return 'Keyword(%s)' % repr(self.keyword)
+        return f'Keyword({repr(self.keyword)})'
 
 
 class UserAdmin(sqla.ModelView):

examples/sqla-custom-inline-forms/app.py

@@ -89,9 +89,7 @@ def postprocess_form(self, form_class):
         return form_class
 
     def on_model_change(self, form, model):
-        file_data = request.files.get(form.upload.name)
-
-        if file_data:
+        if file_data := request.files.get(form.upload.name):
             model.path = secure_filename(file_data.filename)
             file_data.save(op.join(base_path, model.path))
 

examples/sqla/admin/__init__.py

@@ -13,9 +13,7 @@
 
 @babel.localeselector
 def get_locale():
-    override = request.args.get('lang')
-
-    if override:
+    if override := request.args.get('lang'):
         session['lang'] = override
 
     return session.get('lang', 'en')

examples/sqla/admin/config.py

@@ -7,6 +7,6 @@
 
 # Create in-memory database
 DATABASE_FILE = 'sample_db.sqlite'
-SQLALCHEMY_DATABASE_URI = 'sqlite:///' + DATABASE_FILE
+SQLALCHEMY_DATABASE_URI = f'sqlite:///{DATABASE_FILE}'
 SQLALCHEMY_ECHO = True
 SQLALCHEMY_TRACK_MODIFICATIONS = False

examples/sqla/admin/data.py

@@ -41,7 +41,7 @@ def build_sample_db():
         user.type = random.choice(AVAILABLE_USER_TYPES)[0]
         user.first_name = first_names[i]
         user.last_name = last_names[i]
-        user.email = first_names[i].lower() + "@example.com"
+        user.email = f"{first_names[i].lower()}@example.com"
 
         user.website = "https://www.example.com"
         user.ip_address = "127.0.0.1"
@@ -107,7 +107,7 @@ def build_sample_db():
         entry = random.choice(sample_text)  # select text at random
         post = Post()
         post.user = user
-        post.title = "{}'s opinion on {}".format(user.first_name, entry['title'])
+        post.title = f"{user.first_name}'s opinion on {entry['title']}"
         post.text = entry['content']
         post.background_color = random.choice(["#cccccc", "red", "lightblue", "#0f0"])
         tmp = int(1000 * random.random())  # random number between 0 and 1000:
@@ -120,12 +120,12 @@ def build_sample_db():
     db.session.add(trunk)
     for i in range(5):
         branch = Tree()
-        branch.name = "Branch " + str(i + 1)
+        branch.name = f"Branch {str(i + 1)}"
         branch.parent = trunk
         db.session.add(branch)
         for j in range(5):
             leaf = Tree()
-            leaf.name = "Leaf " + str(j + 1)
+            leaf.name = f"Leaf {str(j + 1)}"
             leaf.parent = branch
             db.session.add(leaf)
 

examples/sqla/admin/main.py

@@ -15,7 +15,7 @@
 # Flask views
 @app.route('/')
 def index():
-    tmp = u"""
+    return u"""
 <p><a href="/admin/?lang=en">Click me to get to Admin! (English)</a></p>
 <p><a href="/admin/?lang=cs">Click me to get to Admin! (Czech)</a></p>
 <p><a href="/admin/?lang=de">Click me to get to Admin! (German)</a></p>
@@ -28,7 +28,6 @@ def index():
 <p><a href="/admin/?lang=zh_CN">Click me to get to Admin! (Chinese - Simplified)</a></p>
 <p><a href="/admin/?lang=zh_TW">Click me to get to Admin! (Chinese - Traditional)</a></p>
 """
-    return tmp
 
 
 @app.route('/favicon.ico')
@@ -50,7 +49,11 @@ def operation(self):
 
 # Customized User model admin
 def phone_number_formatter(view, context, model, name):
-    return Markup("<nobr>{}</nobr>".format(model.phone_number)) if model.phone_number else None
+    return (
+        Markup(f"<nobr>{model.phone_number}</nobr>")
+        if model.phone_number
+        else None
+    )
 
 
 def is_numberic_validator(form, field):

examples/sqla/admin/models.py

@@ -54,18 +54,21 @@ class User(db.Model):
     def phone_number(self):
         if self.dialling_code and self.local_phone_number:
             number = str(self.local_phone_number)
-            return "+{} ({}) {} {} {}".format(self.dialling_code, number[0], number[1:3], number[3:6], number[6::])
+            return f"+{self.dialling_code} ({number[0]}) {number[1:3]} {number[3:6]} {number[6::]}"
+
         return
 
     @phone_number.expression
-    def phone_number(cls):
-        return sql.operators.ColumnOperators.concat(cast(cls.dialling_code, db.String), cls.local_phone_number)
+    def phone_number(self):
+        return sql.operators.ColumnOperators.concat(
+            cast(self.dialling_code, db.String), self.local_phone_number
+        )
 
     def __str__(self):
-        return "{}, {}".format(self.last_name, self.first_name)
+        return f"{self.last_name}, {self.first_name}"
 
     def __repr__(self):
-        return "{}: {}".format(self.id, self.__str__())
+        return f"{self.id}: {self.__str__()}"
 
 
 # Create M2M table
@@ -90,15 +93,15 @@ class Post(db.Model):
     tags = db.relationship('Tag', secondary=post_tags_table)
 
     def __str__(self):
-        return "{}".format(self.title)
+        return f"{self.title}"
 
 
 class Tag(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode(64), unique=True)
 
     def __str__(self):
-        return "{}".format(self.name)
+        return f"{self.name}"
 
 
 class Tree(db.Model):
@@ -110,4 +113,4 @@ class Tree(db.Model):
     parent = db.relationship('Tree', remote_side=[id], backref='children')
 
     def __str__(self):
-        return "{}".format(self.name)
+        return f"{self.name}"

flask_admin/_backwards.py

@@ -29,8 +29,11 @@ def get_property(obj, name, old_name, default=None):
             Default value
     """
     if hasattr(obj, old_name):
-        warnings.warn('Property %s is obsolete, please use %s instead' %
-                      (old_name, name), stacklevel=2)
+        warnings.warn(
+            f'Property {old_name} is obsolete, please use {name} instead',
+            stacklevel=2,
+        )
+
         return getattr(obj, old_name)
 
     return getattr(obj, name, default)
@@ -40,7 +43,7 @@ class ObsoleteAttr(object):
     def __init__(self, new_name, old_name, default):
         self.new_name = new_name
         self.old_name = old_name
-        self.cache = '_cache_' + new_name
+        self.cache = f'_cache_{new_name}'
         self.default = default
 
     def __get__(self, obj, objtype=None):
@@ -53,8 +56,11 @@ def __get__(self, obj, objtype=None):
 
         # Check if there's old attribute
         if hasattr(obj, self.old_name):
-            warnings.warn('Property %s is obsolete, please use %s instead' %
-                          (self.old_name, self.new_name), stacklevel=2)
+            warnings.warn(
+                f'Property {self.old_name} is obsolete, please use {self.new_name} instead',
+                stacklevel=2,
+            )
+
             return getattr(obj, self.old_name)
 
         # Return default otherwise

flask_admin/_compat.py

@@ -27,10 +27,7 @@
     filter_list = lambda f, l: list(filter(f, l))
 
     def as_unicode(s):
-        if isinstance(s, bytes):
-            return s.decode('utf-8')
-
-        return str(s)
+        return s.decode('utf-8') if isinstance(s, bytes) else str(s)
 
     def csv_encode(s):
         ''' Returns unicode string expected by Python 3's csv module '''
@@ -50,10 +47,7 @@ def csv_encode(s):
     filter_list = filter
 
     def as_unicode(s):
-        if isinstance(s, str):
-            return s.decode('utf-8')
-
-        return unicode(s)
+        return s.decode('utf-8') if isinstance(s, str) else unicode(s)
 
     def csv_encode(s):
         ''' Returns byte string expected by Python 2's csv module '''