You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/02/12 21:02:25 UTC
[allura] branch master updated: some pep8/pylint cleanup
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new 6e2908e some pep8/pylint cleanup
6e2908e is described below
commit 6e2908e5ca2dfbbbcbd54dc8bfc83f2b5dff5e2f
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Wed Feb 12 16:02:12 2020 -0500
some pep8/pylint cleanup
---
Allura/allura/config/middleware.py | 6 +--
Allura/allura/controllers/auth.py | 12 +++---
Allura/allura/lib/markdown_extensions.py | 16 +++++---
Allura/allura/lib/utils.py | 11 +++--
Allura/allura/tests/functional/test_auth.py | 37 ++++++++---------
ForgeBlog/forgeblog/main.py | 15 +++----
.../forgegit/tests/functional/test_controllers.py | 48 ++++++++++++----------
7 files changed, 77 insertions(+), 68 deletions(-)
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 83690bc..af52386 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -175,9 +175,9 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
# (the Allura [easy_widgets.engines] entry point is named "jinja" (not jinja2) but it doesn't need
# any settings since it is a class that uses the same jinja env as the rest of allura)
**{
- 'jinja2.auto_reload': config['auto_reload_templates'],
- 'jinja2.bytecode_cache': AlluraJinjaRenderer._setup_bytecode_cache(),
- 'jinja2.cache_size': config.get('jinja_cache_size', -1),
+ 'jinja2.auto_reload': config['auto_reload_templates'],
+ 'jinja2.bytecode_cache': AlluraJinjaRenderer._setup_bytecode_cache(),
+ 'jinja2.cache_size': config.get('jinja_cache_size', -1),
}
)
# Handle static files (by tool)
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 132fdd3..f8dff10 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -19,7 +19,7 @@ from __future__ import unicode_literals
from __future__ import absolute_import
import logging
import os
-from datetime import datetime, timedelta
+from datetime import datetime
import re
from six.moves.urllib.parse import urlparse, urljoin
@@ -36,7 +36,6 @@ from beaker.session import _session_id
import allura.tasks.repo_tasks
from allura import model as M
-from allura.lib import validators as V
from allura.lib.security import require_authenticated, has_access, is_site_admin
from allura.lib import helpers as h
from allura.lib import plugin
@@ -300,7 +299,7 @@ class AuthController(BaseController):
addr.confirmed = True
flash('Email address confirmed')
h.auditlog_user('Email address verified: %s', addr.email, user=user)
- if(user.get_pref('email_address') == None):
+ if user.get_pref('email_address') is None:
user.set_pref('email_address', addr.email)
if user.pending:
plugin.AuthenticationProvider.get(request).activate_user(user)
@@ -539,7 +538,6 @@ class PreferencesController(BaseController):
def _check_security(self):
require_authenticated()
-
@with_trailing_slash
@expose('jinja:allura:templates/user_prefs.html')
def index(self, **kw):
@@ -725,7 +723,7 @@ class PreferencesController(BaseController):
provider = plugin.AuthenticationProvider.get(request)
return dict(
- menu = provider.account_navigation(),
+ menu=provider.account_navigation(),
qr=qr,
setup=True,
)
@@ -746,7 +744,7 @@ class PreferencesController(BaseController):
return dict(
qr=qr,
setup=False,
- menu = provider.account_navigation(),
+ menu=provider.account_navigation(),
)
@expose('jinja:allura:templates/user_totp.html')
@@ -836,7 +834,7 @@ class PreferencesController(BaseController):
return dict(
codes=codes,
- menu = provider.account_navigation(),
+ menu=provider.account_navigation(),
windows_line_endings=windows_line_endings
)
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index 0e12187..7575d1e 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -251,7 +251,9 @@ class ForgeExtension(markdown.Extension):
# this has to be before the 'escape' processor, otherwise weird
# placeholders are inserted for escaped chars within urls, and then the
# autolink can't match the whole url
- md.inlinePatterns.add('autolink_without_brackets', AutolinkPattern(r'(http(?:s?)://[a-zA-Z0-9./\-\\_%?&=+#;~:!]+)', md), '<escape')
+ md.inlinePatterns.add('autolink_without_brackets',
+ AutolinkPattern(r'(http(?:s?)://[a-zA-Z0-9./\-\\_%?&=+#;~:!]+)', md),
+ '<escape')
# replace the link pattern with our extended version
md.inlinePatterns['link'] = ForgeLinkPattern(markdown.inlinepatterns.LINK_RE, md, ext=self)
md.inlinePatterns['short_reference'] = ForgeLinkPattern(markdown.inlinepatterns.SHORT_REF_RE, md, ext=self)
@@ -277,11 +279,11 @@ class EmojiExtension(markdown.Extension):
def __init__(self, **kwargs):
markdown.Extension.__init__(self)
-
+
def extendMarkdown(self, md, md_globals):
md.inlinePatterns["emoji"] = EmojiInlinePattern(self.EMOJI_RE)
-
+
class EmojiInlinePattern(markdown.inlinepatterns.Pattern):
def __init__(self, pattern):
@@ -291,6 +293,7 @@ class EmojiInlinePattern(markdown.inlinepatterns.Pattern):
emoji_code = m.group(2)
return emoji.emojize(emoji_code, use_aliases=True)
+
class UserMentionExtension(markdown.Extension):
UM_RE = r'\B(@(?![0-9]+$)(?!-)[a-z0-9-]{2,14}[a-z0-9])'
@@ -301,6 +304,7 @@ class UserMentionExtension(markdown.Extension):
def extendMarkdown(self, md, md_globals):
md.inlinePatterns["user_mentions"] = UserMentionInlinePattern(self.UM_RE)
+
class UserMentionInlinePattern(markdown.inlinepatterns.Pattern):
def __init__(self, pattern):
@@ -320,6 +324,7 @@ class UserMentionInlinePattern(markdown.inlinepatterns.Pattern):
result = "@%s" % user_name
return result
+
class ForgeLinkPattern(markdown.inlinepatterns.LinkPattern):
artifact_re = re.compile(r'((.*?):)?((.*?):)?(.+)')
@@ -337,7 +342,7 @@ class ForgeLinkPattern(markdown.inlinepatterns.LinkPattern):
except IndexError:
href = m.group(2)
is_link_with_brackets = True
- if el.text == 'x' or el.text == ' ': # skip [ ] and [x] for markdown checklist
+ if el.text == 'x' or el.text == ' ': # skip [ ] and [x] for markdown checklist
return '[' + el.text + ']'
try:
title = m.group(13)
@@ -441,7 +446,8 @@ class RelativeLinkRewriter(markdown.postprocessors.Postprocessor):
self._make_absolute = make_absolute
def run(self, text):
- soup = BeautifulSoup(text, 'html5lib') # 'html.parser' parser gives weird </li> behaviour with test_macro_members
+ soup = BeautifulSoup(text,
+ 'html5lib') # 'html.parser' parser gives weird </li> behaviour with test_macro_members
if self._make_absolute:
rewrite = self._rewrite_abs
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index ab7247a..14c6575 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -565,7 +565,8 @@ class ForgeHTMLSanitizerFilter(html5lib.filters.sanitizer.Filter):
}
self.allowed_elements = set(html5lib.filters.sanitizer.allowed_elements) - _form_elements
- # srcset is used in our own project_list/project_summary widgets which are used as macros so go through markdown
+ # srcset is used in our own project_list/project_summary widgets
+ # which are used as macros so go through markdown
self.allowed_attributes = html5lib.filters.sanitizer.allowed_attributes | {(None, 'srcset')}
self.valid_iframe_srcs = ('https://www.youtube.com/embed/',
@@ -742,7 +743,7 @@ def umask(new_mask):
def get_reaction_emoji_list():
- """ Get reactions emoji list from .ini file. If not defined there get fixed
+ """ Get reactions emoji list from .ini file. If not defined there get fixed
default emoji list """
emo_list = tg.config.get('reactions.emoji_list')
if emo_list is None:
@@ -756,9 +757,10 @@ def get_reactions_json():
""" Returns global reactions json """
j = OrderedDict()
for em in get_reaction_emoji_list():
- j[em] = emoji.emojize(em, use_aliases=True)
+ j[em] = emoji.emojize(em, use_aliases=True)
return json.dumps(j)
+
def get_usernames_from_md(text):
""" Returns a unique usernames set from a text """
usernames = set()
@@ -768,6 +770,7 @@ def get_usernames_from_md(text):
usernames.add(mention.get_text().replace('@', ''))
return usernames
+
def get_key_from_value(d, val):
""" Get key from given value. return empty str if not exists """
for k, v in d.items():
@@ -837,4 +840,4 @@ def socket_default_timeout(timeout):
try:
yield
finally:
- socket.setdefaulttimeout(orig_timeout)
\ No newline at end of file
+ socket.setdefaulttimeout(orig_timeout)
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 710c675..8acd7f1 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -40,10 +40,8 @@ from nose.tools import (
assert_not_in,
assert_true,
assert_false,
- assert_raises
)
from tg import tmpl_context as c, app_globals as g
-from webob import exc
import oauth2
from allura.tests import TestController
@@ -506,7 +504,8 @@ class TestAuth(TestController):
email1.confirmed = True
ThreadLocalORMSession.flush_all()
# Verify first email with the verification link
- r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce), extra_environ=dict(username=str('test-user')))
+ r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce),
+ extra_environ=dict(username=str('test-user')))
assert json.loads(self.webflash(r))['status'] == 'error'
email = M.EmailAddress.find(dict(email=email_address, claimed_by_user_id=user._id)).first()
@@ -529,17 +528,20 @@ class TestAuth(TestController):
extra_environ=dict(username=str('test-user')))
# logged out, gets redirected to login page
- r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce), extra_environ=dict(username=str('*anonymous')))
+ r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce),
+ extra_environ=dict(username=str('*anonymous')))
assert_in('/auth/?return_to=%2Fauth%2Fverify_addr', r.location)
# logged in as someone else
- r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce), extra_environ=dict(username=str('test-admin')))
+ r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce),
+ extra_environ=dict(username=str('test-admin')))
assert_in('/auth/?return_to=%2Fauth%2Fverify_addr', r.location)
assert_equal('You must be logged in to the correct account', json.loads(self.webflash(r))['message'])
assert_equal('warning', json.loads(self.webflash(r))['status'])
# logged in as correct user
- r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce), extra_environ=dict(username=str('test-user')))
+ r = self.app.get('/auth/verify_addr', params=dict(a=email.nonce),
+ extra_environ=dict(username=str('test-user')))
assert_in('confirmed', json.loads(self.webflash(r))['message'])
assert_equal('ok', json.loads(self.webflash(r))['status'])
@@ -648,13 +650,13 @@ class TestAuth(TestController):
# Attempt change password with weak pwd
r = self.app.post('/auth/preferences/change_password',
- extra_environ=dict(username=str('test-admin')),
- params={
- 'oldpw': 'foo',
- 'pw': 'password',
- 'pw2': 'password',
- '_session_id': self.app.cookies['_session_id'],
- })
+ extra_environ=dict(username=str('test-admin')),
+ params={
+ 'oldpw': 'foo',
+ 'pw': 'password',
+ 'pw2': 'password',
+ '_session_id': self.app.cookies['_session_id'],
+ })
assert 'Unsafe' in str(r.headers)
@@ -832,7 +834,6 @@ class TestAuth(TestController):
else:
assert str(ac._id) in r, "Page doesn't list tool %s" % ac.tool_name
-
@td.with_user_project('test-admin')
def test_update_user_notifications(self):
self.app.get('/').follow() # establish session
@@ -847,7 +848,6 @@ class TestAuth(TestController):
})
assert M.User.query.get(username='test-admin').get_pref('mention_notifications')
-
def _find_subscriptions_form(self, r):
form = None
for f in six.itervalues(r.forms):
@@ -1793,7 +1793,6 @@ class TestOAuth(TestController):
def test_interactive(self):
with mock.patch('allura.controllers.rest.oauth.Server') as Server, \
mock.patch('allura.controllers.rest.oauth.Request') as Request: # these are the oauth2 libs
- #M.OAuthConsumerToken.consumer = mock.Mock()
user = M.User.by_username('test-admin')
M.OAuthConsumerToken(
api_key='api_key',
@@ -1839,7 +1838,6 @@ class TestOAuth(TestController):
self.app.get(oa2url, headers=oa2kwargs['headers'], status=200)
self.app.get(oa2url.replace('oauth_signature=', 'removed='), headers=oa2kwargs['headers'], status=401)
-
@mock.patch('allura.controllers.rest.oauth.Server')
@mock.patch('allura.controllers.rest.oauth.Request')
def test_request_token_valid(self, Request, Server):
@@ -2129,7 +2127,7 @@ class TestDisableAccount(TestController):
class TestPasswordExpire(TestController):
def login(self, username='test-user', pwd='foo', query_string=''):
- extra = extra_environ={'username': str('*anonymous'), 'REMOTE_ADDR': str('127.0.0.1')}
+ extra = {'username': str('*anonymous'), 'REMOTE_ADDR': str('127.0.0.1')}
r = self.app.get('/auth/' + query_string, extra_environ=extra)
f = r.forms[0]
@@ -2637,7 +2635,8 @@ class TestTwoFactor(TestController):
r = r.form.submit()
# sent back to regular login
- assert_equal('Your multifactor login was disrupted, please start over.', json.loads(self.webflash(r))['message'],
+ assert_equal('Your multifactor login was disrupted, please start over.',
+ json.loads(self.webflash(r))['message'],
self.webflash(r))
r = r.follow()
assert_in('Password Login', r)
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 98544b3..04963f5 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-#-*- python -*-
from __future__ import unicode_literals
from __future__ import absolute_import
import logging
@@ -75,8 +74,8 @@ class W:
view_post_form = widgets.ViewPostForm()
attachment_list = ffw.AttachmentList()
confirmation = ffw.Lightbox(name='confirm',
- trigger='a.post-link',
- options="{ modalCSS: { minHeight: 0, width: 'inherit', top: '150px'}}")
+ trigger='a.post-link',
+ options="{ modalCSS: { minHeight: 0, width: 'inherit', top: '150px'}}")
preview_post_form = widgets.PreviewPostForm()
subscribe_form = SubscribeForm(thing='post')
search_results = SearchResults()
@@ -444,18 +443,18 @@ class PostController(BaseController, FeedController):
@without_trailing_slash
@expose('json:')
@require_post()
- def update_markdown(self, text=None, **kw):
+ def update_markdown(self, text=None, **kw):
if has_access(self.post, 'edit'):
self.post.text = text
self.post.commit()
g.spam_checker.check(text, artifact=self.post,
- user=c.user, content_type='blog-post')
+ user=c.user, content_type='blog-post')
return {
- 'status' : 'success'
+ 'status': 'success'
}
else:
return {
- 'status' : 'no_permission'
+ 'status': 'no_permission'
}
@expose()
@@ -531,8 +530,6 @@ class BlogAdminController(DefaultAdminController):
@without_trailing_slash
@expose('jinja:forgeblog:templates/blog/admin_exfeed.html')
def exfeed(self):
- #self.app.external_feeds_list = ['feed1', 'feed2']
- #log.info("EXFEED: %s" % self.app.external_feeds_list)
feeds_list = []
for feed in self.app.external_feeds_list:
feeds_list.append(feed)
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index e25a961..3063376 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -27,8 +27,7 @@ import shutil
import tempfile
from datadiff.tools import assert_equal as dd_assert_equal
-from nose.tools import assert_equal, assert_in, assert_not_in, assert_not_equal, assert_less
-import tg
+from nose.tools import assert_equal, assert_in, assert_not_in, assert_not_equal
import pkg_resources
from nose.tools import assert_regexp_matches
from tg import tmpl_context as c
@@ -107,10 +106,16 @@ class TestUIController(TestController):
def test_status_html(self):
resp = self.app.get('/src-git/ci/e0d7765883017040d53f9ca9c528940a4dd311c6/')
sortedCommits = resp.html.findAll('td')
- actualCommit = ['added', 'aaa.txt', 'removed', 'bbb.txt', 'changed', 'ccc.txt', 'removed', 'ddd.txt', 'added', 'eee.txt', 'added', 'ggg.txt']
+ actualCommit = ['added', 'aaa.txt',
+ 'removed', 'bbb.txt',
+ 'changed', 'ccc.txt',
+ 'removed', 'ddd.txt',
+ 'added', 'eee.txt',
+ 'added', 'ggg.txt']
for i, item in enumerate(sortedCommits):
assert_equal(actualCommit[i], ''.join(item.findAll(text=True)).strip())
+
class TestRootController(_TestCase):
@with_tool('test', 'Git', 'weird-chars', 'WeirdChars', type='git')
def _setup_weird_chars_repo(self):
@@ -130,7 +135,7 @@ class TestRootController(_TestCase):
def test_status_html(self):
resp = self.app.get('/src-git/').follow().follow()
# repo status not displayed if 'ready'
- assert None == resp.html.find('div', dict(id='repo_status'))
+ assert resp.html.find('div', dict(id='repo_status')) is None
h.set_context('test', 'src-git', neighborhood='Projects')
c.app.repo.status = 'analyzing'
ThreadLocalORMSession.flush_all()
@@ -402,13 +407,13 @@ class TestRootController(_TestCase):
def test_checkout_input(self):
ci = self._get_ci()
r = self.app.get('/src-git/commit_browser')
- assert not '<div id="access_urls"' in r
+ assert '<div id="access_urls"' not in r
r = self.app.get('/src-git/fork')
- assert not '<div id="access_urls"' in r
+ assert '<div id="access_urls"' not in r
r = self.app.get(ci + 'tree/README?diff=df30427c488aeab84b2352bdf88a3b19223f9d7a')
- assert not '<div id="access_urls"' in r
+ assert '<div id="access_urls"' not in r
r = self.app.get(ci + 'tree/README')
- assert not '<div id="access_urls"' in r
+ assert '<div id="access_urls"' not in r
r = self.app.get(ci + 'tree/')
assert '<div id="access_urls"' in r
@@ -484,7 +489,8 @@ class TestRootController(_TestCase):
assert_in('refresh queued', r)
assert_equal(1, M.MonQTask.query.find(dict(task_name='allura.tasks.repo_tasks.refresh')).count())
- r = self.app.get('/p/test/src-git/refresh', extra_environ={'HTTP_REFERER': str('/p/test/src-git/')}, status=302)
+ r = self.app.get('/p/test/src-git/refresh', extra_environ={'HTTP_REFERER': str('/p/test/src-git/')},
+ status=302)
assert_in('is being refreshed', self.webflash(r))
assert_equal(2, M.MonQTask.query.find(dict(task_name='allura.tasks.repo_tasks.refresh')).count())
@@ -847,23 +853,23 @@ class TestFork(_TestCase):
def test_merge_request_get_markdown(self):
self.app.post('/p/test2/code/do_request_merge',
- params={
- 'source_branch': 'zz',
- 'target_branch': 'master',
- 'summary': 'summary',
- 'description': 'description',
- })
+ params={
+ 'source_branch': 'zz',
+ 'target_branch': 'master',
+ 'summary': 'summary',
+ 'description': 'description',
+ })
response = self.app.get('/p/test/src-git/merge-requests/1/get_markdown')
assert 'description' in response
def test_merge_request_update_markdown(self):
self.app.post('/p/test2/code/do_request_merge',
- params={
- 'source_branch': 'zz',
- 'target_branch': 'master',
- 'summary': 'summary',
- 'description': 'description',
- })
+ params={
+ 'source_branch': 'zz',
+ 'target_branch': 'master',
+ 'summary': 'summary',
+ 'description': 'description',
+ })
response = self.app.post(
'/p/test/src-git/merge-requests/1/update_markdown',
params={