code cleanup using autopep8

Author: webjunkie01

Allura/allura/app.py

@@ -801,7 +801,7 @@ def get_attachment_export_path(self, path='', *args):
 
     def make_dir_for_attachments(self, path):
         if not os.path.exists(path):
-                os.makedirs(path)
+            os.makedirs(path)
 
     def save_attachments(self, path, attachments):
         self.make_dir_for_attachments(path)
@@ -835,6 +835,7 @@ def activity_extras(self):
 
 class AdminControllerMixin:
     """Provides common functionality admin controllers need"""
+
     def _before(self, *remainder, **params):
         # Display app's sidebar on admin page, instead of :class:`AdminApp`'s
         c.app = self.app

Allura/allura/command/script.py

@@ -95,8 +95,8 @@ def command(self):
         for s in self.args[3:]:
             s = s.lower()
             if s == 'production':
-                print ('All projects always have access to prodcution tools,'
-                       ' so removing from list.')
+                print('All projects always have access to prodcution tools,'
+                      ' so removing from list.')
                 continue
             if s not in ('alpha', 'beta'):
                 print('Unknown tool status %s' % s)

Allura/allura/command/taskd.py

@@ -136,11 +136,11 @@ def waitfunc_checks_running():
                         waitfunc=waitfunc,
                         only=only)
                     if self.task:
