ruff pyupgrade

askbot/admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 :synopsis: connector to standard Django admin interface
 

askbot/bin/generate_modules.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Miville
 # Copyright (C) 2008 Société des arts technologiques (SAT)
 # http://www.sat.qc.ca
@@ -39,7 +38,7 @@
 
 def create_file_name(base, opts):
     """Create file name from base name, path and suffix"""
-    return os.path.join(opts.destdir, "%s.%s" % (base, opts.suffix))
+    return os.path.join(opts.destdir, f"{base}.{opts.suffix}")
 
 
 def write_automodule_directive(module):
@@ -61,13 +60,13 @@ def write_heading(module, kind='Module'):
 
 def write_sub(module, kind='Module'):
     """Create the module subtitle"""
-    sub = title_line('The :mod:`%s` %s' % (module, kind), '-')
+    sub = title_line(f'The :mod:`{module}` {kind}', '-')
     return sub
 
 
 def title_line(title, char):
     """ Underline the title with the character pass, with the right length."""
-    return ':mod:`%s`\n%s\n\n' % (title, len(title) * char)
+    return f':mod:`{title}`\n{len(title) * char}\n\n'
 
 
 def create_module_content(module):
@@ -108,7 +107,7 @@ def create_package_content(package, py_files, sub_packages):
                 # __init__.py of the current module
                 continue
             py_file = os.path.splitext(py_file)[0]
-            text += '* :ref:`%s.%s`\n' % (package, py_file)
+            text += f'* :ref:`{package}.{py_file}`\n'
         text += '\n'
 
     # create links to sub-packages
@@ -119,7 +118,7 @@ def create_package_content(package, py_files, sub_packages):
         text += '\n'
         for sub in sub_packages:
             # TODO - add description here
-            text += '* :ref:`%s.%s`\n' % (package, sub)
+            text += f'* :ref:`{package}.{sub}`\n'
     return text
     # build toctree for the package page
     # text += '.. toctree::\n\n'
@@ -149,7 +148,7 @@ def check_for_code(module):
     """
     Check if there's at least one class or one function in the module.
     """
-    fd = open(module, 'r')
+    fd = open(module)
     for line in fd:
         if line.startswith('def ') or line.startswith('class '):
             fd.close()

askbot/conf/settings_wrapper.py

@@ -45,7 +45,7 @@ def assert_setting_info_correct(info):
     assert isinstance(info[2], bool)
 
 
-class ConfigSettings(object):
+class ConfigSettings:
     """A very simple Singleton wrapper for settings
     a limitation is that all settings names using this class
     must be distinct, even though they might belong
@@ -139,7 +139,7 @@ def get_setting_url(self, data):
             'livesettings_group',
             setting_name,  # TODO: better use description
             kwargs={'group': group_name},
-            anchor='id_%s__%s__%s' % (group_name, setting_name, get_language())
+            anchor=f'id_{group_name}__{setting_name}__{get_language()}'
         )
         if len(data) == 4:
             return force_str(format_lazy('{} ({})',link, data[3]))
@@ -227,7 +227,7 @@ def prime_cache(cls, cache_key, **kwargs):
             else:
                 setting_value = cls.__instance[key]
                 if setting_value.localized:
-                    db_key = '{}_{}'.format(key, format_setting_name(get_language()))
+                    db_key = f'{key}_{format_setting_name(get_language())}'
                 else:
                     db_key = key
 

askbot/const/__init__.py

@@ -1,4 +1,3 @@
-# encoding:utf-8
 """
 All constants could be used in other modules
 For reasons that models, views can't have unicode
@@ -179,7 +178,7 @@
 TAG_CHARS = r'\wp{M}+.#-'
 TAG_FIRST_CHARS = r'[\wp{M}]'
 TAG_FORBIDDEN_FIRST_CHARS = r'#'
-TAG_REGEX_BARE = r'%s[%s]+' % (TAG_FIRST_CHARS, TAG_CHARS)
+TAG_REGEX_BARE = rf'{TAG_FIRST_CHARS}[{TAG_CHARS}]+'
 TAG_REGEX = r'^%s$' % TAG_REGEX_BARE
 
 TAG_STRIP_CHARS = ', '

