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 2019/05/21 15:40:02 UTC
[allura] 05/09: [#8286] beautifulsoup has_key/has_attr updates
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8286
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 559d83deb5c5ca86f6e83051003103ed6d974a98
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri May 17 16:47:53 2019 -0400
[#8286] beautifulsoup has_key/has_attr updates
---
Allura/allura/tests/functional/test_admin.py | 14 +++----
Allura/allura/tests/functional/test_discuss.py | 12 +++---
.../forgediscussion/tests/functional/test_forum.py | 44 +++++++++++-----------
.../tests/functional/test_forum_admin.py | 8 ++--
.../forgediscussion/tests/functional/test_rest.py | 2 +-
.../forgetracker/tests/functional/test_root.py | 18 ++++-----
6 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 3eb88f9..f2a2a2c 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -472,8 +472,8 @@ class TestProjectAdmin(TestController):
'new.mount_label': 'sub-del-undel'})
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' not in r
- assert r.html.find('input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert not r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert r.html.find('input', {'name': 'removal', 'value': ''}).has_attr('checked')
+ assert not r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_attr('checked')
with audits('delete project'):
self.app.post('/admin/update', params=dict(
name='Test Project',
@@ -483,8 +483,8 @@ class TestProjectAdmin(TestController):
delete='on'))
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
- assert not r.html.find('input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert not r.html.find('input', {'name': 'removal', 'value': ''}).has_attr('checked')
+ assert r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_attr('checked')
# make sure subprojects get deleted too
r = self.app.get('/p/test/sub-del-undel/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
@@ -497,8 +497,8 @@ class TestProjectAdmin(TestController):
undelete='on'))
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' not in r
- assert r.html.find('input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert not r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert r.html.find('input', {'name': 'removal', 'value': ''}).has_attr('checked')
+ assert not r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_attr('checked')
def test_project_delete_not_allowed(self):
# turn off project delete option
@@ -541,7 +541,7 @@ class TestProjectAdmin(TestController):
delete='on'))
r = self.app.get('/p/test/sub-no-del/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
- assert r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert r.html.find('input', {'name': 'removal', 'value': 'deleted'}).has_attr('checked')
finally:
if old_allow_project_delete == ():
del config['allow_project_delete']
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 9910e5c..37b5865 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -76,7 +76,7 @@ class TestDiscuss(TestDiscussBase):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = text
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -101,7 +101,7 @@ class TestDiscuss(TestDiscussBase):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[post_form.find('textarea')['name']] = 'This is a new post'
r = self.app.post(post_link,
@@ -115,7 +115,7 @@ class TestDiscuss(TestDiscussBase):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[post_form.find('textarea')['name']] = 'Tis a reply'
r = self.app.post(post_link + 'reply',
@@ -375,7 +375,7 @@ class TestDiscuss(TestDiscussBase):
params = dict()
inputs = reply_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[reply_form.find('textarea')['name']] = 'zzz'
self.app.post(post_link, params)
@@ -412,7 +412,7 @@ class TestAttachment(TestDiscussBase):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Test Post'
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -469,7 +469,7 @@ class TestAttachment(TestDiscussBase):
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name') and field['name'] != 'file_info': # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name') and field['name'] != 'file_info':
params[field['name']] = field.get('value') or ''
params[post_form.find('textarea')['name']] = 'Reply'
r = self.app.post(self.post_link + 'reply',
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 103d79f..262d3a0 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -240,7 +240,7 @@ class TestForumMessageHandling(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params['subject'] = 'New Subject'
params['text'] = 'Asdf'
@@ -251,7 +251,7 @@ class TestForumMessageHandling(TestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[post_form.find('textarea')['name']] = 'text'
r = self.app.post(url + 'reply', params=params)
@@ -396,7 +396,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = '1st post in Zero Posts thread'
params[f.find('select')['name']] = 'testforum'
@@ -455,7 +455,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Post text'
params[f.find('select')['name']] = 'testforum'
@@ -476,7 +476,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'This is a *test thread*'
params[f.find('select')['name']] = 'testforum'
@@ -509,7 +509,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Post text'
params[f.find('select')['name']] = 'testforum'
@@ -544,7 +544,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Post content'
params[f.find('select')['name']] = 'testforum'
@@ -568,7 +568,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'anon reply to anon post content'
r = self.app.post(str(rep_url), params=params, extra_environ=dict(username='*anonymous'))
@@ -632,7 +632,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
@@ -646,7 +646,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'bbb'
thread = self.app.post(str(rep_url), params=params)
@@ -668,7 +668,7 @@ class TestForum(TestController):
params = dict()
inputs = reply_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[reply_form.find('textarea')['name']] = 'zzz'
self.app.post(post_link, params)
@@ -683,7 +683,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Post text'
params[f.find('select')['name']] = 'testforum'
@@ -697,7 +697,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
self.app.post(str(subscribe_url), params=params)
self.app.post('/discussion/general/subscribe_to_forum', {'subscribe': True})
@@ -706,7 +706,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Reply 2'
self.app.post(str(rep_url), params=params)
@@ -731,7 +731,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
@@ -784,7 +784,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
@@ -798,7 +798,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
@@ -849,7 +849,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
@@ -864,7 +864,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'bbb'
thread = self.app.post(str(rep_url), params=params)
@@ -889,7 +889,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
@@ -928,7 +928,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
@@ -952,7 +952,7 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index ed23054..2d84ada 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -177,7 +177,7 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'secret text'
params[f.find('select')['name']] = 'secret'
@@ -232,7 +232,7 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
@@ -257,7 +257,7 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
@@ -287,7 +287,7 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index e537ad6..97995d5 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -55,7 +55,7 @@ class TestDiscussionApiBase(TestRestApiBase):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = text
params[f.find('select')['name']] = forum
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index cb36318..93e769a 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -896,7 +896,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'test comment'
self.app.post(f['action'].encode('utf-8'), params=params,
@@ -1483,7 +1483,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -1499,7 +1499,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params['ticket_form.summary'] = new_summary
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -1518,7 +1518,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -1546,7 +1546,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
self.app.post(f['action'].encode('utf-8'), params=params,
@@ -1560,7 +1560,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[post_form.find('textarea')['name']] = 'Tis a reply'
r = self.app.post(post_link + 'reply',
@@ -2162,7 +2162,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
@@ -2412,7 +2412,7 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'): # nopep8 - beautifulsoup3 actually uses has_key
+ if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'test comment'
self.app.post(f['action'].encode('utf-8'), params=params,
@@ -2764,7 +2764,7 @@ class TestEmailMonitoring(TrackerTestController):
if (('thread' in f['action']) and ('post' in f['action'])):
params = {i['name']: i.get('value', '')
for i in f.findAll('input')
- if i.has_key('name')} # nopep8 - beautifulsoup3 actually uses has_key
+ if i.has_attr('name')}
params[f.find('textarea')['name']] = 'foobar'
self.app.post(str(f['action']), params)
break # Do it only once if many forms met