[Pywikibot-commits] [Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py]

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463604 ) Change subject: [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py] ...................................................................... [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py] - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters - use str.format(...) instead of modulo for type specifier arguments Bug: T89589 Change-Id: I5b4240872fe4503f091e6889ae947f47e17da1cd --- M tests/data_ingestion_tests.py M tests/date_tests.py M tests/deletionbot_tests.py M tests/deprecation_tests.py M tests/diff_tests.py M tests/djvu_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/edit_failure_tests.py M tests/edit_tests.py 10 files changed, 221 insertions(+), 163 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index dbce145..f9e026e 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -31,10 +31,14 @@ def setUp(self): """Set up unit test.""" super(TestPhoto, self).setUp() + url = ('http://upload.wikimedia.org/wikipedia/commons/f/' + 'fc/MP_sounds.png') + + meta_url = 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg' self.obj = data_ingestion.Photo( - URL='http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png&#…png', + URL=url, metadata={'description.en': '"Sounds" icon', - 'source': 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg', + 'source': meta_url, 'author': 'KDE artists | Silstor', 'license': 'LGPL', 'set': 'Crystal SVG icon set', @@ -49,7 +53,8 @@ def test_findDuplicateImages(self): """Test finding duplicates on Wikimedia Commons.""" duplicates = self.obj.findDuplicateImages() - self.assertIn('MP sounds.png', [dup.replace("_", " ") for dup in duplicates]) + self.assertIn('MP sounds.png', + [dup.replace('_', ' ') for dup in duplicates]) def test_getTitle(self): """Test getTitle().""" @@ -86,8 +91,9 @@ def test_PhotoURL(self): """Test PhotoURL().""" - self.assertEqual(self.obj.URL, - 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') + self.assertEqual( + self.obj.URL, + 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') def test_getTitle(self): """Test getTitle().""" diff --git a/tests/date_tests.py b/tests/date_tests.py index 80abd68..5308049 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -37,15 +37,15 @@ for value in range(start, stop, step): self.assertTrue( predicate(value), - "date.formats['%s']['%s']:\ninvalid value %d" - % (formatname, code, value)) + "date.formats['{}']['{}']:\ninvalid value {}" + .format(formatname, code, value)) new_value = convert(convert(value)) self.assertEqual( new_value, value, - "date.formats['%s']['%s']:\n" - "value %d does not match %s" - % (formatname, code, new_value, value)) + "date.formats['{}']['{}']:\n" + 'value {} does not match {}' + .format(formatname, code, new_value, value)) return testMapEntry for formatname in date.formats: @@ -73,26 +73,38 @@ def test_apply_positive_delta(self): """Test adding months to a date.""" - self.assertEqual(datetime(2012, 3, 10), date.apply_month_delta(datetime(2012, 1, 10), 2)) - self.assertEqual(datetime(2012, 3, 31), date.apply_month_delta(datetime(2012, 1, 31), 2)) - self.assertEqual(datetime(2012, 2, 29), date.apply_month_delta(datetime(2012, 1, 31))) - self.assertEqual(datetime(2012, 3, 2), date.apply_month_delta(datetime(2012, 1, 31), + self.assertEqual(datetime(2012, 3, 10), + date.apply_month_delta(datetime(2012, 1, 10), 2)) + self.assertEqual(datetime(2012, 3, 31), + date.apply_month_delta(datetime(2012, 1, 31), 2)) + self.assertEqual(datetime(2012, 2, 29), + date.apply_month_delta(datetime(2012, 1, 31))) + self.assertEqual(datetime(2012, 3, 2), + date.apply_month_delta(datetime(2012, 1, 31), add_overlap=True)) def test_apply_negative_delta(self): """Test adding months to a date.""" - self.assertEqual(datetime(2012, 1, 10), date.apply_month_delta(datetime(2012, 3, 10), -2)) - self.assertEqual(datetime(2012, 1, 31), date.apply_month_delta(datetime(2012, 3, 31), -2)) - self.assertEqual(datetime(2012, 2, 29), date.apply_month_delta(datetime(2012, 3, 31), -1)) - self.assertEqual(datetime(2012, 3, 2), date.apply_month_delta(datetime(2012, 3, 31), -1, + self.assertEqual(datetime(2012, 1, 10), + date.apply_month_delta(datetime(2012, 3, 10), -2)) + self.assertEqual(datetime(2012, 1, 31), + date.apply_month_delta(datetime(2012, 3, 31), -2)) + self.assertEqual(datetime(2012, 2, 29), + date.apply_month_delta(datetime(2012, 3, 31), -1)) + self.assertEqual(datetime(2012, 3, 2), + date.apply_month_delta(datetime(2012, 3, 31), -1, add_overlap=True)) def test_get_delta(self): """Test that the delta is calculated correctly.""" - self.assertEqual(date.get_month_delta(datetime(2012, 1, 31), datetime(2012, 3, 31)), 2) - self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), datetime(2012, 1, 31)), -2) - self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), datetime(2013, 1, 31)), 10) - self.assertEqual(date.get_month_delta(datetime(2014, 3, 31), datetime(2013, 3, 31)), -12) + self.assertEqual(date.get_month_delta(datetime(2012, 1, 31), + datetime(2012, 3, 31)), 2) + self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), + datetime(2012, 1, 31)), -2) + self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), + datetime(2013, 1, 31)), 10) + self.assertEqual(date.get_month_delta(datetime(2014, 3, 31), + datetime(2013, 3, 31)), -12) if __name__ == '__main__': # pragma: no cover diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 6fcd981..b7d991f 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -62,7 +62,7 @@ """Test marking User:Unicodesnowman/DeleteMark for deletion.""" site = self.get_site() if site.username(sysop=True): - raise unittest.SkipTest('can\'t test mark with sysop account') + raise unittest.SkipTest("can't test mark with sysop account") p1 = pywikibot.Page(site, 'User:Unicodesnowman/DeleteMark') if not p1.exists(): diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 569f233c..9fb91e9 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -307,11 +307,11 @@ (deprecated_func, 'Deprecated.\n\nDeprecated function.'), (deprecated_func_docstring, 'DEPRECATED. Deprecated function.'), (deprecated_func2, 'Deprecated.\n\nDeprecated function.'), - (deprecated_func2_docstring, 'DEPRECATED, don\'t use this. ' + (deprecated_func2_docstring, "DEPRECATED, don't use this. " 'Deprecated function.'), (deprecated_func_instead, 'Deprecated; use baz instead.\n\n' 'Deprecated function.'), - (deprecated_func_instead_docstring, 'DEPRECATED, don\'t use ' + (deprecated_func_instead_docstring, "DEPRECATED, don't use " 'this. Deprecated function.'), (deprecated_func_docstring_arg, 'Deprecated.\n\n' '@param foo: Foo. DEPRECATED.'), @@ -449,9 +449,8 @@ self.assertRaisesRegex( TypeError, - r"deprecated_func_arg2?\(\) got multiple values for (keyword )?argument 'foo'", - func, - 'a', bah='b' + r'deprecated_func_arg2?\(\) got multiple values for ' + "(keyword )?argument 'foo'", func, 'a', bah='b' ) self._reset_messages() @@ -493,36 +492,36 @@ rv = deprecated_all(foo=42) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(42) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(foo=42, bar=47) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo', 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(42, 47) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo', 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() @@ -537,9 +536,9 @@ rv = deprecated_all2(42, bar=47) self.assertEqual(rv, 42) self.assertDeprecation( - "The trailing arguments ('bar') of %s.deprecated_all2 are " + "The trailing arguments ('bar') of {}.deprecated_all2 are " "deprecated. The value(s) provided for 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() @@ -555,8 +554,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. " - "The value(s) provided for 'foo' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. ' + "The value(s) provided for 'foo' have been dropped." + .format(__name__)) self._reset_messages() @@ -564,8 +564,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. " - "The value(s) provided for 'foo' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. ' + "The value(s) provided for 'foo' have been dropped." + .format(__name__)) self._reset_messages() @@ -573,8 +574,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. The " - "value(s) provided for 'foo', 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. The ' + "value(s) provided for 'foo', 'bar' have been dropped." + .format(__name__)) self._reset_messages() @@ -582,8 +584,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. The " - "value(s) provided for 'foo', 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. The ' + "value(s) provided for 'foo', 'bar' have been dropped." + .format(__name__)) self._reset_messages() @@ -599,18 +602,19 @@ self.assertEqual(rv, 42) self.assertDeprecation( "The trailing arguments ('bar') of " - "%s.DeprecatedMethodClass.deprecated_all2 are deprecated. " - "The value(s) provided for 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all2 are deprecated. ' + "The value(s) provided for 'bar' have been dropped." + .format(__name__)) def test_remove_last_args_invalid(self): """Test invalid @remove_last_args on functions.""" self.assertRaisesRegex( TypeError, # Python 3 - r"(deprecated_all2\(\) missing 1 required positional argument: " + r'(deprecated_all2\(\) missing 1 required positional argument: ' r"'foo'|" # Python 2 - r"deprecated_all2\(\) takes exactly 1 argument \(0 given\))", + r'deprecated_all2\(\) takes exactly 1 argument \(0 given\))', deprecated_all2) self.assertRaisesRegex( @@ -631,10 +635,10 @@ self.assertRaisesRegex( TypeError, # Python 3 - r"(deprecated_all2\(\) missing 1 required positional argument: " + r'(deprecated_all2\(\) missing 1 required positional argument: ' r"'foo'|" # Python 2 - r"deprecated_all2\(\) takes exactly 2 arguments \(1 given\))", + r'deprecated_all2\(\) takes exactly 2 arguments \(1 given\))', f.deprecated_all2) self.assertRaisesRegex( @@ -760,13 +764,15 @@ self.assertEqual(rv, 'a') self.assertEqual(f.foo, 'a') self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') rv = f.deprecated_instance_method_and_arg(bah='b') self.assertEqual(rv, 'b') self.assertEqual(f.foo, 'b') self.assertDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') self.assertDeprecationParts( 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' 'deprecated_instance_method_and_arg', 'foo') @@ -777,7 +783,8 @@ self.assertEqual(rv, 1) self.assertEqual(f.foo, 1) self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') def test_deprecated_instance_method_and_arg2(self): """Test @deprecated and @deprecate_arg with instance methods.""" @@ -787,13 +794,15 @@ self.assertEqual(rv, 'a') self.assertEqual(f.foo, 'a') self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') rv = f.deprecated_instance_method_and_arg2(bah='b') self.assertEqual(rv, 'b') self.assertEqual(f.foo, 'b') self.assertDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') self.assertDeprecationParts( 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' 'deprecated_instance_method_and_arg2', 'foo') @@ -804,7 +813,8 @@ self.assertEqual(rv, 1) self.assertEqual(f.foo, 1) self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') if __name__ == '__main__': # pragma: no cover diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 9bba2ce..bfe2382 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -194,16 +194,17 @@ newtext = 'new' # output messages expected during testing - diff_message = '\x03{lightred}- old\n\x03{default}\x03{lightgreen}+ new\n\x03{default}' + diff_message = ('\x03{lightred}- old\n\x03{default}\x03{lightgreen}+ ' + 'new\n\x03{default}') none_message = '\x03{{lightpurple}}{0: ^50}\x03{{default}}'.format('None.') header_base = '\n\x03{{lightpurple}}{0:*^50}\x03{{default}}\n' headers = [' ALL CHANGES ', ' REVIEW CHANGES ', ' APPROVED CHANGES '] - diff_by_letter_message = ("\x03{lightred}- o\n\x03{default}" - "\x03{lightred}- l\n\x03{default}" - "\x03{lightred}- d\n\x03{default}" - "\x03{lightgreen}+ n\n\x03{default}" - "\x03{lightgreen}+ e\n\x03{default}" - "\x03{lightgreen}+ w\n\x03{default}") + diff_by_letter_message = ('\x03{lightred}- o\n\x03{default}' + '\x03{lightred}- l\n\x03{default}' + '\x03{lightred}- d\n\x03{default}' + '\x03{lightgreen}+ n\n\x03{default}' + '\x03{lightgreen}+ e\n\x03{default}' + '\x03{lightgreen}+ w\n\x03{default}') def check_headers(self, mock): """Check if all headers were added to ouput.""" @@ -211,7 +212,8 @@ mock.assert_any_call(self.header_base.format(header)) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='y') def test_accept(self, input, mock): """Check output of cherry_pick if changes accepted.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.newtext) @@ -219,7 +221,8 @@ mock.assert_any_call(self.diff_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='n') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='n') def test_reject(self, input, mock): """Check output of cherry_pick if changes rejected.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) @@ -228,7 +231,8 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='q') def test_quit(self, input, mock): """Check output of cherry_pick if quitted.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) @@ -237,18 +241,28 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='y') def test_by_letter_accept(self, input, mock): - """Check output of cherry_pick if by_letter diff is enabled and changes accepted.""" - self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.newtext) + """Check cherry_pick output. + + If by_letter diff is enabled and changes accepted. + """ + self.assertEqual(cherry_pick(self.oldtext, self.newtext, + by_letter=True), self.newtext) self.check_headers(mock) mock.assert_any_call(self.diff_by_letter_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='q') def test_by_letter_quit(self, input, mock): - """Check output of cherry_pick if by_letter diff is enabled and quitted during review.""" - self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.oldtext) + """Check cherry_pick output. + + If by_letter diff is enabled and quitted during review. + """ + self.assertEqual(cherry_pick(self.oldtext, self.newtext, + by_letter=True), self.oldtext) self.check_headers(mock) mock.assert_any_call(self.diff_by_letter_message) mock.assert_any_call(self.none_message) diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index ea9b010..ffc65bb 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -51,7 +51,7 @@ def test_repr_method(self): """Test __repr__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "pywikibot.tools.djvu.DjVuFile('%s')" % self.file_djvu + expected = "pywikibot.tools.djvu.DjVuFile('{}')".format(self.file_djvu) if PY2: expected = expected.encode('utf-8') self.assertEqual(repr(djvu), expected) @@ -59,7 +59,7 @@ def test_str_method(self): """Test __str__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "DjVuFile('%s')" % self.file_djvu + expected = "DjVuFile('{}')".format(self.file_djvu) if PY2: expected = expected.encode('utf-8') self.assertEqual(str(djvu), expected) @@ -67,7 +67,7 @@ def test_unicode_method(self): """Test __unicode__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "DjVuFile('%s')" % self.file_djvu + expected = "DjVuFile('{}')".format(self.file_djvu) if PY2: self.assertEqual(unicode(djvu), expected) else: diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index d5056ec..a377d53 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -68,7 +68,8 @@ def test_expiry_formats(self): """Test using a timedelta as expiry.""" self.assertEqual(self.req.expiry, - CachedRequest(datetime.timedelta(days=1), site=self.basesite, + CachedRequest(datetime.timedelta(days=1), + site=self.basesite, parameters=self.parms).expiry) def test_expired(self): @@ -101,24 +102,31 @@ def test_create_file_name(self): """Test the file names for the cache.""" - self.assertEqual(self.req._create_file_name(), self.req._create_file_name()) - self.assertEqual(self.req._create_file_name(), self.expreq._create_file_name()) + self.assertEqual(self.req._create_file_name(), + self.req._create_file_name()) + self.assertEqual(self.req._create_file_name(), + self.expreq._create_file_name()) self.assertEqual(self.req._create_file_name(), self.deprecated_explicit._create_file_name()) self.assertEqual(self.req._create_file_name(), self.deprecated_asterisks._create_file_name()) - self.assertNotEqual(self.req._create_file_name(), self.diffreq._create_file_name()) + self.assertNotEqual(self.req._create_file_name(), + self.diffreq._create_file_name()) def test_cachefile_path(self): """Test the file paths for the cache.""" - self.assertEqual(self.req._cachefile_path(), self.req._cachefile_path()) - self.assertEqual(self.req._cachefile_path(), self.expreq._cachefile_path()) + self.assertEqual(self.req._cachefile_path(), + self.req._cachefile_path()) + self.assertEqual(self.req._cachefile_path(), + self.expreq._cachefile_path()) self.assertEqual(self.req._cachefile_path(), self.deprecated_explicit._cachefile_path()) self.assertEqual(self.req._cachefile_path(), self.deprecated_asterisks._cachefile_path()) - self.assertNotEqual(self.req._cachefile_path(), self.diffreq._cachefile_path()) - self.assertNotEqual(self.req._cachefile_path(), self.diffsite._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), + self.diffreq._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), + self.diffsite._cachefile_path()) class MockCachedRequestKeyTests(TestCase): @@ -169,21 +177,21 @@ return self._siteinfo def __repr__(self): - return "MockSite()" + return 'MockSite()' def __getattr__(self, attr): - raise Exception("Attribute %r not defined" % attr) + raise Exception('Attribute {!r} not defined'.format(attr)) self.mocksite = MockSite() super(MockCachedRequestKeyTests, self).setUp() def test_cachefile_path_different_users(self): - """Test and compare the file paths when different usernames are used.""" + """Test and compare file paths when different usernames are used.""" req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) anonpath = req._cachefile_path() - self.mocksite._userinfo = {'name': u'MyUser'} + self.mocksite._userinfo = {'name': 'MyUser'} self.mocksite._loginstatus = 0 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) @@ -191,7 +199,7 @@ self.assertNotEqual(anonpath, userpath) - self.mocksite._userinfo = {'name': u'MySysop'} + self.mocksite._userinfo = {'name': 'MySysop'} self.mocksite._loginstatus = 1 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) @@ -202,19 +210,19 @@ def test_unicode(self): """Test caching with Unicode content.""" - self.mocksite._userinfo = {'name': u'محمد الفلسطيني'} + self.mocksite._userinfo = {'name': 'محمد الفلسطيني'} self.mocksite._loginstatus = 0 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) en_user_path = req._cachefile_path() - self.mocksite._namespaces = {2: [u'مستخدم']} + self.mocksite._namespaces = {2: ['مستخدم']} req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) - expect = (u'MockSite()User(User:محمد الفلسطيني)' + + expect = ('MockSite()User(User:محمد الفلسطيني)' + "[('action', 'query'), ('meta', 'siteinfo')]") self.assertEqual(repr(req._uniquedescriptionstr()), repr(expect)) @@ -315,53 +323,53 @@ """Test extracting data from the ParamInfo.""" prop_info_param_data = { # data from 1.25 - "name": "info", - "classname": "ApiQueryInfo", - "path": "query+info", - "group": "prop", - "prefix": "in", - "parameters": [ + 'name': 'info', + 'classname': 'ApiQueryInfo', + 'path': 'query+info', + 'group': 'prop', + 'prefix': 'in', + 'parameters': [ { - "name": "prop", - "multi": "", - "limit": 500, - "lowlimit": 50, - "highlimit": 500, - "type": [ - "protection", - "talkid", - "watched", - "watchers", - "notificationtimestamp", - "subjectid", - "url", - "readable", - "preload", - "displaytitle" + 'name': 'prop', + 'multi': '', + 'limit': 500, + 'lowlimit': 50, + 'highlimit': 500, + 'type': [ + 'protection', + 'talkid', + 'watched', + 'watchers', + 'notificationtimestamp', + 'subjectid', + 'url', + 'readable', + 'preload', + 'displaytitle' ] }, { - "name": "token", - "deprecated": "", - "multi": "", - "limit": 500, - "lowlimit": 50, - "highlimit": 500, - "type": [ - "edit", - "delete", - "protect", - "move", - "block", - "unblock", - "email", - "import", - "watch" + 'name': 'token', + 'deprecated': '', + 'multi': '', + 'limit': 500, + 'lowlimit': 50, + 'highlimit': 500, + 'type': [ + 'edit', + 'delete', + 'protect', + 'move', + 'block', + 'unblock', + 'email', + 'import', + 'watch' ] }, { - "name": "continue", - "type": "string" + 'name': 'continue', + 'type': 'string' } ], "querytype": "prop" diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index c67435c..441fe50 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -66,36 +66,38 @@ self.assertEqual(x.username(), user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'!'} - x._username = (u'!', None) + x._userinfo = {'name': '!'} + x._username = ('!', None) self.assertEqual('!', user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'foo bar'} - x._username = (u'foo bar', None) + x._userinfo = {'name': 'foo bar'} + x._username = ('foo bar', None) self.assertEqual('foo_bar', user_agent(x, format_string='{username}')) old_config = '{script}/{version} Pywikibot/2.0 (User:{username})' pywikibot.version.getversiondict() - script_value = pywikibot.calledModuleName() + '/' + pywikibot.version.cache['rev'] + script_value = (pywikibot.calledModuleName() + '/' + + pywikibot.version.cache['rev']) self.assertEqual(script_value + ' Pywikibot/2.0 (User:foo_bar)', user_agent(x, format_string=old_config)) - x._userinfo = {'name': u'⁂'} - x._username = (u'⁂', None) + x._userinfo = {'name': '⁂'} + x._username = ('⁂', None) self.assertEqual('%E2%81%82', user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'127.0.0.1'} + x._userinfo = {'name': '127.0.0.1'} x._username = (None, None) self.assertEqual('Foo', user_agent(x, format_string='Foo {username}')) self.assertEqual('Foo (' + x.family.name + ':' + x.code + ')', - user_agent(x, format_string='Foo ({script_comments})')) + user_agent(x, + format_string='Foo ({script_comments})')) class TestSetAction(DeprecationTestCase): @@ -185,7 +187,8 @@ """Test overriding the required group.""" args = (1, 2, 'a', 'b') kwargs = {'i': 'j', 'k': 'l'} - retval = self.call_this_user_req_function(*args, as_group='sysop', **kwargs) + retval = self.call_this_user_req_function( + *args, as_group='sysop', **kwargs) self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) self.assertEqual(self._logged_in_as, 'sysop') @@ -195,7 +198,8 @@ self.obsolete = True args = (1, 2, 'a', 'b') kwargs = {'i': 'j', 'k': 'l'} - self.assertRaises(UnknownSite, self.call_this_user_req_function, args, kwargs) + self.assertRaises(UnknownSite, self.call_this_user_req_function, + args, kwargs) class TestNeedVersion(DeprecationTestCase): @@ -209,49 +213,49 @@ def setUp(self): """Set up test method.""" super(TestNeedVersion, self).setUp() - self.version = lambda: "1.13" + self.version = lambda: '1.13' - @need_version("1.14") + @need_version('1.14') def too_new(self): """Method which is to new.""" return True - @need_version("1.13") + @need_version('1.13') def old_enough(self): """Method which is as new as the server.""" return True - @need_version("1.12") + @need_version('1.12') def older(self): """Method which is old enough.""" return True - @need_version("1.14") + @need_version('1.14') @deprecated def deprecated_unavailable_method(self): """Method which is to new and then deprecated.""" return True @deprecated - @need_version("1.14") + @need_version('1.14') def deprecated_unavailable_method2(self): """Method which is deprecated first and then to new.""" return True - @need_version("1.12") + @need_version('1.12') @deprecated def deprecated_available_method(self): """Method which is old enough and then deprecated.""" return True @deprecated - @need_version("1.12") + @need_version('1.12') def deprecated_available_method2(self): """Method which is deprecated first and then old enough.""" return True def test_need_version(self): - """Test need_version when the version is to new, exact or old enough.""" + """Test need_version when the version is new, exact or old enough.""" self.assertRaises(NotImplementedError, self.too_new) self.assertTrue(self.old_enough()) self.assertTrue(self.older()) @@ -261,14 +265,16 @@ # FIXME: The deprecation message should be: # __name__ + '.TestNeedVersion.deprecated_unavailable_method - # The outermost decorator is the version check, so no deprecation message. + # The outermost decorator is the version check, so no + # deprecation message. self.assertRaisesRegex( NotImplementedError, 'deprecated_unavailable_method', self.deprecated_unavailable_method) self.assertNoDeprecation() - # The deprecator is first, but the version check still raises exception. + # The deprecator is first, but the version check still + # raises exception. self.assertRaisesRegex( NotImplementedError, 'deprecated_unavailable_method2', diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index f665f4a..9182992 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -44,7 +44,8 @@ def test_protected(self): """Test that protected titles raise the appropriate exception.""" if self.site.has_group('sysop'): - raise unittest.SkipTest('Testing failure of edit protected with a sysop account') + raise unittest.SkipTest('Testing failure of edit protected with ' + 'a sysop account') page = pywikibot.Page(self.site, 'Wikipedia:Create a new page') self.assertRaises(LockedPage, page.save) @@ -90,7 +91,7 @@ def test_no_recreate(self): """Test that Page.save with recreate disabled fails if page existed.""" page = pywikibot.Page(self.site, 'User:John_Vandenberg/no_recreate') - self.assertRaisesRegex(OtherPageSaveError, 'Page .* doesn\'t exist', + self.assertRaisesRegex(OtherPageSaveError, "Page .* doesn't exist", page.save, recreate=False) @@ -112,8 +113,8 @@ mysite.tokens['move'] except KeyError: raise unittest.SkipTest( - "movepage test requires 'move' token not given to user on %s" - % self.site) + "movepage test requires 'move' token not given to user on {}" + .format(self.site)) self.assertRaises(Error, mysite.movepage, mainpage, mainpage.title(), 'test') @@ -160,10 +161,11 @@ item.addClaim, claim) def test_WbMonolingualText_invalid_text(self): - """Attempt adding a monolingual text with an invalid non-string text.""" + """Attempt adding a monolingual text with invalid non-string text.""" repo = self.get_repo() item = pywikibot.ItemPage(repo, 'Q68') - claim = self._make_WbMonolingualText_claim(repo, text=123456, language='en') + claim = self._make_WbMonolingualText_claim(repo, text=123456, + language='en') self.assertRaisesRegex( OtherPageSaveError, r'Edit to page \[\[(wikidata:test:)?Q68]] failed:\n' diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 0b1fed8..bf638a5 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -206,11 +206,11 @@ self.assertTrue(self.site.logged_in()) ts = str(time.time()) p = pywikibot.Page(self.site, - 'User:%s/edit test' % self.site.username()) + 'User:{}/edit test'.format(self.site.username())) p.site.editpage(p, appendtext=ts) revision_id = p.latest_revision_id p = pywikibot.Page(self.site, - 'User:%s/edit test' % self.site.username()) + 'User:{}/edit test'.format(self.site.username())) self.assertEqual(revision_id, p.latest_revision_id) self.assertTrue(p.text.endswith(ts)) -- To view, visit https://gerrit.wikimedia.org/r/463604 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b4240872fe4503f091e6889ae947f47e17da1cd Gerrit-Change-Number: 463604 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)