askbot/deployment/deployers/file_deployer.py

@@ -27,7 +27,7 @@ def get_template_parameters(self): # pylint: disable=no-self-use
 
     def get_template(self):
         """Returns string representation of the template"""
-        return open(get_askbot_module_path(self.template_path), 'r').read()
+        return open(get_askbot_module_path(self.template_path)).read()
 
     def deploy_file(self, contents):
         """Writes contents into the target file"""

askbot/deployment/deployers/settings_py_admins_snippet.py

@@ -9,4 +9,4 @@ def render(self):
         """--admin-settings override the default"""
         if self.params['admin_settings']:
             return self.params['admin_settings']
-        return super(SettingsPyAdminsSnippet, self).render()
+        return super().render()

askbot/deployment/deployers/settings_py_caching_snippet.py

@@ -7,4 +7,4 @@ class SettingsPyCachingSnippet(FileDeployer): # pylint: disable=missing-class-do
     def render(self):
         if self.params['caching_settings']:
             return self.params['caching_settings']
-        return super(SettingsPyCachingSnippet, self).render()
+        return super().render()

askbot/deployment/deployers/settings_py_databases_snippet.py

@@ -10,4 +10,4 @@ def render(self):
         `database_settings` parameter"""
         if self.params['database_settings']:
             return self.params['database_settings']
-        return super(SettingsPyDatabasesSnippet, self).render()
+        return super().render()

askbot/deployment/deployers/settings_py_email_snippet.py

@@ -11,4 +11,4 @@ def render(self):
         parameter"""
         if self.params['email_settings']:
             return self.params['email_settings']
-        return super(SettingsPyEmailSnippet, self).render()
+        return super().render()

askbot/deployment/deployers/settings_py_languages_snippet.py

@@ -9,4 +9,4 @@ def render(self):
         the override with the `language_settings` parameter"""
         if self.params['language_settings']:
             return self.params['language_settings']
-        return super(SettingsPyLanguagesSnippet, self).render()
+        return super().render()

askbot/deployment/deployers/settings_py_logging_snippet.py

@@ -9,4 +9,4 @@ def render(self):
         allows override with the --logging-settings parameter"""
         if self.params['logging_settings']:
             return self.params['logging_settings']
-        return super(SettingsPyLoggingSnippet, self).render()
+        return super().render()

askbot/deployment/path_utils.py

@@ -17,7 +17,7 @@ def dir_has_django_project(directory):
         if file_name.endswith(os.path.sep + 'manage.py'):
             #a hack allowing to install into the project directory
             continue
-        with open(file_name, 'r') as py_file:
+        with open(file_name) as py_file:
             for line in py_file:
                 if IMPORT_RE1.match(line) or IMPORT_RE2.match(line):
                     return True

askbot/deployment/validators/proj_dir_validator.py

@@ -8,7 +8,7 @@ class ProjDirValidator(DirValidator):
     """Implements the .clean method for the proj_name parameter"""
 
     def __init__(self, console, parser, root_dir):
-        super(ProjDirValidator, self).__init__(console, parser)
+        super().__init__(console, parser)
         self.user_prompt = f'Enter {const.PROJ_NAME_HELP}.'
         self.option_name = 'proj_name'
         self.root_dir = root_dir

askbot/deployment/validators/root_dir_validator.py

@@ -10,7 +10,7 @@ class RootDirValidator(DirValidator):
     by providing the .clean method"""
 
     def __init__(self, console, parser):
-        super(RootDirValidator, self).__init__(console, parser)
+        super().__init__(console, parser)
         self.user_prompt = f'Enter {const.ROOT_DIR_HELP}.'
         self.option_name = 'root_dir'
         self.default = './' + const.DEFAULT_PROJECT_NAME

askbot/deps/django_authopenid/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2007, 2008, Benoît Chesneau
 #
 # All rights reserved.

askbot/deps/django_authopenid/admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.contrib import admin
 from askbot.deps.django_authopenid.models import UserAssociation

askbot/deps/django_authopenid/backends.py

@@ -18,7 +18,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class AuthBackend(object):
+class AuthBackend:
     """Authenticator's authentication backend class
     for more info, see django doc page:
     http://docs.djangoproject.com/en/dev/topics/auth/#writing-an-authentication-backend
