jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/406570 )

Change subject: [PEP8] Fix E741: "do not use variables named ‘l’, ‘O’, or ‘I’" ......................................................................

[PEP8] Fix E741: "do not use variables named ‘l’, ‘O’, or ‘I’"

Change-Id: I01ef699f20b228661c85c06a79d2fdabec172da5 --- M scripts/category_redirect.py M tests/link_tests.py M tests/page_tests.py M tox.ini 4 files changed, 32 insertions(+), 36 deletions(-)

Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved

diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index fcfbd56..db7543d 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -275,8 +275,8 @@ user = self.site.user() # invokes login() newredirs = []

- l = time.localtime() - today = "%04d-%02d-%02d" % l[:3] + localtime = time.localtime() + today = '%04d-%02d-%02d' % localtime[:3] edit_request_page = pywikibot.Page( self.site, u"User:%s/category edit requests" % user) datafile = pywikibot.config.datafilepath("%s-catmovebot-data" diff --git a/tests/link_tests.py b/tests/link_tests.py index 9fba7c1..5b661b5 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -95,13 +95,13 @@ self.assertEqual(Link('A   B', self.get_site()).title, 'A B') self.assertEqual(Link('A   B', self.get_site()).title, 'A B')

- l = Link('A | B', self.get_site()) - self.assertEqual(l.title, 'A') - self.assertEqual(l.anchor, ' B') + anchor_link = Link('A | B', self.get_site()) + self.assertEqual(anchor_link.title, 'A') + self.assertEqual(anchor_link.anchor, ' B')

- l = Link('A%23B', self.get_site()) - self.assertEqual(l.title, 'A') - self.assertEqual(l.section, 'B') + section_link = Link('A%23B', self.get_site()) + self.assertEqual(section_link.title, 'A') + self.assertEqual(section_link.section, 'B')

def test_invalid(self): """Test that invalid titles raise InvalidTitle exception.""" @@ -207,18 +207,18 @@ def test_relative(self): """Test that relative links are handled properly.""" # Subpage - p = Page(self.get_site(), 'Foo') - l = Link('/bar', p) - self.assertEqual(l.title, 'Foo/bar') - self.assertEqual(l.site, self.get_site()) + page = Page(self.get_site(), 'Foo') + rel_link = Link('/bar', page) + self.assertEqual(rel_link.title, 'Foo/bar') + self.assertEqual(rel_link.site, self.get_site()) # Subpage of Page with section - p = Page(self.get_site(), 'Foo#Baz') - l = Link('/bar', p) - self.assertEqual(l.title, 'Foo/bar') - self.assertEqual(l.site, self.get_site()) + page = Page(self.get_site(), 'Foo#Baz') + rel_link = Link('/bar', page) + self.assertEqual(rel_link.title, 'Foo/bar') + self.assertEqual(rel_link.site, self.get_site()) # Non-subpage link text beginning with slash - l = Link('/bar', self.get_site()) - self.assertEqual(l.title, '/bar') + abs_link = Link('/bar', self.get_site()) + self.assertEqual(abs_link.title, '/bar')

class Issue10254TestCase(DefaultDrySiteTestCase): @@ -238,8 +238,8 @@ def test_no_change(self): """Test T102461 (Python issue 10254) is not encountered.""" title = 'Li̍t-sṳ́' - l = Link(title, self.site) - self.assertEqual(l.title, 'Li̍t-sṳ́') + link = Link(title, self.site) + self.assertEqual(link.title, 'Li̍t-sṳ́')

@unittest.skipIf(PYTHON_VERSION != (2, 6, 6), 'Python 2.6.6-only test') def test_py266_bug_exception(self): diff --git a/tests/page_tests.py b/tests/page_tests.py index 08cb8de..8fd2a08 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -107,25 +107,25 @@ """Test that Link() normalizes namespace names.""" for num in self.namespaces: for prefix in self.namespaces[num]: - l = pywikibot.page.Link(prefix + list(self.titles.keys())[0], - self.enwiki) - self.assertEqual(l.namespace, num) + link = pywikibot.page.Link( + prefix + list(self.titles.keys())[0], self.enwiki) + self.assertEqual(link.namespace, num) # namespace prefixes are case-insensitive - m = pywikibot.page.Link(prefix.lower() + list(self.titles.keys())[1], - self.enwiki) - self.assertEqual(m.namespace, num) + lowered_link = pywikibot.page.Link( + prefix.lower() + list(self.titles.keys())[1], self.enwiki) + self.assertEqual(lowered_link.namespace, num)

def testTitles(self): """Test that Link() normalizes titles.""" for title in self.titles: for num in (0, 1): - l = pywikibot.page.Link(self.namespaces[num][0] + title, - self.enwiki) - self.assertEqual(l.title, self.titles[title]) + link = pywikibot.page.Link(self.namespaces[num][0] + title, + self.enwiki) + self.assertEqual(link.title, self.titles[title]) # prefixing name with ":" shouldn't change result - m = pywikibot.page.Link(":" + self.namespaces[num][0] + title, - self.enwiki) - self.assertEqual(m.title, self.titles[title]) + prefixed_link = pywikibot.page.Link( + ':' + self.namespaces[num][0] + title, self.enwiki) + self.assertEqual(prefixed_link.title, self.titles[title])

def testHashCmp(self): """Test hash comparison.""" diff --git a/tox.ini b/tox.ini index bc62e18..d907043 100644 --- a/tox.ini +++ b/tox.ini @@ -211,10 +211,6 @@ # __dict__ used in a discouraged manner # regex matches the first physical line of logical line of the error pywikibot/exceptions.py : H501 - # Todo: E741: ambiguous variable name - tests/link_tests.py : E741 - tests/page_tests.py : E741 - scripts/category_redirect.py : E741

[pep8] # see explanations above