-                        with(proctitle("taskd:{}:{}".format(
+                        with (proctitle("taskd:{}:{}".format(
                                 self.task.task_name, self.task._id))):
                             # Build the (fake) request
                             request_path = '/--{}--/{}/'.format(self.task.task_name,
-                                                            self.task._id)
+                                                                self.task._id)
                             r = Request.blank(request_path,
                                               base_url=tg.config['base_url'].rstrip(
                                                   '/') + request_path,

Allura/allura/config/app_cfg.py

@@ -61,6 +61,7 @@ class MinimalApplicationConfiguratorNoRegistry(ApplicationConfigurator):
     Copied from tg.MinimalApplicationConfigurator but without the registry
     since we use RegistryManager in a specific part of our middleware already
     """
+
     def __init__(self):
         super().__init__()
         self.register(MimeTypesConfigurationComponent, after=False)

Allura/allura/controllers/auth.py

@@ -1447,9 +1447,9 @@ def index(self, **kw):
     @validate(F.oauth2_application_form, error_handler=index)
     def register(self, application_name=None, application_description=None, redirect_url=None, **kw):
         M.OAuth2ClientApp(name=application_name,
-                       description=application_description,
-                       redirect_uris=[redirect_url],
-                       user_id=c.user._id)
+                          description=application_description,
+                          redirect_uris=[redirect_url],
+                          user_id=c.user._id)
         flash('Oauth2 Client registered')
         redirect('.')
 

Allura/allura/controllers/repository.py

@@ -737,7 +737,7 @@ def index(self, page=0, limit=DEFAULT_PAGE_LIMIT, **kw):
         # ('removed', u'bbb.txt', 'tree', None),
         # ('removed', u'ddd.txt', 'tree', None),
         # ('changed', u'ccc.txt', 'blob', True)]
-        result['artifacts'].sort(key=lambda x: x[1]['old'] if(isinstance(x[1], dict)) else x[1])
+        result['artifacts'].sort(key=lambda x: x[1]['old'] if (isinstance(x[1], dict)) else x[1])
         return result
 
     @expose('jinja:allura:templates/repo/commit_basic.html')

Allura/allura/controllers/rest.py

@@ -338,12 +338,12 @@ def save_bearer_token(self, token, request: oauthlib.common.Request, *args, **kw
             M.OAuth2AccessToken.query.remove({'client_id': request.client_id, 'user_id': c.user._id})
 
         bearer_token = M.OAuth2AccessToken(
-            client_id = request.client_id,
-            scopes = token.get('scope', []),
-            access_token = token.get('access_token'),
-            refresh_token = token.get('refresh_token'),
-            expires_at = datetime.utcnow() + timedelta(seconds=token.get('expires_in')),
-            user_id = authorization_code.user_id
+            client_id=request.client_id,
+            scopes=token.get('scope', []),
+            access_token=token.get('access_token'),
+            refresh_token=token.get('refresh_token'),
+            expires_at=datetime.utcnow() + timedelta(seconds=token.get('expires_in')),
+            user_id=authorization_code.user_id
         )
 
         session(bearer_token).flush()
@@ -501,7 +501,7 @@ def _authenticate(self):
         if not valid:
             raise exc.HTTPUnauthorized
 
-        bearer_token_prefix = 'Bearer ' # noqa: S105
+        bearer_token_prefix = 'Bearer '  # noqa: S105
         auth_header = req.headers.get('Authorization')
         if auth_header and auth_header.startswith(bearer_token_prefix):
             access_token = auth_header[len(bearer_token_prefix):]
@@ -512,7 +512,6 @@ def _authenticate(self):
         token.last_access = datetime.utcnow()
         return token
 
-
     @expose('jinja:allura:templates/oauth2_authorize.html')
     @without_trailing_slash
     def authorize(self, **kwargs):
@@ -524,7 +523,6 @@ def authorize(self, **kwargs):
             decoded_body = str(request.body, 'utf-8')
             json_body = json.loads(decoded_body)
 
-
         scopes, credentials = self.server.validate_authorization_request(uri=request.url, http_method=request.method, headers=request.headers, body=json_body)
 
         client_id = request.params.get('client_id')

Allura/allura/controllers/site_admin.py

@@ -288,7 +288,7 @@ def _search(self, model, fields, add_fields, q=None, f=None, page=0, limit=None,
         def convert_fields(obj):
             # throw the type away (e.g. '_s' from 'url_s')
             result = {}
-            for k,val in obj.items():
+            for k, val in obj.items():
                 name = k.rsplit('_', 1)
                 if len(name) == 2:
                     name = name[0]
@@ -776,4 +776,4 @@ class StatsSiteAdminExtension(SiteAdminExtension):
 
     def update_sidebar_menu(self, links):
         links.append(SitemapEntry('Stats', '/nf/admin/stats',
-            ui_icon=g.icons['stats']))
+                                  ui_icon=g.icons['stats']))

Allura/allura/controllers/task.py

@@ -16,7 +16,6 @@
 #       under the License.
 
 
-
 import six
 
 

Allura/allura/eventslistener.py

@@ -47,6 +47,7 @@ def ticketEvent(self, event_type, ticket, project, user):
     def addUserToOrganization(self, newMembership):
         pass
 
+
 '''This class simply allows to iterate through all the registered listeners,
 so that all of them are called to update statistics.'''
 

Allura/allura/ext/admin/widgets.py

@@ -127,7 +127,7 @@ class ScreenshotAdmin(ff.ForgeFormResponsive):
         ff.ForgeForm.defaults,
         enctype='multipart/form-data',
         submit_text='Upload',
-        )
+    )
 
     @property
     def fields(self):
@@ -137,7 +137,7 @@ def fields(self):
                           attrs={
                               'accept': 'image/*',
                               'required': 'true',
-                              }),
+                          }),
             ew.InputField(name='caption',
                           field_type="text",
                           label='Caption',

Allura/allura/lib/app_globals.py

@@ -148,7 +148,7 @@ def cached_convert(self, artifact: MappedClass, field_name: str) -> Markup:
         except ValueError:
             threshold = None
             log.warning('Skipping Markdown caching - The value for config param '
-                     '"markdown_cache_threshold" must be a float.')
+                        '"markdown_cache_threshold" must be a float.')
 
         # Check if contains macro and never cache
         if self.uncacheable_macro_regex.search(source_text):
@@ -178,7 +178,7 @@ def cached_convert(self, artifact: MappedClass, field_name: str) -> Markup:
                 log.exception('Could not get session for %s', artifact)
             else:
                 with utils.skip_mod_date(artifact.__class__), \
-                     utils.skip_last_updated(artifact.__class__):
+                        utils.skip_last_updated(artifact.__class__):
                     sess.flush(artifact)
         return html
 
@@ -588,7 +588,7 @@ def user_profile_urls_with_profile_path(self):
         return asbool(config['user_profile_url_with_profile_path'])
 
     def user_profile_disabled_tools(self):
-        return aslist(config.get('user_prefs.disabled_tools',''), sep=',')
+        return aslist(config.get('user_prefs.disabled_tools', ''), sep=',')
 
     def app_static(self, resource, app=None):
         base = config['static.url_base']
@@ -666,6 +666,7 @@ def nav_logo(self):
     def commit_statuses_enabled(self):
         return asbool(config['scm.commit_statuses'])
 
+
 class Icon:
 
     def __init__(self, css, title=None):

Allura/allura/lib/custom_middleware.py

@@ -496,8 +496,9 @@ def __call__(self, environ, start_response):
             if environ.get('csp_form_actions'):
                 srcs += ' ' + ' '.join(environ['csp_form_actions'])
 
-            oauth_endpoints = ('/rest/oauth2/authorize', '/rest/oauth2/do_authorize', '/rest/oauth/authorize', '/rest/oauth/do_authorize')
-            if not req.path.startswith(oauth_endpoints): # Do not enforce CSP for OAuth1 and OAuth2 authorization
+            oauth_endpoints = (
+            '/rest/oauth2/authorize', '/rest/oauth2/do_authorize', '/rest/oauth/authorize', '/rest/oauth/do_authorize')
+            if not req.path.startswith(oauth_endpoints):  # Do not enforce CSP for OAuth1 and OAuth2 authorization
                 if asbool(self.config.get('csp.form_actions_enforce', False)):
                     rules.add(f"form-action {srcs}")
                 else:
@@ -516,7 +517,8 @@ def __call__(self, environ, start_response):
             if asbool(self.config.get('csp.script_src_enforce', False)):
                 rules.add(f"script-src {script_srcs} {self.config.get('csp.script_src.extras','')} 'report-sample'")
             else:
-                report_rules.add(f"script-src {script_srcs} {self.config.get('csp.script_src.extras','')} 'report-sample'")
+                report_rules.add(
+                    f"script-src {script_srcs} {self.config.get('csp.script_src.extras', '')} 'report-sample'")
 
         if self.config.get('csp.script_src_attr'):
             if asbool(self.config.get('csp.script_src_attr_enforce', False)):
@@ -581,6 +583,7 @@ def _call_wsgi_application(application, environ):
     """
     captured = []
     output = []
+
     def _start_response(status, headers, exc_info=None):
         captured[:] = [status, headers, exc_info]
         return output.append
@@ -607,6 +610,7 @@ class StatusCodeRedirect:
     purposely return a 401), set
     ``environ['tg.status_code_redirect'] = False`` in the application.
     """
+
     def __init__(self, app, errors=(400, 401, 403, 404),
                  path='/error/document'):
         """Initialize the ErrorRedirect
@@ -626,7 +630,7 @@ def __init__(self, app, errors=(400, 401, 403, 404),
     def __call__(self, environ, start_response):
         status, headers, app_iter, exc_info = _call_wsgi_application(self.app, environ)
         if status[:3] in self.errors and \
-            'tg.status_code_redirect' not in environ and self.error_path:
+                'tg.status_code_redirect' not in environ and self.error_path:
             # Create a response object
             environ['tg.original_response'] = Response(status=status, headerlist=headers, app_iter=app_iter)
             environ['tg.original_request'] = Request(environ)

Allura/allura/lib/helpers.py

@@ -1068,7 +1068,7 @@ def urlopen(url: str | urllib.request.Request, retries=3, codes=(408, 500, 502,
 
     """
     if isinstance(url, urllib.request.Request):
-        url_str =  url.full_url
+        url_str = url.full_url
     else:
         url_str = url
     if not url_str.startswith(('http://', 'https://')):
@@ -1375,6 +1375,7 @@ def pluralize_tool_name(tool_name: string, count: int):
         return f"{tool_name}{'s'[:count^1]}"
     return tool_name
 
+
 def parse_fediverse_address(username: str):
     pieces = username.split('@')
     return f'https://{pieces[-1]}/@{pieces[1]}'

Allura/allura/lib/macro.py

@@ -103,8 +103,8 @@ def __call__(self, s):
             return response
         except (ValueError, TypeError) as ex:
             log.warning('macro error.  Upwards stack is %s',
-                     ''.join(traceback.format_stack()),
-                     exc_info=True)
+                        ''.join(traceback.format_stack()),
+                        exc_info=True)
             msg = html.escape(f'[[{s}]] ({repr(ex)})')
             return '\n<div class="error"><pre><code>%s</code></pre></div>' % msg
 
@@ -184,7 +184,7 @@ def project_blog_posts(max_number=5, sort='timestamp', summary=False, mount_poin
              ago=h.ago(post.timestamp),
              description=summary and '&nbsp;' or g.markdown.cached_convert(post, 'text'))
         for post in posts if security.has_access(post, 'read', project=post.app.project) and
-            security.has_access(post.app.project, 'read', project=post.app.project)
+        security.has_access(post.app.project, 'read', project=post.app.project)
     ]
     posts = BlogPosts(posts=output)
     g.resource_manager.register(posts)

Allura/allura/lib/mail_util.py

@@ -50,6 +50,7 @@
 
 email_policy = email.policy.SMTP + email.policy.strict
 
+
 def Header(text, *more_text) -> str:
     '''
     Helper to make sure we encode headers properly
@@ -69,6 +70,7 @@ def Header(text, *more_text) -> str:
         hdr_text += ' ' + m
     return hdr_text
 
+
 def AddrHeader(fromaddr) -> str:
     '''Accepts any of:
         Header() instance

Allura/allura/lib/package_path_loader.py

@@ -145,7 +145,7 @@ def __init__(self, override_entrypoint='allura.theme.override',
         # TODO: How does one handle project-theme?
         if default_paths is None:
             default_paths = [
-                #['project-theme', None],
+                # ['project-theme', None],
                 ['site-theme', None],
                 ['allura', '/'],
             ]
@@ -237,7 +237,7 @@ def _replace_signposts(self, paths, rules):
 
         This mutates paths.
         """
-        p_idx = lambda n: [e[0] for e in paths].index(n)
+        def p_idx(n): return [e[0] for e in paths].index(n)
         for target, replacement in rules.items():
             try:
                 removed = paths.pop(p_idx(replacement))

Allura/allura/lib/phone/nexmo.py

@@ -89,7 +89,7 @@ def post(self, url, **params):
             return self.error()
         if resp.get('status') == '0':
             return self.ok(request_id=resp.get('request_id'))
-        return self.error(code=resp.get('status'), msg=resp.get('error_text'), number=params.get('number',''))
+        return self.error(code=resp.get('status'), msg=resp.get('error_text'), number=params.get('number', ''))
 
     def verify(self, number):
         url = urljoin(self.BASE_URL, 'verify')

Allura/allura/lib/plugin.py

@@ -635,6 +635,7 @@ def get_last_password_updated(self, user):
             d = self.user_registration_date(user)
         return d
 
+
 def ldap_conn_staysopen(who=None, cred=None):
     '''
     You must call .unbind_s() when done with this
@@ -644,6 +645,7 @@ def ldap_conn_staysopen(who=None, cred=None):
                       cred or config['auth.ldap.admin_password'])
     return con
 
+
 @contextmanager
 def ldap_conn(who=None, cred=None):
     '''

Allura/allura/lib/repository.py

@@ -156,7 +156,7 @@ def sidebar_menu(self):
                 self.repo.push_upstream_context()
             except Exception:
                 log.warning('Could not get upstream repo (perhaps it is gone) for: %s %s',
-                         self.repo, self.repo.upstream_repo.name, exc_info=True)
+                            self.repo, self.repo.upstream_repo.name, exc_info=True)
             else:
                 has_upstream_repo = True
 
@@ -218,7 +218,7 @@ def sidebar_menu(self):
             for b in tags[:max_tags]:
                 links.append(SitemapEntry(
                     b.name,
-                    h.urlquote(self.repo.url_for_commit(b.name) + 'tree/'), 
+                    h.urlquote(self.repo.url_for_commit(b.name) + 'tree/'),
                     extra_html_attrs=dict(rel='nofollow')))
             if len(tags) > max_tags:
                 links.append(

Allura/allura/lib/search.py

@@ -225,7 +225,7 @@ def site_admin_search(model, q, field, **kw):
         # escaping spaces with '\ ' isn't sufficient for display_name_t since its stored as text_general (why??)
         # and wouldn't handle foo@bar.com split on @ either
         # This should work, but doesn't for unknown reasons: q = u'{!term f=%s}%s' % (field, q)
-        q = q.replace(':', r'\:') # Must escape the colon for IPv6 addresses
+        q = q.replace(':', r'\:')  # Must escape the colon for IPv6 addresses
         q = obj.translate_query(f'{field}:({q})', fields)
         kw['q.op'] = 'AND'  # so that all terms within the () are required
     fq = ['type_s:%s' % model.type_s]
@@ -314,12 +314,12 @@ def add_matches(doc):
                 text = h.get_first(m, 'text')
                 if title:
                     title = (markupsafe.escape(title)
-                                   .replace('#ALLURA-HIGHLIGHT-START#', markupsafe.Markup('<strong>'))
-                                   .replace('#ALLURA-HIGHLIGHT-END#', markupsafe.Markup('</strong>')))
+                             .replace('#ALLURA-HIGHLIGHT-START#', markupsafe.Markup('<strong>'))
+                             .replace('#ALLURA-HIGHLIGHT-END#', markupsafe.Markup('</strong>')))
                 if text:
                     text = (markupsafe.escape(text)
-                                  .replace('#ALLURA-HIGHLIGHT-START#', markupsafe.Markup('<strong>'))
-                                  .replace('#ALLURA-HIGHLIGHT-END#', markupsafe.Markup('</strong>')))
+                            .replace('#ALLURA-HIGHLIGHT-START#', markupsafe.Markup('<strong>'))
+                            .replace('#ALLURA-HIGHLIGHT-END#', markupsafe.Markup('</strong>')))
                 doc['title_match'] = title
                 doc['text_match'] = text or h.get_first(doc, 'text')
                 return doc