@@ -31,7 +31,7 @@ class AuthBackend(object):
     """
     def __init__(self, *args, **kwargs):
         self.login_providers = util.get_enabled_login_providers()
-        super(AuthBackend, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def authenticate(self, request, method=None, provider_name=None, **kwargs):
         """this authentication function supports many login methods"""
@@ -143,7 +143,7 @@ def auth_by_external_password(self, provider_name, username, password, request):
             else:
                 #have username collision - so make up a more unique user name
                 #bug: - if user already exists with the new username - we are in trouble
-                new_username = '%s@%s' % (username, provider_name)
+                new_username = f'{username}@{provider_name}'
                 user = User.objects.create_user(new_username, '', password)
                 user_registered.send(None, user=user, request=request)
                 message = _(

askbot/deps/django_authopenid/forms.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2007, 2008, Benoît Chesneau
 #
 # All rights reserved.
@@ -53,7 +52,7 @@
 
 class ConsentField(forms.BooleanField):
     def __init__(self, *args, **kwargs):
-        super(ConsentField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.label = _('I have read and agree with the terms of service')
         self.required = True
         self.error_messages['required'] = _(
@@ -68,7 +67,7 @@ class LoginProviderField(forms.CharField):
 
     def __init__(self, *args, **kwargs):
         kwargs['max_length'] = 64
-        super(LoginProviderField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def clean(self, value):
         """makes sure that login provider name
@@ -301,7 +300,7 @@ class RegistrationForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs.pop('request', None)
-        super(RegistrationForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         email_required = not askbot_settings.BLANK_EMAIL_ALLOWED
         self.fields['email'] = UserEmailField(required=email_required)
         if askbot_settings.TERMS_CONSENT_REQUIRED:
@@ -313,7 +312,7 @@ def __init__(self, *args, **kwargs):
     def clean(self):
         if askbot_settings.NEW_REGISTRATIONS_DISABLED:
             raise forms.ValidationError(askbot_settings.NEW_REGISTRATIONS_DISABLED_MESSAGE)
-        return super(RegistrationForm, self).clean()
+        return super().clean()
 
 
 class PasswordRegistrationForm(RegistrationForm, SetPasswordForm):
@@ -361,7 +360,7 @@ class ChangeEmailForm(forms.Form):
     """ change email form """
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, \
             initial=None, user=None):
-        super(ChangeEmailForm, self).__init__(data, files, auto_id,
+        super().__init__(data, files, auto_id,
                 prefix, initial)
         email_required = not askbot_settings.BLANK_EMAIL_ALLOWED
         self.fields['email'] = UserEmailField(skip_clean=True, required=email_required)
@@ -416,7 +415,7 @@ class ChangeopenidForm(forms.Form):
     def __init__(self, data=None, user=None, *args, **kwargs):
         if user is None:
             raise TypeError("Keyword argument 'user' must be supplied")
-        super(ChangeopenidForm, self).__init__(data, *args, **kwargs)
+        super().__init__(data, *args, **kwargs)
         self.user = user
 
 
@@ -428,7 +427,7 @@ class DeleteForm(forms.Form):
 
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None, user=None):
-        super(DeleteForm, self).__init__(data, files, auto_id, prefix, initial)
+        super().__init__(data, files, auto_id, prefix, initial)
         self.test_openid = False
         self.user = user
 
@@ -449,7 +448,7 @@ class EmailPasswordForm(forms.Form):
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
             initial=None):
