diff --git a/examples/auth-flask-login/app.py b/examples/auth-flask-login/app.py
index b29803841..587f53329 100644
--- a/examples/auth-flask-login/app.py
+++ b/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()
diff --git a/examples/auth/app.py b/examples/auth/app.py
index f9cf7bc75..ebe0e2eac 100644
--- a/examples/auth/app.py
+++ b/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],
diff --git a/examples/auth/config.py b/examples/auth/config.py
index c25c011ff..3f199a33f 100644
--- a/examples/auth/config.py
+++ b/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
diff --git a/examples/babel/app.py b/examples/babel/app.py
index 8275be64e..c0950bb58 100644
--- a/examples/babel/app.py
+++ b/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"""
Click me to get to Admin! (English)
Click me to get to Admin! (Czech)
Click me to get to Admin! (German)
@@ -71,7 +69,6 @@ def index():
Click me to get to Admin! (Chinese - Simplified)
Click me to get to Admin! (Chinese - Traditional)
"""
- return tmp
if __name__ == '__main__':
# Create admin
diff --git a/examples/bootstrap4/app.py b/examples/bootstrap4/app.py
index bd766c17d..700810bb2 100644
--- a/examples/bootstrap4/app.py
+++ b/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 = [
diff --git a/examples/custom-layout/app.py b/examples/custom-layout/app.py
index 9660c9723..e8bcf8419 100644
--- a/examples/custom-layout/app.py
+++ b/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 = [
diff --git a/examples/forms-files-images/app.py b/examples/forms-files-images/app.py
index e39136c0f..3a2e6467b 100644
--- a/examples/forms-files-images/app.py
+++ b/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('
' % url_for('static',
- filename=form.thumbgen_filename(model.path)))
+ def _list_thumbnail(self, context, model, name):
+ return (
+ Markup(
+ ''
+ % 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 = "This is a test
" + \
diff --git a/examples/peewee/app.py b/examples/peewee/app.py
index de0113575..cdeb042a9 100644
--- a/examples/peewee/app.py
+++ b/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):
diff --git a/examples/pymongo/app.py b/examples/pymongo/app.py
index dc66b28b0..519108e2a 100644
--- a/examples/pymongo/app.py
+++ b/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'])
diff --git a/examples/sqla-association_proxy/app.py b/examples/sqla-association_proxy/app.py
index 8d8e32ee9..f2c814771 100644
--- a/examples/sqla-association_proxy/app.py
+++ b/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):
diff --git a/examples/sqla-custom-inline-forms/app.py b/examples/sqla-custom-inline-forms/app.py
index 659d80d74..19563a4be 100644
--- a/examples/sqla-custom-inline-forms/app.py
+++ b/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))
diff --git a/examples/sqla/admin/__init__.py b/examples/sqla/admin/__init__.py
index 99c979b39..cabdbd502 100644
--- a/examples/sqla/admin/__init__.py
+++ b/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')
diff --git a/examples/sqla/admin/config.py b/examples/sqla/admin/config.py
index c685d83a0..86c9b7541 100644
--- a/examples/sqla/admin/config.py
+++ b/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
diff --git a/examples/sqla/admin/data.py b/examples/sqla/admin/data.py
index 0cb461356..44f146c38 100644
--- a/examples/sqla/admin/data.py
+++ b/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)
diff --git a/examples/sqla/admin/main.py b/examples/sqla/admin/main.py
index 3fc7878a4..60a9c47df 100644
--- a/examples/sqla/admin/main.py
+++ b/examples/sqla/admin/main.py
@@ -15,7 +15,7 @@
# Flask views
@app.route('/')
def index():
- tmp = u"""
+ return u"""
Click me to get to Admin! (English)
Click me to get to Admin! (Czech)
Click me to get to Admin! (German)
@@ -28,7 +28,6 @@ def index():
Click me to get to Admin! (Chinese - Simplified)
Click me to get to Admin! (Chinese - Traditional)
"""
- 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("{}".format(model.phone_number)) if model.phone_number else None
+ return (
+ Markup(f"{model.phone_number}")
+ if model.phone_number
+ else None
+ )
def is_numberic_validator(form, field):
diff --git a/examples/sqla/admin/models.py b/examples/sqla/admin/models.py
index 25d1f1a27..0dac1bf25 100644
--- a/examples/sqla/admin/models.py
+++ b/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,7 +93,7 @@ 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):
@@ -98,7 +101,7 @@ class Tag(db.Model):
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}"
diff --git a/flask_admin/_backwards.py b/flask_admin/_backwards.py
index 0f1a2a49b..efbc73a4d 100644
--- a/flask_admin/_backwards.py
+++ b/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
diff --git a/flask_admin/_compat.py b/flask_admin/_compat.py
index 610d29301..84f71370e 100644
--- a/flask_admin/_compat.py
+++ b/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 '''
diff --git a/flask_admin/actions.py b/flask_admin/actions.py
index f217fa0c4..4bed96132 100644
--- a/flask_admin/actions.py
+++ b/flask_admin/actions.py
@@ -89,8 +89,7 @@ def get_actions_list(self):
if self.is_action_allowed(name):
actions.append((name, text_type(text)))
- confirmation = self._actions_data[name][2]
- if confirmation:
+ if confirmation := self._actions_data[name][2]:
actions_confirmation[name] = text_type(confirmation)
return actions, actions_confirmation
@@ -122,7 +121,7 @@ def handle_action(self, return_view=None):
flash_errors(form, message='Failed to perform action. %(error)s')
if return_view:
- url = self.get_url('.' + return_view)
+ url = self.get_url(f'.{return_view}')
else:
url = get_redirect_target() or self.get_url('.index_view')
diff --git a/flask_admin/base.py b/flask_admin/base.py
index e706c916e..9bb0963f7 100644
--- a/flask_admin/base.py
+++ b/flask_admin/base.py
@@ -42,10 +42,7 @@ def expose_plugview(url='/'):
def wrap(v):
handler = expose(url, v.methods)
- if hasattr(v, 'as_view'):
- return handler(v.as_view(v.__name__))
- else:
- return handler(v)
+ return handler(v.as_view(v.__name__)) if hasattr(v, 'as_view') else handler(v)
return wrap
@@ -80,26 +77,26 @@ class AdminViewMeta(type):
Does some precalculations (like getting list of view methods from the class) to avoid
calculating them for each view class instance.
"""
- def __init__(cls, classname, bases, fields):
- type.__init__(cls, classname, bases, fields)
+ def __init__(self, classname, bases, fields):
+ type.__init__(self, classname, bases, fields)
# Gather exposed views
- cls._urls = []
- cls._default_view = None
+ self._urls = []
+ self._default_view = None
- for p in dir(cls):
- attr = getattr(cls, p)
+ for p in dir(self):
+ attr = getattr(self, p)
if hasattr(attr, '_urls'):
# Collect methods
for url, methods in attr._urls:
- cls._urls.append((url, p, methods))
+ self._urls.append((url, p, methods))
if url == '/':
- cls._default_view = p
+ self._default_view = p
# Wrap views
- setattr(cls, p, _wrap_view(attr))
+ setattr(self, p, _wrap_view(attr))
class BaseViewClass(object):
@@ -205,33 +202,28 @@ def __init__(self, name=None, category=None, endpoint=None, url=None,
# Default view
if self._default_view is None:
- raise Exception(u'Attempted to instantiate admin view %s without default view' % self.__class__.__name__)
+ raise Exception(
+ f'Attempted to instantiate admin view {self.__class__.__name__} without default view'
+ )
def _get_endpoint(self, endpoint):
"""
Generate Flask endpoint name. By default converts class name to lower case if endpoint is
not explicitly provided.
"""
- if endpoint:
- return endpoint
-
- return self.__class__.__name__.lower()
+ return endpoint or self.__class__.__name__.lower()
def _get_view_url(self, admin, url):
"""
Generate URL for the view. Override to change default behavior.
"""
if url is None:
- if admin.url != '/':
- url = '%s/%s' % (admin.url, self.endpoint)
+ if admin.url == '/':
+ url = '/' if self == admin.index_view else f'/{self.endpoint}'
else:
- if self == admin.index_view:
- url = '/'
- else:
- url = '/%s' % self.endpoint
- else:
- if not url.startswith('/'):
- url = '%s/%s' % (admin.url, url)
+ url = f'{admin.url}/{self.endpoint}'
+ elif not url.startswith('/'):
+ url = f'{admin.url}/{url}'
return url
@@ -391,10 +383,7 @@ def get_url(self, endpoint, **kwargs):
@property
def _debug(self):
- if not self.admin or not self.admin.app:
- return False
-
- return self.admin.app.debug
+ return False if not self.admin or not self.admin.app else self.admin.app.debug
class AdminIndexView(BaseView):
@@ -502,7 +491,7 @@ def __init__(self, app=None, name=None,
self._views = []
self._menu = []
- self._menu_categories = dict()
+ self._menu_categories = {}
self._menu_links = []
if name is None:
@@ -722,7 +711,7 @@ def init_app(self, app, index_view=None,
def _init_extension(self):
if not hasattr(self.app, 'extensions'):
- self.app.extensions = dict()
+ self.app.extensions = {}
admins = self.app.extensions.get('admin', [])
diff --git a/flask_admin/contrib/appengine/view.py b/flask_admin/contrib/appengine/view.py
index 010e4bdab..7adc9daea 100644
--- a/flask_admin/contrib/appengine/view.py
+++ b/flask_admin/contrib/appengine/view.py
@@ -53,7 +53,7 @@ class MyAdminView(ModelView):
"""
def scaffold_form(self):
- form_class = wt_ndb.model_form(
+ return wt_ndb.model_form(
self.model(),
base_class=Form,
only=self.form_columns,
@@ -61,7 +61,6 @@ def scaffold_form(self):
field_args=self.form_args,
converter=self.model_form_converter(),
)
- return form_class
def scaffold_list_form(self, widget=None, validators=None):
form_class = wt_ndb.model_form(
@@ -71,8 +70,7 @@ def scaffold_list_form(self, widget=None, validators=None):
field_args=self.form_args,
converter=self.model_form_converter(),
)
- result = create_editable_list_form(Form, form_class, widget)
- return result
+ return create_editable_list_form(Form, form_class, widget)
def get_list(self, page, sort_field, sort_desc, search, filters,
page_size=None):
@@ -179,7 +177,7 @@ def get_list(self, page, sort_field, sort_desc, search, filters):
if sort_field:
if sort_desc:
- sort_field = "-" + sort_field
+ sort_field = f"-{sort_field}"
q.order(sort_field)
results = q.fetch(self.page_size, offset=page * self.page_size)
@@ -232,4 +230,4 @@ def ModelView(model):
elif issubclass(model, db.Model):
return DbModelView(model)
else:
- raise ValueError("Unsupported model: %s" % model)
+ raise ValueError(f"Unsupported model: {model}")
diff --git a/flask_admin/contrib/fileadmin/__init__.py b/flask_admin/contrib/fileadmin/__init__.py
index f5c786adb..8c08835ba 100644
--- a/flask_admin/contrib/fileadmin/__init__.py
+++ b/flask_admin/contrib/fileadmin/__init__.py
@@ -481,10 +481,7 @@ def edit_form(self):
Override to implement custom behavior.
"""
edit_form_class = self.get_edit_form()
- if request.form:
- return edit_form_class(request.form)
- else:
- return edit_form_class()
+ return edit_form_class(request.form) if request.form else edit_form_class()
def delete_form(self):
"""
@@ -493,10 +490,7 @@ def delete_form(self):
Override to implement custom behavior.
"""
delete_form_class = self.get_delete_form()
- if request.form:
- return delete_form_class(request.form)
- else:
- return delete_form_class()
+ return delete_form_class(request.form) if request.form else delete_form_class()
def action_form(self):
"""
@@ -505,10 +499,7 @@ def action_form(self):
Override to implement custom behavior.
"""
action_form_class = self.get_action_form()
- if request.form:
- return action_form_class(request.form)
- else:
- return action_form_class()
+ return action_form_class(request.form) if request.form else action_form_class()
def is_file_allowed(self, filename):
"""
@@ -590,15 +581,13 @@ def _get_dir_url(self, endpoint, path=None, **kwargs):
:param kwargs:
Additional arguments
"""
- if not path:
- return self.get_url(endpoint, **kwargs)
- else:
+ if path:
if self._on_windows:
path = path.replace('\\', '/')
kwargs['path'] = path
- return self.get_url(endpoint, **kwargs)
+ return self.get_url(endpoint, **kwargs)
def _get_file_url(self, path, **kwargs):
"""
@@ -610,11 +599,7 @@ def _get_file_url(self, path, **kwargs):
if self._on_windows:
path = path.replace('\\', '/')
- if self.is_file_editable(path):
- route = '.edit'
- else:
- route = '.download'
-
+ route = '.edit' if self.is_file_editable(path) else '.download'
return self.get_url(route, path=path, **kwargs)
def _normalize_path(self, path):
@@ -631,11 +616,7 @@ def _normalize_path(self, path):
path = ''
else:
path = op.normpath(path)
- if base_path:
- directory = self._separator.join([base_path, path])
- else:
- directory = path
-
+ directory = self._separator.join([base_path, path]) if base_path else path
directory = op.normpath(directory)
if not self.is_in_folder(base_path, directory):
@@ -871,14 +852,10 @@ def index_view(self, path=None):
action_form = None
def sort_url(column, path, invert=False):
- desc = None
-
if not path:
path = None
- if invert and not sort_desc:
- desc = 1
-
+ desc = 1 if invert and not sort_desc else None
return self.get_url('.index_view', path=path, sort=column, desc=desc)
return self.render(self.list_template,
@@ -948,9 +925,7 @@ def download(self, path=None):
base_path, directory, path = self._normalize_path(path)
- # backward compatibility with base_url
- base_url = self.get_base_url()
- if base_url:
+ if base_url := self.get_base_url():
base_url = urljoin(self.get_url('.index_view'), base_url)
return redirect(urljoin(quote(base_url), quote(path)))
@@ -1063,13 +1038,12 @@ def rename(self):
form = self.name_form()
path = form.path.data
- if path:
- base_path, full_path, path = self._normalize_path(path)
-
- return_url = self._get_dir_url('.index_view', op.dirname(path))
- else:
+ if not path:
return redirect(self.get_url('.index_view'))
+ base_path, full_path, path = self._normalize_path(path)
+
+ return_url = self._get_dir_url('.index_view', op.dirname(path))
if not self.can_rename:
flash(gettext('Renaming is disabled.'), 'error')
return redirect(return_url)
@@ -1113,15 +1087,11 @@ def edit(self):
"""
Edit view method
"""
- next_url = None
-
path = request.args.getlist('path')
if not path:
return redirect(self.get_url('.index_view'))
- if len(path) > 1:
- next_url = self.get_url('.edit', path=path[1:])
-
+ next_url = self.get_url('.edit', path=path[1:]) if len(path) > 1 else None
path = path[0]
base_path, full_path, path = self._normalize_path(path)
@@ -1156,18 +1126,12 @@ def edit(self):
except IOError:
flash(gettext("Error reading %(name)s.", name=path), 'error')
error = True
- except:
- flash(gettext("Unexpected error while reading from %(name)s", name=path), 'error')
- error = True
else:
try:
content = content.decode('utf8')
except UnicodeDecodeError:
flash(gettext("Cannot edit %(name)s.", name=path), 'error')
error = True
- except:
- flash(gettext("Unexpected error while reading from %(name)s", name=path), 'error')
- error = True
else:
form.content.data = content
diff --git a/flask_admin/contrib/fileadmin/azure.py b/flask_admin/contrib/fileadmin/azure.py
index 8e0fb44e3..1d389d097 100644
--- a/flask_admin/contrib/fileadmin/azure.py
+++ b/flask_admin/contrib/fileadmin/azure.py
@@ -112,10 +112,10 @@ def get_files(self, path, directory):
folders.add(folder_name)
folders.discard(directory)
+ is_dir = True
for folder in folders:
name = folder.split(self.separator)[-1]
rel_path = folder
- is_dir = True
size = 0
last_modified = 0
files.append((name, rel_path, is_dir, size, last_modified))
@@ -125,14 +125,12 @@ def get_files(self, path, directory):
def is_dir(self, path):
path = self._ensure_blob_path(path)
- num_blobs = 0
- for blob in self._client.list_blobs(self._container_name, path):
+ for num_blobs, blob in enumerate(self._client.list_blobs(self._container_name, path), start=1):
blob_path_parts = blob.name.split(self.separator)
is_explicit_directory = blob_path_parts[-1] == self._fakedir
if is_explicit_directory:
return True
- num_blobs += 1
path_cannot_be_leaf = num_blobs >= 2
if path_cannot_be_leaf:
return True
@@ -178,7 +176,7 @@ def send_file(self, file_path):
BlobPermissions.READ,
expiry=now + self._send_file_validity,
start=now - self._send_file_lookback)
- return redirect('%s?%s' % (url, sas))
+ return redirect(f'{url}?{sas}')
def read_file(self, path):
path = self._ensure_blob_path(path)
diff --git a/flask_admin/contrib/fileadmin/s3.py b/flask_admin/contrib/fileadmin/s3.py
index 1c9bdc719..8eeb7879c 100644
--- a/flask_admin/contrib/fileadmin/s3.py
+++ b/flask_admin/contrib/fileadmin/s3.py
@@ -65,9 +65,7 @@ def __init__(self, bucket_name, region, aws_access_key_id,
def get_files(self, path, directory):
def _strip_path(name, path):
- if name.startswith(path):
- return name.replace(path, '', 1)
- return name
+ return name.replace(path, '', 1) if name.startswith(path) else name
def _remove_trailing_slash(name):
return name[:-1]
@@ -95,11 +93,11 @@ def _iso_to_epoch(timestamp):
def _get_bucket_list_prefix(self, path):
parts = path.split(self.separator)
- if len(parts) == 1:
- search = ''
- else:
- search = self.separator.join(parts[:-1]) + self.separator
- return search
+ return (
+ ''
+ if len(parts) == 1
+ else self.separator.join(parts[:-1]) + self.separator
+ )
def _get_path_keys(self, path):
search = self._get_bucket_list_prefix(path)
diff --git a/flask_admin/contrib/geoa/fields.py b/flask_admin/contrib/geoa/fields.py
index 0e9a30371..3d7f75bd3 100644
--- a/flask_admin/contrib/geoa/fields.py
+++ b/flask_admin/contrib/geoa/fields.py
@@ -19,31 +19,27 @@ def __init__(self, label=None, validators=None, geometry_type="GEOMETRY",
super(GeoJSONField, self).__init__(label, validators, **kwargs)
self.web_srid = 4326
self.srid = srid
- if self.srid == -1:
- self.transform_srid = self.web_srid
- else:
- self.transform_srid = self.srid
+ self.transform_srid = self.web_srid if self.srid == -1 else self.srid
self.geometry_type = geometry_type.upper()
self.session = session
def _value(self):
if self.raw_data:
return self.raw_data[0]
- if type(self.data) is geoalchemy2.elements.WKBElement:
- if self.srid == -1:
- return self.session.scalar(func.ST_AsGeoJSON(self.data))
- else:
- return self.session.scalar(
- func.ST_AsGeoJSON(
- func.ST_Transform(self.data, self.web_srid)
- )
- )
- else:
+ if type(self.data) is not geoalchemy2.elements.WKBElement:
return ''
+ if self.srid == -1:
+ return self.session.scalar(func.ST_AsGeoJSON(self.data))
+ else:
+ return self.session.scalar(
+ func.ST_AsGeoJSON(
+ func.ST_Transform(self.data, self.web_srid)
+ )
+ )
def process_formdata(self, valuelist):
super(GeoJSONField, self).process_formdata(valuelist)
- if str(self.data) == '':
+ if not str(self.data):
self.data = None
if self.data is not None:
web_shape = self.session.scalar(
@@ -57,4 +53,4 @@ def process_formdata(self, valuelist):
)
)
)
- self.data = 'SRID=' + str(self.srid) + ';' + str(web_shape)
+ self.data = f'SRID={str(self.srid)};{str(web_shape)}'
diff --git a/flask_admin/contrib/geoa/typefmt.py b/flask_admin/contrib/geoa/typefmt.py
index 4e1902247..605e91687 100644
--- a/flask_admin/contrib/geoa/typefmt.py
+++ b/flask_admin/contrib/geoa/typefmt.py
@@ -22,7 +22,7 @@ def geom_formatter(view, value):
value.srid = 4326
geojson = view.session.query(view.model).with_entities(func.ST_AsGeoJSON(value)).scalar()
- return Markup('' % (params, geojson))
+ return Markup(f'')
DEFAULT_FORMATTERS = BASE_FORMATTERS.copy()
diff --git a/flask_admin/contrib/mongoengine/ajax.py b/flask_admin/contrib/mongoengine/ajax.py
index 470911fbc..7c190ffbd 100644
--- a/flask_admin/contrib/mongoengine/ajax.py
+++ b/flask_admin/contrib/mongoengine/ajax.py
@@ -20,7 +20,9 @@ def __init__(self, name, model, **options):
self._cached_fields = self._process_fields()
if not self.fields:
- raise ValueError('AJAX loading requires `fields` to be specified for %s.%s' % (model, self.name))
+ raise ValueError(
+ f'AJAX loading requires `fields` to be specified for {model}.{self.name}'
+ )
def _process_fields(self):
remote_fields = []
@@ -30,7 +32,7 @@ def _process_fields(self):
attr = getattr(self.model, field, None)
if not attr:
- raise ValueError('%s.%s does not exist.' % (self.model, field))
+ raise ValueError(f'{self.model}.{field} does not exist.')
remote_fields.append(attr)
else:
@@ -39,10 +41,7 @@ def _process_fields(self):
return remote_fields
def format(self, model):
- if not model:
- return None
-
- return (as_unicode(model.pk), as_unicode(model))
+ return (as_unicode(model.pk), as_unicode(model)) if model else None
def get_one(self, pk):
return self.model.objects.filter(pk=pk).first()
@@ -54,7 +53,7 @@ def get_list(self, term, offset=0, limit=DEFAULT_PAGE_SIZE):
criteria = None
for field in self._cached_fields:
- flt = {u'%s__icontains' % field.name: term}
+ flt = {f'{field.name}__icontains': term}
if not criteria:
criteria = mongoengine.Q(**flt)
@@ -73,16 +72,16 @@ def create_ajax_loader(model, name, field_name, opts):
prop = getattr(model, field_name, None)
if prop is None:
- raise ValueError('Model %s does not have field %s.' % (model, field_name))
+ raise ValueError(f'Model {model} does not have field {field_name}.')
ftype = type(prop).__name__
- if ftype == 'ListField' or ftype == 'SortedListField':
+ if ftype in ['ListField', 'SortedListField']:
prop = prop.field
ftype = type(prop).__name__
if ftype != 'ReferenceField':
- raise ValueError('Dont know how to convert %s type for AJAX loader' % ftype)
+ raise ValueError(f'Dont know how to convert {ftype} type for AJAX loader')
remote_model = prop.document_type
return QueryAjaxModelLoader(name, remote_model, **opts)
@@ -90,18 +89,13 @@ def create_ajax_loader(model, name, field_name, opts):
def process_ajax_references(references, view):
def make_name(base, name):
- if base:
- return ('%s-%s' % (base, name)).lower()
- else:
- return as_unicode(name).lower()
+ return f'{base}-{name}'.lower() if base else as_unicode(name).lower()
def handle_field(field, subdoc, base):
ftype = type(field).__name__
- if ftype == 'ListField' or ftype == 'SortedListField':
- child_doc = getattr(subdoc, '_form_subdocuments', {}).get(None)
-
- if child_doc:
+ if ftype in ['ListField', 'SortedListField']:
+ if child_doc := getattr(subdoc, '_form_subdocuments', {}).get(None):
handle_field(field.field, child_doc, base)
elif ftype == 'EmbeddedDocumentField':
result = {}
@@ -121,11 +115,10 @@ def handle_field(field, subdoc, base):
subdoc._form_ajax_refs = result
- child_doc = getattr(subdoc, '_form_subdocuments', None)
- if child_doc:
+ if child_doc := getattr(subdoc, '_form_subdocuments', None):
handle_subdoc(field.document_type_obj, subdoc, base)
else:
- raise ValueError('Failed to process subdocument field %s' % (field,))
+ raise ValueError(f'Failed to process subdocument field {field}')
def handle_subdoc(model, subdoc, base):
documents = getattr(subdoc, '_form_subdocuments', {})
@@ -134,7 +127,7 @@ def handle_subdoc(model, subdoc, base):
field = getattr(model, name, None)
if not field:
- raise ValueError('Invalid subdocument field %s.%s' % (model, name))
+ raise ValueError(f'Invalid subdocument field {model}.{name}')
handle_field(field, doc, make_name(base, name))
diff --git a/flask_admin/contrib/mongoengine/fields.py b/flask_admin/contrib/mongoengine/fields.py
index 64418ecb0..eaeb9308b 100644
--- a/flask_admin/contrib/mongoengine/fields.py
+++ b/flask_admin/contrib/mongoengine/fields.py
@@ -59,7 +59,7 @@ def __init__(self, label=None, validators=None, **kwargs):
def process(self, formdata, data=unset_value):
if formdata:
- marker = '_%s-delete' % self.name
+ marker = f'_{self.name}-delete'
if marker in formdata:
self._should_delete = True
@@ -74,11 +74,7 @@ def populate_obj(self, obj, name):
return
if isinstance(self.data, FileStorage) and not is_empty(self.data.stream):
- if not field.grid_id:
- func = field.put
- else:
- func = field.replace
-
+ func = field.replace if field.grid_id else field.put
func(self.data.stream,
filename=self.data.filename,
content_type=self.data.content_type)
diff --git a/flask_admin/contrib/mongoengine/filters.py b/flask_admin/contrib/mongoengine/filters.py
index ccbe30368..94cf952b1 100644
--- a/flask_admin/contrib/mongoengine/filters.py
+++ b/flask_admin/contrib/mongoengine/filters.py
@@ -32,7 +32,7 @@ def __init__(self, column, name, options=None, data_type=None):
# Common filters
class FilterEqual(BaseMongoEngineFilter):
def apply(self, query, value):
- flt = {'%s' % self.column.name: value}
+ flt = {f'{self.column.name}': value}
return query.filter(**flt)
def operation(self):
@@ -41,7 +41,7 @@ def operation(self):
class FilterNotEqual(BaseMongoEngineFilter):
def apply(self, query, value):
- flt = {'%s__ne' % self.column.name: value}
+ flt = {f'{self.column.name}__ne': value}
return query.filter(**flt)
def operation(self):
@@ -51,7 +51,7 @@ def operation(self):
class FilterLike(BaseMongoEngineFilter):
def apply(self, query, value):
term, data = parse_like_term(value)
- flt = {'%s__%s' % (self.column.name, term): data}
+ flt = {f'{self.column.name}__{term}': data}
return query.filter(**flt)
def operation(self):
@@ -61,7 +61,7 @@ def operation(self):
class FilterNotLike(BaseMongoEngineFilter):
def apply(self, query, value):
term, data = parse_like_term(value)
- flt = {'%s__not__%s' % (self.column.name, term): data}
+ flt = {f'{self.column.name}__not__{term}': data}
return query.filter(**flt)
def operation(self):
@@ -70,7 +70,7 @@ def operation(self):
class FilterGreater(BaseMongoEngineFilter):
def apply(self, query, value):
- flt = {'%s__gt' % self.column.name: value}
+ flt = {f'{self.column.name}__gt': value}
return query.filter(**flt)
def operation(self):
@@ -79,7 +79,7 @@ def operation(self):
class FilterSmaller(BaseMongoEngineFilter):
def apply(self, query, value):
- flt = {'%s__lt' % self.column.name: value}
+ flt = {f'{self.column.name}__lt': value}
return query.filter(**flt)
def operation(self):
@@ -89,9 +89,9 @@ def operation(self):
class FilterEmpty(BaseMongoEngineFilter, filters.BaseBooleanFilter):
def apply(self, query, value):
if value == '1':
- flt = {'%s' % self.column.name: None}
+ flt = {f'{self.column.name}': None}
else:
- flt = {'%s__ne' % self.column.name: None}
+ flt = {f'{self.column.name}__ne': None}
return query.filter(**flt)
def operation(self):
@@ -106,7 +106,7 @@ def clean(self, value):
return [v.strip() for v in value.split(',') if v.strip()]
def apply(self, query, value):
- flt = {'%s__in' % self.column.name: value}
+ flt = {f'{self.column.name}__in': value}
return query.filter(**flt)
def operation(self):
@@ -115,7 +115,7 @@ def operation(self):
class FilterNotInList(FilterInList):
def apply(self, query, value):
- flt = {'%s__nin' % self.column.name: value}
+ flt = {f'{self.column.name}__nin': value}
return query.filter(**flt)
def operation(self):
@@ -125,13 +125,13 @@ def operation(self):
# Customized type filters
class BooleanEqualFilter(FilterEqual, filters.BaseBooleanFilter):
def apply(self, query, value):
- flt = {'%s' % self.column.name: value == '1'}
+ flt = {f'{self.column.name}': value == '1'}
return query.filter(**flt)
class BooleanNotEqualFilter(FilterNotEqual, filters.BaseBooleanFilter):
def apply(self, query, value):
- flt = {'%s' % self.column.name: value != '1'}
+ flt = {f'{self.column.name}': value != '1'}
return query.filter(**flt)
@@ -208,15 +208,19 @@ def __init__(self, column, name, options=None, data_type=None):
def apply(self, query, value):
start, end = value
- flt = {'%s__gte' % self.column.name: start, '%s__lte' % self.column.name: end}
+ flt = {f'{self.column.name}__gte': start, f'{self.column.name}__lte': end}
return query.filter(**flt)
class DateTimeNotBetweenFilter(DateTimeBetweenFilter):
def apply(self, query, value):
start, end = value
- return query.filter(Q(**{'%s__not__gte' % self.column.name: start}) |
- Q(**{'%s__not__lte' % self.column.name: end}))
+ return query.filter(
+ (
+ Q(**{f'{self.column.name}__not__gte': start})
+ | Q(**{f'{self.column.name}__not__lte': end})
+ )
+ )
def operation(self):
return lazy_gettext('not between')
@@ -240,7 +244,7 @@ def clean(self, value):
return ObjectId(value.strip())
def apply(self, query, value):
- flt = {'%s' % self.column.name: value}
+ flt = {f'{self.column.name}': value}
return query.filter(**flt)
def operation(self):
diff --git a/flask_admin/contrib/mongoengine/form.py b/flask_admin/contrib/mongoengine/form.py
index 1934f2bc3..e47628c85 100644
--- a/flask_admin/contrib/mongoengine/form.py
+++ b/flask_admin/contrib/mongoengine/form.py
@@ -28,9 +28,7 @@ def __init__(self, view):
self.view = view
def _get_field_override(self, name):
- form_overrides = getattr(self.view, 'form_overrides', None)
-
- if form_overrides:
+ if form_overrides := getattr(self.view, 'form_overrides', None):
return form_overrides.get(name)
return None
@@ -68,7 +66,7 @@ def convert(self, model, field, field_args):
}
if field_args:
- kwargs.update(field_args)
+ kwargs |= field_args
if kwargs['validators']:
# Create a copy of the list since we will be modifying it.
@@ -98,8 +96,7 @@ def convert(self, model, field, field_args):
if hasattr(field, 'to_form_field'):
return field.to_form_field(model, kwargs)
- override = self._get_field_override(field.name)
- if override:
+ if override := self._get_field_override(field.name):
return override(**kwargs)
if ftype in self.converters:
@@ -116,8 +113,7 @@ def conv_List(self, model, field, kwargs):
raise ValueError('ListField "%s" must have field specified for model %s' % (field.name, model))
if isinstance(field.field, ReferenceField):
- loader = getattr(self.view, '_form_ajax_refs', {}).get(field.name)
- if loader:
+ if loader := getattr(self.view, '_form_ajax_refs', {}).get(field.name):
return AjaxSelectMultipleField(loader, **kwargs)
kwargs['widget'] = form.Select2Widget(multiple=True)
@@ -166,8 +162,7 @@ def conv_EmbeddedDocument(self, model, field, kwargs):
def conv_Reference(self, model, field, kwargs):
kwargs['allow_blank'] = not field.required
- loader = getattr(self.view, '_form_ajax_refs', {}).get(field.name)
- if loader:
+ if loader := getattr(self.view, '_form_ajax_refs', {}).get(field.name):
return AjaxSelectField(loader, **kwargs)
kwargs['widget'] = form.Select2Widget()
@@ -237,7 +232,7 @@ def find(name):
if p is not None:
return p
- raise ValueError('Invalid model property name %s.%s' % (model, name))
+ raise ValueError(f'Invalid model property name {model}.{name}')
properties = ((p, find(p)) for p in only)
elif exclude:
diff --git a/flask_admin/contrib/mongoengine/helpers.py b/flask_admin/contrib/mongoengine/helpers.py
index 48ee9f77c..a496d51a1 100644
--- a/flask_admin/contrib/mongoengine/helpers.py
+++ b/flask_admin/contrib/mongoengine/helpers.py
@@ -16,18 +16,17 @@ def make_gridfs_args(value):
def make_thumb_args(value):
- if getattr(value, 'thumbnail', None):
- args = {
- 'id': value.thumbnail._id,
- 'coll': value.collection_name
- }
+ if not getattr(value, 'thumbnail', None):
+ return make_gridfs_args(value)
+ args = {
+ 'id': value.thumbnail._id,
+ 'coll': value.collection_name
+ }
- if value.db_alias != 'default':
- args['db'] = value.db_alias
+ if value.db_alias != 'default':
+ args['db'] = value.db_alias
- return args
- else:
- return make_gridfs_args(value)
+ return args
def format_error(error):
diff --git a/flask_admin/contrib/mongoengine/tools.py b/flask_admin/contrib/mongoengine/tools.py
index 4d52671ce..ddec105c7 100644
--- a/flask_admin/contrib/mongoengine/tools.py
+++ b/flask_admin/contrib/mongoengine/tools.py
@@ -24,5 +24,5 @@ def parse_like_term(term):
oper = 'contains'
# add case insensitive flag
if not case_sensitive:
- oper = 'i' + oper
+ oper = f'i{oper}'
return oper, term
diff --git a/flask_admin/contrib/mongoengine/typefmt.py b/flask_admin/contrib/mongoengine/typefmt.py
index 840526de3..6e8d9393e 100644
--- a/flask_admin/contrib/mongoengine/typefmt.py
+++ b/flask_admin/contrib/mongoengine/typefmt.py
@@ -27,17 +27,25 @@ def grid_formatter(view, value):
def grid_image_formatter(view, value):
- if not value.grid_id:
- return ''
-
- return Markup(
- ('' +
- '
s)
' +
- '
'
+ + '
'
+ + '