jenkins-bot has submitted this change and it was merged. Change subject: Update Pywikipedia to Pywikibot and fix (C) lines ......................................................................
Update Pywikipedia to Pywikibot and fix (C) lines - Replace pywikibot with Pywikibot where possible. - Standardise content and layout of copyright info at the top of files. - Update year of last substantive code change on touched files. - Revise the intro prose of externals/README Change-Id: I8822e3f978f5113df778d835030f372d3c98e68e --- M CREDITS M README.rst M externals/README M generate_family_file.py M generate_user_files.py M pywikibot/botirc.py M pywikibot/comms/__init__.py M pywikibot/date.py M pywikibot/editor.py M pywikibot/families/__init__.py M pywikibot/pagegenerators.py M pywikibot/userinterfaces/__init__.py M pywikibot/userinterfaces/terminal_interface_win32.py M scripts/blockpageschecker.py M scripts/capitalize_redirects.py M scripts/checkimages.py M scripts/coordinate_import.py M scripts/delete.py M scripts/disambredir.py M scripts/editarticle.py M scripts/fixing_redirects.py M scripts/illustrate_wikidata.py M scripts/imagerecat.py M scripts/imageuncat.py M scripts/maintenance/make_i18n_dict.py M scripts/makecat.py M scripts/protect.py M scripts/reflinks.py M scripts/replace.py M scripts/replicate_wiki.py M scripts/spamremove.py M scripts/template.py M scripts/templatecount.py M scripts/transferbot.py M scripts/version.py M scripts/welcome.py M tests/__init__.py M tests/api_tests.py M tests/i18n_tests.py M tests/pwb_tests.py M tests/weblib_tests.py M tests/wikidataquery_tests.py 42 files changed, 56 insertions(+), 52 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS index a87d3e5..5807c00 100644 --- a/CREDITS +++ b/CREDITS @@ -1,4 +1,4 @@ -pywikibot is an open-source project that cannot exist without your +Pywikibot is an open-source project that cannot exist without your contributions. We would therefore like to thank everyone who has contributed: diff --git a/README.rst b/README.rst index e340093..131da86 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Pywikibot Framework =================== -The pywikibot framework is a Python library that interfaces with the +The Pywikibot framework is a Python library that interfaces with the `MediaWiki API <https://www.mediawiki.org/wiki/Special:MyLanguage/API:Main_page>`_. Also included are various general function scripts that can be adapted for different tasks. diff --git a/externals/README b/externals/README index 52cb293..2195f75 100644 --- a/externals/README +++ b/externals/README @@ -1,4 +1,4 @@ -This package is only necessary to run pywikibot from a fully self-sufficient +This package is only necessary to run Pywikibot from a fully self-sufficient (no other dependencies other than python 2.6+) directory. This is especially useful on Windows. diff --git a/generate_family_file.py b/generate_family_file.py index fd5aa0d..5a8f6e5 100644 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -8,7 +8,7 @@ print_function, unicode_literals) # # (C) Merlijn van Deen, 2010-2013 -# (C) Pywikibot team, 2010-2013 +# (C) Pywikibot team, 2010-2014 # # Distributed under the terms of the MIT license # @@ -39,7 +39,8 @@ def urlopen(url): req = urllib2.Request( url, - headers={'User-agent': 'Pywikibot Family File Generator 2.0 - https://www.mediawiki.org/wiki/pywikibot'}) + headers={'User-agent': 'Pywikibot Family File Generator 2.0' + ' - https://www.mediawiki.org/wiki/Pywikibot'}) uo = urllib2.urlopen(req) try: if sys.version_info[0] == 2: diff --git a/generate_user_files.py b/generate_user_files.py index 328ba53..9cf7aeb 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -333,7 +333,7 @@ if os.path.exists(os.path.join(base_dir, "user-config.py")): break do_copy = raw_input("Do you want to copy user files from an existing " - "pywikibot installation? ").upper().strip() + "Pywikibot installation? ").upper().strip() if do_copy and "YES".startswith(do_copy): oldpath = raw_input("Path to existing wikipedia.py? ") if not os.path.exists(oldpath): diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index f2138d3..6ec058e 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -6,7 +6,7 @@ http://python-irclib.sourceforge.net/ """ # -# (C) Balasyum +# (C) Balasyum, 2008 # (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. diff --git a/pywikibot/comms/__init__.py b/pywikibot/comms/__init__.py index 22a940a..df0dcca 100644 --- a/pywikibot/comms/__init__.py +++ b/pywikibot/comms/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007-2008 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/date.py b/pywikibot/date.py index 4e6de5a..c6b1944 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -8,7 +8,7 @@ # (C) Daniel Herding, 2004 # (C) Ævar Arnfjörð Bjarmason, 2004 # (C) Andre Engels, 2004-2005 -# (C) Yuri Astrakhan, 2005-2006 firstnamelastn...@gmail.com +# (C) Yuri Astrakhan, 2005-2006 (<Firstname><Lastname>@gmail.com) # (years/decades/centuries/millenniums str <=> int conversions) # (C) Pywikibot team, 2004-2014 # diff --git a/pywikibot/editor.py b/pywikibot/editor.py index 22a0d7a..e921d49 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -5,8 +5,8 @@ """ # -# (C) Gerrit Holl 2004 -# (C) Pywikibot team, 2004-2013 +# (C) Gerrit Holl, 2004 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/families/__init__.py b/pywikibot/families/__init__.py index 22a940a..5041b19 100644 --- a/pywikibot/families/__init__.py +++ b/pywikibot/families/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index aad6df1..247e3e5 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1312,7 +1312,7 @@ displayed in or along with [Google] Services. Both of those issues should be managed by the package 'google', - however pywikibot will at least ensure the user sees the TOS + however Pywikibot will at least ensure the user sees the TOS in order to comply with the second condition. """ try: diff --git a/pywikibot/userinterfaces/__init__.py b/pywikibot/userinterfaces/__init__.py index 22a940a..5041b19 100644 --- a/pywikibot/userinterfaces/__init__.py +++ b/pywikibot/userinterfaces/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index d6e1d28..098ae80 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2003-2012 +# (C) Pywikibot team, 2003-2013 # # Distributed under the terms of the MIT license. # diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index c026b20..9297349 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -49,7 +49,7 @@ # # (C) Monobi a.k.a. Wikihermit, 2007 # (C) Filnik, 2007-2011 -# (C) NicDumZ, 2008-2009 +# (C) Nicolas Dumazet (NicDumZ), 2008-2009 # (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. diff --git a/scripts/capitalize_redirects.py b/scripts/capitalize_redirects.py index 814d771..35906ff 100644 --- a/scripts/capitalize_redirects.py +++ b/scripts/capitalize_redirects.py @@ -18,11 +18,14 @@ Example: "python capitalize_redirects.py -start:B -always" """ # -# (C) Yrithinnd +# (C) Yrithinnd, 2006 # (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # +# Originally derived from: +# http://en.wikipedia.org/wiki/User:Drinibot/CapitalizationRedirects +# # Automatically converted from compat branch by compat2core.py script # __version__ = '$Id$' diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 24b3b64..75bff69 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -6,7 +6,7 @@ description. This script will have to be configured for each language. Please submit -translations as addition to the pywikibot framework. +translations as addition to the Pywikibot framework. Everything that needs customisation is indicated by comments. diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 6407683..1998cf8 100644 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -17,7 +17,7 @@ ¶ms; """ # -# (C) Multichill 2014 +# (C) Multichill, 2014 # (C) Pywikibot team, 2013-2014 # # Distributed under the terms of MIT License. diff --git a/scripts/delete.py b/scripts/delete.py index 8b023ac..3211852 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -25,7 +25,7 @@ python delete.py -cat:"To delete" -always """ # -# (c) Pywikibot team, 2014 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/disambredir.py b/scripts/disambredir.py index 058e90a..4cbc419 100644 --- a/scripts/disambredir.py +++ b/scripts/disambredir.py @@ -11,8 +11,8 @@ """ # -# (c) André Engels and others, 2006-2009 -# (c) pywikibot team, 2006-2014 +# (C) André Engels, 2006-2009 +# (C) Pywikibot team, 2006-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/editarticle.py b/scripts/editarticle.py index 37f830a..4208e90 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -10,7 +10,7 @@ - ... """ # -# (C) Gerrit Holl 2004 +# (C) Gerrit Holl, 2004 # (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index e257da8..0cc37d4 100644 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -16,7 +16,7 @@ # # This script based on disambredir.py and solve_disambiguation.py # -# (C) Pywikipedia team, 2004-2014 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index a906943..01504de 100644 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -12,7 +12,7 @@ ¶ms; """ # -# (C) Multichill 2014 +# (C) Multichill, 2014 # (C) Pywikibot team, 2013-2014 # # Distributed under the terms of MIT License. diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index 748985e..9c0d886 100644 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -25,8 +25,8 @@ """ # -# (C) Multichill 2008-2011 -# (C) Pywikibot team, 2008-2013 +# (C) Multichill, 2008-2011 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index 74dc90d..0bcb3d9 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -6,7 +6,7 @@ """ # -# (C) Multichill 2008 +# (C) Multichill, 2008 # (C) Pywikibot team, 2009-2014 # # Distributed under the terms of the MIT license. diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 3292d11..d23e805 100644 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -17,8 +17,8 @@ >>> bot = i18nBot('<scriptname>.<class instance>', '<msg dict1>', '<msg >>> dict2>') """ # -# (C) xqt 2013-2014 -# (C) Pywikipedia bot team, 2013 +# (C) xqt, 2013-2014 +# (C) Pywikibot team, 2013-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/makecat.py b/scripts/makecat.py index d09a5bf..f005154 100644 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -33,7 +33,7 @@ """ # (C) Andre Engels, 2004 -# (C) Pywikibot team 2005-2014 +# (C) Pywikibot team, 2005-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/protect.py b/scripts/protect.py index 2dd0417..d7a55b1 100644 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -42,7 +42,7 @@ # Written by https://it.wikisource.org/wiki/Utente:Qualc1 # Created by modifying delete.py # -# (c) Pywikibot team, 2008-2014 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/reflinks.py b/scripts/reflinks.py index f1fb419..93617bf 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -34,7 +34,7 @@ -summary Use a custom edit summary. Otherwise it uses the default one from i18n/reflinks.py """ -# (C) 2008 - Nicolas Dumazet ( en:User:NicDumZ ) +# (C) Nicolas Dumazet (NicDumZ), 2008 # (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the GPL @@ -64,7 +64,7 @@ localized_msg = ('fr', 'it', 'pl') # localized message at MediaWiki # localized message at specific wikipedia site -# should be moved to MediaWiki pywikibot manual +# should be moved to MediaWiki Pywikibot manual stopPage = { diff --git a/scripts/replace.py b/scripts/replace.py index 3ddc0ec..4f1dc75 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -115,8 +115,8 @@ Please type "replace.py -help | more" if you can't read the top of the help. """ # -# (C) Daniel Herding & the Pywikipedia team, 2004-2012 -# (C) Pywikibot team, 2009-2014 +# (C) Daniel Herding, 2004-2012 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index 113ab8f..e22aa55 100644 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -22,7 +22,7 @@ liwiki. Note that this does not take the origin wiki into account. """ # -# (C) Kasper Souren 2012-2013 +# (C) Kasper Souren, 2012-2013 # (C) Pywikibot team, 2013-2014 # # Distributed under the terms of the MIT license. diff --git a/scripts/spamremove.py b/scripts/spamremove.py index 60906f1..57c1b53 100755 --- a/scripts/spamremove.py +++ b/scripts/spamremove.py @@ -24,7 +24,7 @@ """ # -# (C) Pywikipedia bot team, 2007-2014 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/template.py b/scripts/template.py index c605d29..80df20b 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -69,12 +69,12 @@ python template.py test -subst -namespace:2 -namespace:3 -Note that -namespace: is a global pywikibot parameter +Note that -namespace: is a global Pywikibot parameter This next example substitutes the template lived with a supplied edit summary. It only performs substitutions in main article namespace and doesn't prompt to -start replacing. Note that -putthrottle: is a global pywikibot parameter. +start replacing. Note that -putthrottle: is a global Pywikibot parameter. python template.py -putthrottle:30 -namespace:0 lived -subst -always -summary:"BOT: Substituting {{lived}}, see [[WP:SUBST]]." diff --git a/scripts/templatecount.py b/scripts/templatecount.py index a3dceb2..cd2aa01 100644 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -30,8 +30,8 @@ """ # -# (c) Pywikibot team, 2006-2014 -# (c) xqt, 2009-2014 +# (C) Pywikibot team, 2006-2014 +# (C) xqt, 2009-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/transferbot.py b/scripts/transferbot.py index dcc6144..a9c7965 100644 --- a/scripts/transferbot.py +++ b/scripts/transferbot.py @@ -33,7 +33,7 @@ # # (C) Merlijn van Deen, 2014 -# (C) pywikibot team, 2014 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/version.py b/scripts/version.py index 88b0f62..3dc2b2d 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -1,10 +1,10 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -""" Script to determine the pywikibot version (tag, revision and date) """ +""" Script to determine the Pywikibot version (tag, revision and date) """ # # (C) Merlijn 'valhallasw' van Deen, 2007-2008 # (C) xqt, 2010-2014 -# (C) Pywikibot team, 2007-2013 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/welcome.py b/scripts/welcome.py index 9ea90ea..92bfaf7 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -939,7 +939,7 @@ elif arg == '-quick': globalvar.quick = True - # Filename and pywikibot path + # Filename and Pywikibot path # file where is stored the random signature index filename = pywikibot.config.datafilepath('welcome-%s-%s.data' % (pywikibot.Site().family.name, diff --git a/tests/__init__.py b/tests/__init__.py index 99fd1da..919064a 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/tests/api_tests.py b/tests/api_tests.py index 5faec1f..ef6fedf 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index b349bc7..2d16042 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 9f36a0c..c6aaf77 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2007 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index 58a0392..61ccabe 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2014 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py index 019887e..f1044b8 100644 --- a/tests/wikidataquery_tests.py +++ b/tests/wikidataquery_tests.py @@ -3,7 +3,7 @@ Test cases for the WikidataQuery query syntax and API """ # -# (C) Pywikipedia bot team, 2013 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/146405 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8822e3f978f5113df778d835030f372d3c98e68e Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.w...@gmail.com> Gerrit-Reviewer: Pyfisch <pyfi...@gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisa...@openmailbox.org> Gerrit-Reviewer: Xqt <i...@gno.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