-        super(EmailPasswordForm, self).__init__(data, files, auto_id,
+        super().__init__(data, files, auto_id,
                 prefix, initial)
         self.user_cache = None
 

askbot/deps/django_authopenid/ldap_auth.py

@@ -187,7 +187,7 @@ def ldap_create_user_default(user_info, request):
     user.is_active = True
     user.save()
     user_registered.send(None, user=user, request=request)
-    LOG.info('Created New User : [{0}]'.format(user_info['ldap_username']))
+    LOG.info('Created New User : [{}]'.format(user_info['ldap_username']))
 
     assoc = UserAssociation()
     assoc.user = user

askbot/deps/django_authopenid/middleware.py

@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
 from askbot.deps.django_authopenid import mimeparse
 from django.http import HttpResponseRedirect
 from django.urls import reverse
 import logging
 
 __all__ = ["OpenIDMiddleware"]
 
-class OpenIDMiddleware(object):
+class OpenIDMiddleware:
     """
     Populate request.openid. This comes either from cookie or from
     session, depending on the presence of OPENID_USE_SESSIONS.

askbot/deps/django_authopenid/models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 
 from django.conf import settings
@@ -36,7 +35,7 @@ class Association(models.Model):
     assoc_type = models.TextField(max_length=64)
 
     def __str__(self):
-        return "Association: %s, %s" % (self.server_url, self.handle)
+        return f"Association: {self.server_url}, {self.handle}"
 
 class UserAssociation(models.Model):
     """
@@ -52,14 +51,14 @@ class UserAssociation(models.Model):
     provider_name = models.CharField(max_length=64, default='unknown')
     last_used_timestamp = models.DateTimeField(null=True)
 
-    class Meta(object):
+    class Meta:
         unique_together = (
                                 ('user','provider_name'),
                                 ('openid_url', 'provider_name')
                             )
 
     def __str__(self):
-        return "Openid %s with user %s" % (self.openid_url, self.user)
+        return f"Openid {self.openid_url} with user {self.user}"
 
     def update_timestamp(self):
         self.last_used_timestamp = datetime.datetime.now()
@@ -72,7 +71,7 @@ def get_new_confirm_key(self):
         # The random module is seeded when this Apache child is created.
         # Use SECRET_KEY as added salt.
         while 1:
-            confirm_key = hashlib.md5("%s%s%s%s" % (
+            confirm_key = hashlib.md5("{}{}{}{}".format(
                 random.randint(0, sys.maxsize - 1), os.getpid(),
                 time.time(), settings.SECRET_KEY)).hexdigest()
             try:
@@ -108,7 +107,7 @@ def save(self, *args, **kwargs):
             self.expires_on = timezone.now() + \
                     datetime.timedelta(VERIFIER_EXPIRE_DAYS)
 
-        super(UserEmailVerifier, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     def has_expired(self):
         now = timezone.now()

askbot/deps/django_authopenid/protocols/base.py

@@ -1,4 +1,4 @@
-class BaseProtocol(object):
+class BaseProtocol:
     """Base class for all authentication protocols"""
 
     def __iter__(self):

askbot/deps/django_authopenid/protocols/oauth1.py

@@ -123,9 +123,9 @@ def send_request(self, client=None, url=None, method='GET', params=None, **kwarg
             if parsed_response:
                 return parsed_response
             else:
-                raise OAuthError('error obtaining request token {0}'.format(content))
+                raise OAuthError(f'error obtaining request token {content}')
         else:
-            raise OAuthError('response is {0}'.format(response))
+            raise OAuthError(f'response is {response}')
 
     def get_token(self):
         return self.request_token

askbot/deps/django_authopenid/providers/discourse.py

@@ -32,7 +32,7 @@ def get_sso_login_url(request, success_url):
     # (where the Discourse will redirect user after verification).
     # Payload should look like: nonce=NONCE&return_sso_url=RETURN_URL
     return_url = site_url(reverse('user_complete_discourse_signin'))
-    payload = 'nonce={}&return_sso_url={}'.format(nonce, return_url)
+    payload = f'nonce={nonce}&return_sso_url={return_url}'
     # Base64 encode the above raw payload. -> BASE64_PAYLOAD
     base64_payload = base64.b64encode(payload)
     # URL encode the above BASE64_PAYLOAD.
@@ -52,7 +52,7 @@ class DiscourseSsoForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.expected_nonce = kwargs.pop('nonce', None)
-        super(DiscourseSsoForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def clean(self):
         sso = self.cleaned_data['sso']