Pywikibot-commits January 2016

pywikibot-commits@lists.wikimedia.org

2 participants
115 discussions

Errored: wikimedia/pywikibot-core#3218 (master - a426e4f)
by Travis CI 31 Jan '16

31 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3218 Status: Errored Duration: 1 hour, 13 minutes, and 7 seconds Commit: a426e4f (master) Author: jenkins-bot Message: Merge "replaceExcept tests for non-inverting lookbehind or lookbehind" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/58d30bc74d48...a426e4fb… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/106017191 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] replaceExcept tests for non-inverting lookbehind or lookbehind - change (pywikibot/core)
by jenkins-bot (Code Review) 31 Jan '16

31 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: replaceExcept tests for non-inverting lookbehind or lookbehind ...................................................................... replaceExcept tests for non-inverting lookbehind or lookbehind Bug: T123185 Change-Id: I1c0dba18e8db1bf1556c94dfb17e9a3b7dc45801 --- M tests/textlib_tests.py 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 00bf1f8..8c6f572 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1026,6 +1026,26 @@ textlib.replaceExcept('A123B', r'A(?P<a>\d)2(\d)B', r'A\g<a>x\2B', [], site=self.site), 'A1x3B') + # test regex with lookbehind. + self.assertEqual( + textlib.replaceExcept('A behindB C', r'(?<=behind)\w', + r'Z', [], site=self.site), + 'A behindZ C') + # test regex with lookbehind and groups. + self.assertEqual( + textlib.replaceExcept('A behindB C D', r'(?<=behind)\w( )', + r'\g<1>Z', [], site=self.site), + 'A behind ZC D') + # test regex with lookahead. + self.assertEqual( + textlib.replaceExcept('A Bahead C', r'\w(?=ahead)', + r'Z', [], site=self.site), + 'A Zahead C') + # test regex with lookahead and groups. + self.assertEqual( + textlib.replaceExcept('A Bahead C D', r'( )\w(?=ahead)', + r'Z\g<1>', [], site=self.site), + 'AZ ahead C D') def test_case_sensitive(self): """Test replacing with different case sensitivity.""" -- To view, visit https://gerrit.wikimedia.org/r/266600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c0dba18e8db1bf1556c94dfb17e9a3b7dc45801 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3217 (master - 58d30bc)
by Travis CI 30 Jan '16

30 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3217 Status: Errored Duration: 28 minutes and 40 seconds Commit: 58d30bc (master) Author: jenkins-bot Message: Merge "[IMPROV] use CurrentPageBot class, some other improvements" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/485a0afb2284...58d30bc7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/105862974 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3216 (master - 485a0af)
by Travis CI 30 Jan '16

30 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3216 Status: Errored Duration: 1 hour, 17 minutes, and 9 seconds Commit: 485a0af (master) Author: jenkins-bot Message: Merge "Providing README.rst in scripts and pywikibot." View the changeset: https://github.com/wikimedia/pywikibot-core/compare/60b3a7a45749...485a0afb… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/105862329 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3215 (master - 60b3a7a)
by Travis CI 30 Jan '16

30 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3215 Status: Errored Duration: 1 hour, 22 minutes, and 2 seconds Commit: 60b3a7a (master) Author: jenkins-bot Message: Merge "Add deprecation notice (if necessary) to docstring of @deprecated functions" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/38ac04438664...60b3a7a4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/105854045 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [IMPROV] use CurrentPageBot class, some other improvements - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jan '16

30 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] use CurrentPageBot class, some other improvements ...................................................................... [IMPROV] use CurrentPageBot class, some other improvements - check for L10N in constructor, quit if bot isn't localized - at exit time print a message if nothing is to do - remove obsolete -dry option - use site.logenvents instead of deprecated site.logpages - use generator property method to retrieving talk pages - remove unused load/save methods and use known instance methods instead - bugfix: use Bot.site property instead of unknown site() method Change-Id: Id729e5f756d214168f69038ab489fdaf450a0b0b --- M scripts/blockreview.py 1 file changed, 71 insertions(+), 104 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/blockreview.py b/scripts/blockreview.py index 37e315a..7c28d75 100755 --- a/scripts/blockreview.py +++ b/scripts/blockreview.py @@ -7,15 +7,10 @@ This script is run by [[de:User:xqt]]. It should not be run by other users without prior contact. - -The following parameters are supported: - -- - """ # -# (C) xqt, 2010-2014 -# (C) Pywikibot team, 2015 +# (C) xqt, 2010-2016 +# (C) Pywikibot team, 2016 # # Distributed under the terms of the MIT license. # @@ -27,12 +22,11 @@ import pywikibot from pywikibot import i18n +from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot import pagegenerators as pg -from pywikibot.tools.formatter import color_format - -class BlockreviewBot(object): +class BlockreviewBot(ExistingPageBot, SingleSiteBot): """Block review bot.""" @@ -82,23 +76,19 @@ 'pt': u'Wikipedia:Pedidos a administradores/Discussão de bloqueio', } - def __init__(self, dry=False): - """ - Constructor. + section_header = { + 'de': 'Sperrprüfung', + } - @param generator: The page generator that determines on which pages - to work on. - @param dry: If True, doesn't do any real changes, but only shows - what would have been changed. - """ - self.site = pywikibot.Site() - self.dry = dry + def __init__(self, **kwargs): + """Constructor.""" + super(BlockreviewBot, self).__init__(**kwargs) self.info = None self.parts = None - def run(self): - """Run the bot.""" - # TODO: change the generator for template to the included category + @property + def generator(self): + """Generator method.""" try: genPage = pywikibot.Page(self.site, self.unblock_tpl[self.site.code], @@ -106,39 +96,49 @@ except KeyError: pywikibot.error(u'Language "%s" not supported by this bot.' % self.site.code) - else: - for page in genPage.getReferences(follow_redirects=False, - withTemplateInclusion=True, - onlyTemplateInclusion=True): - if page.namespace() == 3: - self.treat(page) - else: - pywikibot.output(u'Ignoring %s, user namespace required' - % page.title(asLink=True)) + raise SystemExit + return genPage.getReferences(follow_redirects=False, + withTemplateInclusion=True, + onlyTemplateInclusion=True, + namespaces=3) - def treat(self, userPage): - """Load the given page, does some changes, and saves it.""" - talkText = self.load(userPage) + def exit(self): + """Finally print a comment.""" + if self._treat_counter == 0: + pywikibot.output('Nothing left to do.') + else: + super(BlockreviewBot, self).exit() + + def treat_page(self): + """Load the current page, do some changes, and save it.""" + talkText = self.current_page.text if not talkText: # sanity check. No talk page found. return unblock_tpl = self.unblock_tpl[self.site.code] project_name = self.project_name[self.site.code] - user = pywikibot.User(self.site, userPage.title(withNamespace=False)) + user = pywikibot.User(self.site, + self.current_page.title(withNamespace=False)) # saveAdmin = saveProject = False talkComment = None - for templates in userPage.templatesWithParams(): + for templates in self.current_page.templatesWithParams(): if templates[0].title() == unblock_tpl: - self.getInfo(user) + if not self.getInfo(user): + pywikibot.output('No block entry found. Skipping') + # TODO: Notify user or delete template + continue # Step 1 # a new template is set on blocked users talk page. # Notify the blocking admin if templates[1] == [] or templates[1][0] == u'1': if self.info['action'] == 'block' or user.isBlocked(): if self.site.sitename == 'wikipedia:de': - admin = pywikibot.User(self.site, self.info['user']) + admin = pywikibot.User(self.site, + user.getprops()['blockedby']) + assert admin == self.info.user(), ( + "Blocking admin doesn't match user property") adminPage = admin.getUserTalkPage() - adminText = adminPage.get() + adminText = adminPage.text note = i18n.translate(self.site.code, self.note_admin, self.parts) @@ -146,7 +146,9 @@ self.msg_admin, self.parts) adminText += note - self.save(adminText, adminPage, comment, False) + self.userPut(adminPage, adminPage.text, adminText, + summary=comment, minorEdit=False, + ignore_save_related_errors=True) # test for pt-wiki # just print all sysops talk pages elif self.site.sitename == 'wikipedia:pt': @@ -163,13 +165,14 @@ % self.parts) # some test stuff - if self.site().user() == u'Xqbot': + if self.site.user() == u'Xqbot': testPage = pywikibot.Page(self.site, 'Benutzer:Xqt/Test') test = testPage.get() test += note - self.save(test, testPage, - '[[WP:BA#SPP-Bot|SPPB-Test]]') + self.userPut(testPage, testPage.text, test, + summary='[[WP:BA#SPP-Bot|SPPB-Test]]', + ignore_save_related_errors=True) else: # nicht blockiert. Fall auf DS abschließen talkText = talkText.replace(u'{{%s}}' % unblock_tpl, @@ -194,7 +197,9 @@ self.msg_admin, self.parts) projText += note - self.save(projText, project, comment, botflag=False) + self.userPut(project, project.text, projText, + summary=comment, botflag=False, + ignore_save_related_errors=True) talkText = talkText.replace(u'{{%s|2}}' % unblock_tpl, u'{{%s|3}}' % unblock_tpl) talkComment = u'Bot: [[%s|Wikipedia:Sperrprüfung]] eingetragen' \ @@ -229,77 +234,39 @@ # at last if there is a talk comment, users talk page must be changed if talkComment: - self.save(talkText, userPage, talkComment) + self.put_current(talkText, summary=talkComment) def getInfo(self, user): - """Collect user info for i18n parameter dict.""" + """Get block info for a given user.""" if not self.info: - self.info = next(self.site.logpages( - 1, mode='block', title=user.getUserPage().title(), dump=True)) + assert isinstance(user, pywikibot.Page), ( + 'user actual parameter is not a Page object') + for logentry in self.site.logevents('block', page=user): + if logentry.action() in ('block', 'reblock'): + break + else: + return + self.info = logentry + assert logentry.page() == user, ( + "logentry.page() doesn't match given user") self.parts = { - 'admin': self.info['user'], - 'user': self.info['title'], + 'admin': logentry.user(), + 'user': logentry.page().title(), 'usertalk': user.getUserTalkPage().title(), - 'section': u'Sperrprüfung', - 'time': self.info['timestamp'], - 'duration': self.info['block']['duration'], - 'comment': self.info['comment'], + 'section': i18n.translate(self.site.code, + self.section_header), + 'time': str(logentry.timestamp()), + 'duration': logentry._params['duration'], + 'comment': logentry.comment(), } def SysopGenerator(self): - """Retrieve sysop talkpages.""" + """Iter all sysops of a site.""" for user in self.site.allusers(group='sysop'): # exclude sysop bots if 'bot' not in user['groups']: # yield the sysop talkpage - yield pywikibot.Page(self.site, user['name'], ns=3) - - def load(self, page): - """Load the given page and return the page text.""" - try: - # Load the page - text = page.get() - except pywikibot.NoPage: - pywikibot.output(u"Page %s does not exist; skipping." - % page.title(asLink=True)) - except pywikibot.IsRedirectPage: - pywikibot.output(u"Page %s is a redirect; skipping." - % page.title(asLink=True)) - else: - return text - - def save(self, text, page, comment, minorEdit=True, botflag=True): - """Save the text.""" - if text != page.text: - # Show the title of the page we're working on. - # Highlight the title in purple. - pywikibot.output(color_format( - '\n\n>>> {lightpurple}{0}{default} <<<', page.title())) - # show what was changed - pywikibot.showDiff(page.get(), text) - pywikibot.output(u'Comment: %s' % comment) - if not self.dry: - if pywikibot.input_yn( - u'Do you want to accept these changes?', - default=False, automatic_quit=False): - page.text = text - try: - # Save the page - page.save(summary=comment, minorEdit=minorEdit, - botflag=botflag) - except pywikibot.LockedPage: - pywikibot.output(u"Page %s is locked; skipping." - % page.title(asLink=True)) - except pywikibot.EditConflict: - pywikibot.output( - u'Skipping %s because of edit conflict' - % (page.title())) - except pywikibot.SpamfilterError as error: - pywikibot.output( - u'Cannot change %s because of spam blacklist entry ' - u'%s' % (page.title(), error.url)) - else: - return True + yield pywikibot.User(self.site, user['name']) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/216412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id729e5f756d214168f69038ab489fdaf450a0b0b Gerrit-PatchSet: 13 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Providing README.rst in scripts and pywikibot. - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jan '16

30 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Providing README.rst in scripts and pywikibot. ...................................................................... Providing README.rst in scripts and pywikibot. This includes description of existing libraries and scripts in core. Since many scripts which are part of compat and needs migration their details are also mentioned with #at their beginning. Besides, the README.rst in pywikibot-core is updated. Signed-off-by: xqt <info(a)gno.de> Bug:T66847 Change-Id: I3e1a36826167f92502451593565fa719af03ae5e --- M README.rst A pywikibot/README.rst A scripts/README.rst 3 files changed, 562 insertions(+), 2 deletions(-) Approvals: Ladsgroup: Looks good to me, approved Xqt: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/README.rst b/README.rst index 08a1991..65ed818 100644 --- a/README.rst +++ b/README.rst @@ -30,8 +30,8 @@ guide <https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Pywikibot/Installa…>`_ has more details for advanced usage. -Usage ------ +Basic Usage +----------- If you wish to write your own script it's very easy to get started: @@ -43,6 +43,54 @@ page.text = page.text.replace('foo', 'bar') page.save('Replacing "foo" with "bar"') # Saves the page +======= +For more documentation on pywikibot see our `docs <https://doc.wikimedia.org/pywikibot/>`_. + + +The contents of the package +---------------------------- + + +----------------------------------------------------------------------------------+ + | README and config files: | + +===========================+======================================================+ + | ChangeLog | Log file to keep track of major changes versionwise | + +---------------------------+------------------------------------------------------+ + | CREDITS | List of major contributors to this module | + +---------------------------+------------------------------------------------------+ + | ez_setup.py | Bootstrap distribute installation file, can also be | + | | run to install or upgrade setuptools. | + +---------------------------+------------------------------------------------------+ + | generate_family_file.py| Creates a new family file. | + +---------------------------+------------------------------------------------------+ + | generate_user_files.py | Creates user-config.py or user-fixes.py | + +---------------------------+------------------------------------------------------+ + | LICENSE | a reference to the MIT license | + +---------------------------+------------------------------------------------------+ + | pwb.py | Wrapper script to use Pywikibot in 'directory' mode | + +---------------------------+------------------------------------------------------+ + | README-conversion.txt | Guide to converting bot scripts from version 1 | + | | of the Pywikibot framework to version 2 | + +---------------------------+------------------------------------------------------+ + | README.rst | Short info string used by Pywikibot Nightlies | + +---------------------------+------------------------------------------------------+ + | requirements.txt | PIP requirements file | + +---------------------------+------------------------------------------------------+ + | setup.py | Installer script for Pywikibot 2.0 framework | + +---------------------------+------------------------------------------------------+ + | user-config.py.sample | Example user-config.py file for reference | + +---------------------------+------------------------------------------------------+ + + +----------------------------------------------------------------------------------+ + | Directories | + +===========================+======================================================+ + | pywikibot | Contains some libraries and control files | + +---------------------------+------------------------------------------------------+ + | scripts | Contains all bots and utility scripts | + +---------------------------+------------------------------------------------------+ + | tests | Some test stuff for the developing team | + +---------------------------+------------------------------------------------------+ + + Required external programms --------------------------- diff --git a/pywikibot/README.rst b/pywikibot/README.rst new file mode 100644 index 0000000..1397683 --- /dev/null +++ b/pywikibot/README.rst @@ -0,0 +1,224 @@ +========================================================================= +**This is a package to build robots for MediaWiki wikis like Wikipedia.** +========================================================================= + + +Please do not play with this package. +------------------------------------- +These programs can actually modify the live wiki on the net, and proper +wiki-etiquette should be followed before running it on any wiki. + +To get started on proper usage of the bot framework, please refer to: + + `Manual:Pywikibot <http://www.mediawiki.org/wiki/Manual:Pywikibot>`_ + +The contents of the package +--------------------------- + + +----------------------------------------------------------------------------------+ + | Library routines | + +===========================+======================================================+ + | __init__.py | Initialization of the pywikibot framework, | + | | basic classes and methods | + +---------------------------+------------------------------------------------------+ + | _wbtypes.py | Wikibase data type classes | + +---------------------------+------------------------------------------------------+ + | backports.py | Module contains backports to support older Python | + | | versions | + +---------------------------+------------------------------------------------------+ + | bot.py | User-interface related functions for building bots | + +---------------------------+------------------------------------------------------+ + | bot_choice.py | Classes for input_choice | + +---------------------------+------------------------------------------------------+ + | botirc.py | User-interface related functions for building irc bot| + +---------------------------+------------------------------------------------------+ + | config2.py | Module to define and load pywikibot configuration | + +---------------------------+------------------------------------------------------+ + | cosmetic_changes.py | Slight modifications to a wiki page's source code | + +---------------------------+------------------------------------------------------+ + | daemonize.py | Daemonize the current process on Unix | + +---------------------------+------------------------------------------------------+ + | date.py | Date formats in various languages | + +---------------------------+------------------------------------------------------+ + | diff.py | Diff module | + +---------------------------+------------------------------------------------------+ + | echo.py | Classes and functions for working with the Echo | + | | extension | + +---------------------------+------------------------------------------------------+ + | editor.py | Text editor class for your favourite editor | + +---------------------------+------------------------------------------------------+ + | epydoc.cfg | The list of objects to document | + +---------------------------+------------------------------------------------------+ + | exceptions.py | Exception classes used throughout the framework | + +---------------------------+------------------------------------------------------+ + | family.py | Abstract superclass for wiki families. Subclassed by | + | | the classes in the 'families' subdirectory. | + +---------------------------+------------------------------------------------------+ + | fixes.py | File containing all standard fixes, stores predefined| + | | replacements used by replace.py. | + +---------------------------+------------------------------------------------------+ + | flow.py | Objects representing Flow entities | + +---------------------------+------------------------------------------------------+ + | i18n.py | Helper functions for both the internal translation | + | | system and for TranslateWiki-based translations | + +---------------------------+------------------------------------------------------+ + | interwiki_graph.py | Possible create graph with interwiki.py. | + +---------------------------+------------------------------------------------------+ + | logentries.py | Objects representing Mediawiki log entries | + +---------------------------+------------------------------------------------------+ + | login.py | Log in to an account on your "home" wiki. or check | + | | login status | + +---------------------------+------------------------------------------------------+ + | page.py | Allows access to the site's bot user list. | + +---------------------------+------------------------------------------------------+ + | pagegenerators.py | Generator pages. | + +---------------------------+------------------------------------------------------+ + | plural.py | Module containing plural rules of various languages | + +---------------------------+------------------------------------------------------+ + | proofreadpage.py | Objects representing objects used with ProofreadPage | + | | Extension | + +---------------------------+------------------------------------------------------+ + | site.py | Objects representing MediaWiki sites (wikis) | + +---------------------------+------------------------------------------------------+ + | site_detect.py | Classes for detecting a MediaWiki site | + +---------------------------+------------------------------------------------------+ + | textlib.py | Functions for manipulating wiki-text | + +---------------------------+------------------------------------------------------+ + | throttle.py | Mechanics to slow down wiki read and/or write rate | + +---------------------------+------------------------------------------------------+ + | titletranslate.py | Rules and tricks to auto-translate wikipage titles | + | | articles. | + +---------------------------+------------------------------------------------------+ + | version.py | Module to determine the pywikibot version (tag, | + | | revision and date) | + +---------------------------+------------------------------------------------------+ + | weblib.py | Functions for manipulating external links or querying| + | | third-party sites | + +---------------------------+------------------------------------------------------+ + | xmlreader.py | Reading and parsing XML dump files. | + +---------------------------+------------------------------------------------------+ + + + +---------------------------+------------------------------------------------------+ + | comms | Communication layer. | + +===========================+======================================================+ + | http.py | Basic HTTP access interface | + +---------------------------+------------------------------------------------------+ + | rcstream.py | SocketIO-based rcstream client | + +---------------------------+------------------------------------------------------+ + | threadedhttp.py | Httplib2 threaded cookie layer extending httplib2 | + +---------------------------+------------------------------------------------------+ + + + +---------------------------+------------------------------------------------------+ + | compat | Package to provide compatibility with compat scripts.| + | | (should never be used) | + +===========================+======================================================+ + | catlib.py | Library routines written especially to handle | + | | category pages and recurse over category contents. | + +---------------------------+------------------------------------------------------+ + | query.py | API query library | + +---------------------------+------------------------------------------------------+ + | userlib.py | Library to work with users, their pages and talk page| + +---------------------------+------------------------------------------------------+ + + + +---------------------------+-------------------------------------------------------+ + | data | Module providing several layers of data access to wiki| + +===========================+=======================================================+ + | api.py | Interface to Mediawiki's api.php | + +---------------------------+-------------------------------------------------------+ + | wikidataquery.py | Objects representing WikidataQuery query syntax | + | | and API | + +---------------------------+-------------------------------------------------------+ + | wikistats.py | Objects representing WikiStats API | + +---------------------------+-------------------------------------------------------+ + + + +---------------+------------------------------------------------------------------+ + | tools | Miscellaneous helper functions (not wiki-dependent). | + +===============+==================================================================+ + | __init__.py | several classes and methods | + +---------------+------------------------------------------------------------------+ + | _logging.py | Logging tools | + +---------------+------------------------------------------------------------------+ + | chars.py | Character based helper functions(not wiki-dependent) | + +---------------+------------------------------------------------------------------+ + | djvu.py | Wrapper around djvulibre to access djvu properties and content | + +---------------+------------------------------------------------------------------+ + | formatter.py | Various formatting related utilities | + +---------------+------------------------------------------------------------------+ + | ip.py | IP address tools module | + +---------------+------------------------------------------------------------------+ + + + +-----------------------------------------------------------------------------------+ + | User Interface | + +============================+======================================================+ + | cgi_interface.py | CGI user interface | + +----------------------------+------------------------------------------------------+ + | gui.py | GUI with a unicode textfield where the user can edit | + +----------------------------+------------------------------------------------------+ + | terminal_interface.py | Platform independent terminal interface module | + +----------------------------+------------------------------------------------------+ + | terminal_interface_base.py | Base for terminal user interfaces | + +----------------------------+------------------------------------------------------+ + | terminal_interface_unix.py | User interface for unix terminals | + +----------------------------+------------------------------------------------------+ + | terminal_interface_win32.py| User interface for Win32 terminals | + +----------------------------+------------------------------------------------------+ + | transliteration.py | Module to transliterate text | + +----------------------------+------------------------------------------------------+ + | win32_unicode.py | Stdout, stderr and argv support for unicode | + +----------------------------+------------------------------------------------------+ + + + +-----------------------------------------------------------------------------------+ + | Others | + +============================+======================================================+ + | families (folder) | Contains wiki-specific information like URLs, | + | | languages, encodings etc. | + +----------------------------+------------------------------------------------------+ + | README.rst | This file ( Short info on all modules ) | + +----------------------------+------------------------------------------------------+ + +**External software can be used with Pywikibot:** + * Pydot, Pyparsing and Graphviz for use with interwiki_graph.py + * JSON for use with site.py, bot.py + * MySQLdb to access MySQL database for use with pagegenerators.py + * PyGoogle to access Google Web API and PySearch to access Yahoo! Search + Web Services for use with pagegenerators.py + + +Pywikibot makes use of some modules that are part of python, but that +are not installed by default on some Linux distributions: + + * python-xml (required to parse XML via SaX2) + * python-celementtree (recommended if you use XML dumps) + * python-tkinter (optional, used by some experimental GUI stuff) + + +You need to have at least python version `2.6.5 <http://www.python.org/download/>`_ +or newer installed on your computer to be able to run any of the code in this +package, but not 3.0-3.2. It works fine with 3.3-3.4 versions of python installed. +Support for older versions of python is not planned. Some scripts could run with +older python releases. Please refer the manual at mediawiki for further details +and restrictions. + + +You do not need to "install" this package to be able to make use of +it. You can actually just run it from the directory where you unpacked +it or where you have your copy of the SVN or git sources. + + +The first time you run a script, the package creates a file named user-config.py +in your current directory. It asks for the family and language code you are +working on and at least for the bot's user name; this will be used to identify +you when the robot is making changes, in case you are not logged in. You may +choose to create a small or extended version of the config file with further +informations. Other variables that can be set in the configuration file, please +check config.py for ideas. + + +After that, you are advised to create a username + password for the bot, and +run login.py. Anonymous editing is not possible. diff --git a/scripts/README.rst b/scripts/README.rst new file mode 100644 index 0000000..8f9153b --- /dev/null +++ b/scripts/README.rst @@ -0,0 +1,288 @@ +=========================================================================== +**This is a package to include robots for MediaWiki wikis like Wikipedia.** +=========================================================================== + +Some example robots are included. +--------------------------------- + +These programs can actually modify the live wiki on the net, and proper +wiki-etiquette should be followed before running it on any wiki. + +To get started on proper usage of the bot framework, please refer to: + + `Manual:Pywikibot <http://www.mediawiki.org/wiki/Manual:Pywikibot>`_ + +NOTE : Script names with # at start are not yet present in Core rather are + expected to be merged based on reviews and need from Compat version. + +The contents of the package +--------------------------- + + +----------------------------------------------------------------------------------+ + | Bots and Scripts | + +========================+=========================================================+ + | add_text.py | Adds text at the top or end of pages. | + +------------------------+---------------------------------------------------------+ + | basic.py | Is a template from which simple bots can be made. | + +------------------------+---------------------------------------------------------+ + | blockpagechecker.py | Deletes any protection templates that are on pages | + | | which aren't actually protected. | + +------------------------+---------------------------------------------------------+ + | blockreview.py | Bot implements blocking review process for de-wiki first| + +------------------------+---------------------------------------------------------+ + | capitalize_redirects.py| Script to create a redirect of capitalize articles. | + +------------------------+---------------------------------------------------------+ + | casechecker.py | Script to enumerate all pages in the wikipedia and | + | | find all titles with mixed Latin and Cyrillic | + | | alphabets. | + +------------------------+---------------------------------------------------------+ + | catall.py | Add or change categories on a number of pages. | + +------------------------+---------------------------------------------------------+ + | category.py | Add a category link to all pages mentioned on a page, | + | | change or remove category tags | + +------------------------+---------------------------------------------------------+ + | category_redirect.py | Maintain category redirects and replace links to | + | | redirected categories. | + +------------------------+---------------------------------------------------------+ + | #censure.py | Bad word checker bot. | + +------------------------+---------------------------------------------------------+ + | cfd.py | Processes the categories for discussion working page. | + | | It parses out the actions that need to be taken as a | + | | result of CFD discussions and performs them. | + +------------------------+---------------------------------------------------------+ + | checkimages.py | Check recently uploaded files. Checks if a file | + | | description is present and if there are other problems | + | | in the image's description. | + +------------------------+---------------------------------------------------------+ + | claimit.py | Adds claims to Wikidata items based on categories | + +------------------------+---------------------------------------------------------+ + | clean_sandbox.py | This bot makes the cleaned of the page of tests. | + +------------------------+---------------------------------------------------------+ + | commons_link.py | This robot include commons template to linking Commons | + | | and your wiki project. | + +------------------------+---------------------------------------------------------+ + | commonscat.py | Adds {{commonscat}} to Wikipedia categories (or | + | | articles), if other language wikipedia already has such | + | | a template | + +------------------------+---------------------------------------------------------+ + | #copyright.py | This robot check copyright text in Google, Yahoo! and | + | | Live Search. | + +------------------------+---------------------------------------------------------+ + | #copyright_clean.py | Remove reports of copyright.py on wiki pages. | + | | Uses YurikAPI. | + +------------------------+---------------------------------------------------------+ + | #copyright_put.py | Put reports of copyright.py on wiki pages. | + +------------------------+---------------------------------------------------------+ + | coordinate_import.py | Coordinate importing script. | + +------------------------+---------------------------------------------------------+ + | cosmetic_changes.py | Can do slight modifications to a wiki page source code | + | | such that the code looks cleaner. | + +------------------------+---------------------------------------------------------+ + | create_categories.py | Program to batch create categories. | + +------------------------+---------------------------------------------------------+ + | data_ingestion.py | A generic bot to do batch uploading to Commons. | + +------------------------+---------------------------------------------------------+ + | delete.py | This script can be used to delete pages en masse. | + +------------------------+---------------------------------------------------------+ + | disambredir.py | Changing redirect names in disambiguation pages. | + +------------------------+---------------------------------------------------------+ + | djvutext.py | Extracts OCR text from djvu files and uploads onto | + | | pages in the "Page" namespace on Wikisource. | + +------------------------+---------------------------------------------------------+ + | editarticle.py | Edit a Wikipedia article with your favourite editor | + +------------------------+---------------------------------------------------------+ + | featured.py | A robot to check feature articles. | + +------------------------+---------------------------------------------------------+ + | fixing_redirects.py | Correct all redirect links of processed pages. | + +------------------------+---------------------------------------------------------+ + | flickrripper.py | Upload images from Flickr easily. | + +------------------------+---------------------------------------------------------+ + | #followlive.py | follow new articles on a wikipedia and flag them | + | | with a template. | + +------------------------++--------------------------------------------------------+ + | freebasemappingupload.py| Docstring fixes in scripts | + +------------------------++--------------------------------------------------------+ + | harvest_template.py | [IMPROV] Reduce maximum line length to 130 | + +------------------------+---------------------------------------------------------+ + | illustrate_wikidata.py | Dont use 'gen' to refer to the generator factory | + +------------------------+---------------------------------------------------------+ + | image.py | This script can be used to change one image to another | + | | or remove an image entirely. | + +------------------------+---------------------------------------------------------+ + | imagecopy.py | Copies images from a wikimedia wiki to Commons | + +------------------------+---------------------------------------------------------+ + | imagecopy_self.py | Copy self published files from the English Wikipedia to | + | | Commons. | + +------------------------+---------------------------------------------------------+ + | imageharvest.py | Bot for getting multiple images from an external site. | + +------------------------+---------------------------------------------------------+ + | iamgerecat.py | Try to find categories for media on Commons. | + +------------------------+---------------------------------------------------------+ + | imagetransfer.py | Given a wiki page, check the interwiki links for | + | | images, and let the user choose among them for | + | | images to upload. | + +------------------------+---------------------------------------------------------+ + | imageuncat.py | Adds uncat template to images without categories at | + | | Commons | + +------------------------+---------------------------------------------------------+ + | #inline_images.py | This bot looks for images that are linked inline | + | | (i.e., they are hosted from an external server and | + | | hotlinked). | + +------------------------+---------------------------------------------------------+ + | interwiki.py | A robot to check interwiki links on all pages (or | + | | a range of pages) of a wiki. | + +------------------------+---------------------------------------------------------+ + | isbn.py | Bot to convert all ISBN-10 codes to the ISBN-13 | + | | format. | + +------------------------+---------------------------------------------------------+ + | listpages.py | listpages: report number of pages found | + +------------------------+---------------------------------------------------------+ + | login.py | [IMPROV] Reduce maximum line length to 130 | + +------------------------+---------------------------------------------------------+ + | lonelypages.py | Place a template on pages which are not linked to by | + | | other pages, and are therefore lonely | + +------------------------+---------------------------------------------------------+ + | makecat.py | Given an existing or new category, find pages for that | + | | category. | + +------------------------+---------------------------------------------------------+ + | match_images.py | Match two images based on histograms. | + +------------------------+---------------------------------------------------------+ + | misspelling.py | Similar to solve_disambiguation.py. It is supposed to | + | | fix links that contain common spelling mistakes. | + +------------------------+---------------------------------------------------------+ + | movepages.py | Bot page moves to another title. | + +------------------------+---------------------------------------------------------+ + | #ndashredir.py | Creates hyphenated redirects to articles with n dash | + | | or m dash in their title. | + +------------------------+---------------------------------------------------------+ + | newitem.py | Script creates new items on Wikidata based on criteria. | + +------------------------+---------------------------------------------------------+ + | noreferences.py | Searches for pages where <references /> is missing | + | | although a <ref> tag is present, and in that case adds | + | | a new references section. | + +------------------------+---------------------------------------------------------+ + | nowcommons.py | This bot can delete images with NowCommons template. | + +------------------------+---------------------------------------------------------+ + | pagefromfile.py | This bot takes its input from a file that contains a | + | | number of pages to be put on the wiki. | + +------------------------+---------------------------------------------------------+ + | #pageimport.py | Import pages from a certain wiki to another. | + +------------------------+---------------------------------------------------------+ + | panoramiopicker.py | Upload images from Panoramio easily. | + +------------------------+---------------------------------------------------------+ + | patrol.py | Obtains a list pages and marks the edits as patrolled | + | | based on a whitelist. | + +------------------------+---------------------------------------------------------+ + | piper.py | Pipes article text through external program(s) on | + | | STDIN and collects its STDOUT which is used as the | + | | new article text if it differs from the original. | + +------------------------+---------------------------------------------------------+ + | protect.py | Protect and unprotect pages en masse. | + +------------------------+---------------------------------------------------------+ + | redirect.py | Fix double redirects and broken redirects. Note: | + | | solve_disambiguation also has functions which treat | + | | redirects. | + +------------------------+---------------------------------------------------------+ + | reflinks.py | Search for references which are only made of a link | + | | without title and fetch the html title from the link to | + | | use it as the title of the wiki link in the reference. | + +------------------------+---------------------------------------------------------+ + | replace.py | Search articles for a text and replace it by another | + | | text. Both text are set in two configurable | + | | text files. The bot can either work on a set of given | + | | pages or crawl an SQL dump. | + +------------------------+---------------------------------------------------------+ + | replicate_wiki.py | Replicates pages in wiki to a second wiki within family| + +------------------------+---------------------------------------------------------+ + | revertbot.py | Revert edits. | + +------------------------+---------------------------------------------------------+ + | script_wui.py | Fix anomalous escape (\) | + +------------------------+---------------------------------------------------------+ + | selflink.py | This bot goes over multiple pages of the home wiki, | + | | searches for selflinks, and allows removing them. | + +------------------------+---------------------------------------------------------+ + | shell.py | Spawns an interactive Python shell | + +------------------------+---------------------------------------------------------+ + | solve_disambiguation.py| Interactive robot doing disambiguation. | + +------------------------+---------------------------------------------------------+ + | spamremove.py | Remove links that are being or have been spammed. | + +------------------------+--+------------------------------------------------------+ + | standardize_interwiki.py | A robot that downloads a page, and reformats the | + | | interwiki links in a standard way (i.e. move all | + | | of them to the bottom or the top, with the same | + | | separator, in the right order). | + +------------------------+--+------------------------------------------------------+ + | states-redirect.py | A robot to add redirects to cities for state | + | | abbreviations. | + +------------------------+---------------------------------------------------------+ + | #speedy_delete.py | This bot load a list of pages from the category of | + | | candidates for speedy deletion and give the | + | | user an interactive prompt to decide whether | + | | each should be deleted or not. | + +------------------------+---------------------------------------------------------+ + | #spellcheck.py | This bot spellchecks wiki pages. | + +------------------------+---+-----------------------------------------------------+ + | #standardize_notes.py | Converts external links and notes/references to | + | | : Footnote3 ref/note format. Rewrites References. | + +----------------------------+-----------------------------------------------------+ + | #statistics_in_wikitable.py| This bot renders statistics provided by | + | | [[Special:Statistics]] in a table on a wiki page. | + | | Thus it creates and updates a statistics wikitable. | + +----------------------------+-----------------------------------------------------+ + | #table2wiki.py | Semi-automatic converting HTML-tables to wiki-tables| + +------------------------+---+-----------------------------------------------------+ + | template.py | change one template (that is {{...}}) into another. | + +------------------------+---------------------------------------------------------+ + | templatecount.py | Display the list of pages transcluding a given list | + | | of templates. | + +------------------------+---------------------------------------------------------+ + | touch.py | Bot goes over all pages of the home wiki, and edits | + | | them without changing. | + +------------------------+---------------------------------------------------------+ + | transferbot.py | Transfers pages from a source wiki to a target wiki | + +------------------------+---------------------------------------------------------+ + | unlink.py | This bot unlinks a page on every page that links to it. | + +------------------------+---------------------------------------------------------+ + | unusedfiles.py | Bot appends some text to all unused images and other | + | | text to the respective uploaders. | + +------------------------+---------------------------------------------------------+ + | upload.py | upload an image to a wiki. | + +------------------------+---------------------------------------------------------+ + | version.py | Outputs Pywikibot's revision number, Python's version | + | | and OS used. | + +------------------------+---------------------------------------------------------+ + | watchlists.py | Information retrieved by watchlist.py will be stored | + +------------------------+---------------------------------------------------------+ + | weblinkchecker.py | Check if external links are still working. | + +------------------------+---------------------------------------------------------+ + | welcome.py | Script to welcome new users. | + +------------------------+---------------------------------------------------------+ + + + +-----------------------------------------------------------------------------------+ + | archive | Scripts no longer maintained. | + +========================+==========================================================+ + | archivebot.py | Archives discussion threads. | + +------------------------+----------------------------------------------------------+ + + + +-----------------------------------------------------------------------------------+ + | Others | + +========================+==========================================================+ + | i18n (folder) | Contains i18n translations for bot edit summaries. | + +------------------------+----------------------------------------------------------+ + | maintenance (folder) | Contains maintenance scripts for the developing team. | + +------------------------+----------------------------------------------------------+ + | README.rst | This file (Short info of all scripts). | + +------------------------+----------------------------------------------------------+ + +**External software can be used with Pywikibot:** + * PyGoogle to access Google Web API and PySearch to access Yahoo! Search + Web Services for use with copyright.py. + + +More precise information, and a list of the options that are available for +the various programs, can be retrieved by running the bot with the -help +parameter, e.g. + + python pwb.py interwiki.py -help -- To view, visit https://gerrit.wikimedia.org/r/202016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e1a36826167f92502451593565fa719af03ae5e Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Prianka <priyankajayaswal025(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Prianka <priyankajayaswal025(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3214 (master - 38ac044)
by Travis CI 30 Jan '16

30 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3214 Status: Errored Duration: 1 hour, 13 minutes, and 20 seconds Commit: 38ac044 (master) Author: amir Message: Archive features.py Also building an archive system Bug: T109210 Change-Id: I3143241f64e36762f4065f4eeef6f5460c114090 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/5bf5610219aa...38ac0443… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/105852654 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Add deprecation notice (if necessary) to docstring of @depre... - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jan '16

30 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Add deprecation notice (if necessary) to docstring of @deprecated functions ...................................................................... Add deprecation notice (if necessary) to docstring of @deprecated functions If a deprecation notice is not already present in the summary section of the docstring of a deprecated function, a notice is added to the top of the docstring. Unit tests also added for docstring modification. Bug: T121366 Change-Id: I56cbc07b900c1f8c45ef273dc47707cb77bec8e2 --- M pywikibot/tools/__init__.py M tests/deprecation_tests.py 2 files changed, 84 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 6aee965..aa1ea4a 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1235,11 +1235,41 @@ issue_deprecation_warning(name, instead, depth) return obj(*args, **kwargs) + def add_docstring(wrapper): + """Add a Deprecated notice to the docstring.""" + deprecation_notice = 'Deprecated' + if instead: + deprecation_notice += '; use ' + instead + ' instead' + deprecation_notice += '.\n\n' + if wrapper.__doc__: # Append old docstring after the notice + wrapper.__doc__ = deprecation_notice + wrapper.__doc__ + else: + wrapper.__doc__ = deprecation_notice + if not __debug__: return obj manage_wrapping(wrapper, obj) + # Regular expression to find existing deprecation notices + deprecated_notice = re.compile(r'(^|\s)DEPRECATED[.:;,]', + re.IGNORECASE) + + # Add the deprecation notice to the docstring if not present + if not wrapper.__doc__: + add_docstring(wrapper) + else: + if not deprecated_notice.search(wrapper.__doc__): + add_docstring(wrapper) + else: + # Get docstring up to @params so deprecation notices for + # parameters don't disrupt it + trim_params = re.compile(r'^.*?((?=@param)|$)', re.DOTALL) + trimmed_doc = trim_params.match(wrapper.__doc__).group(0) + + if not deprecated_notice.search(trimmed_doc): # No notice + add_docstring(wrapper) + return wrapper without_parameters = len(args) == 1 and len(kwargs) == 0 and callable(args[0]) diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 97a58b5..cd25d38 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -82,15 +82,33 @@ return foo +@deprecated() +def deprecated_func_docstring(foo=None): + """DEPRECATED. Deprecated function.""" + return foo + + @deprecated def deprecated_func2(foo=None): """Deprecated function.""" return foo +@deprecated +def deprecated_func2_docstring(foo=None): + """DEPRECATED, don't use this. Deprecated function.""" + return foo + + @deprecated(instead='baz') def deprecated_func_instead(foo=None): """Deprecated function.""" + return foo + + +@deprecated(instead='baz') +def deprecated_func_instead_docstring(foo=None): + """DEPRECATED, don't use this. Deprecated function.""" return foo @@ -103,6 +121,22 @@ @deprecate_arg('bah', 'foo') def deprecated_func_arg(foo=None): """Deprecated arg 'bah'.""" + return foo + + +@deprecated +def deprecated_func_docstring_arg(foo=None): + """@param foo: Foo. DEPRECATED.""" + return foo + + +@deprecated +def deprecated_func_docstring_arg2(foo=None): + """ + DEPRECATED. + + @param foo: Foo. DEPRECATED. + """ return foo @@ -255,6 +289,26 @@ self.assertOneDeprecationParts(__name__ + '.deprecated_func_instead', 'baz') + def test_deprecated_function_docstring(self): + """Test @deprecated docstring modification.""" + testcases = [ + (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 function.'), + (deprecated_func_instead, 'Deprecated; use baz instead.\n\n' + 'Deprecated function.'), + (deprecated_func_instead_docstring, 'DEPRECATED, don\'t use ' + 'this. Deprecated function.'), + (deprecated_func_docstring_arg, 'Deprecated.\n\n' + '@param foo: Foo. DEPRECATED.'), + (deprecated_func_docstring_arg2, '\n DEPRECATED.\n\n' + ' @param foo: Foo. DEPRECATED.\n '), + ] + for rv, doc in testcases: + self.assertEqual(rv.__doc__, doc) + def test_deprecated_function_bad_args(self): rv = deprecated_func_bad_args(None) self.assertEqual(rv, None) -- To view, visit https://gerrit.wikimedia.org/r/265899 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56cbc07b900c1f8c45ef273dc47707cb77bec8e2 Gerrit-PatchSet: 12 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Sn1per <geofbot(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Archive features.py - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jan '16

30 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Archive features.py ...................................................................... Archive features.py Also building an archive system Bug: T109210 Change-Id: I3143241f64e36762f4065f4eeef6f5460c114090 --- M pwb.py A scripts/archive/README A scripts/archive/__init__.py R scripts/archive/featured.py M tests/script_tests.py M tox.ini 6 files changed, 22 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 834620b..a630c5f 100755 --- a/pwb.py +++ b/pwb.py @@ -209,6 +209,11 @@ 'scripts', filename) file_package = 'scripts' + if not os.path.exists(testpath): + testpath = os.path.join( + os.path.split(__file__)[0], 'scripts/archive', filename) + file_package = 'scripts.archive' + if os.path.exists(testpath): filename = testpath else: diff --git a/scripts/archive/README b/scripts/archive/README new file mode 100644 index 0000000..92d5958 --- /dev/null +++ b/scripts/archive/README @@ -0,0 +1 @@ +This folder consists scripts that will not maintened but we keep them for historical reasons. diff --git a/scripts/archive/__init__.py b/scripts/archive/__init__.py new file mode 100644 index 0000000..335234f --- /dev/null +++ b/scripts/archive/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +"""THIS DIRECTORY IS TO HOLD BOT SCRIPTS THAT NO LONGER IS MAINTENANCED.""" diff --git a/scripts/featured.py b/scripts/archive/featured.py similarity index 100% rename from scripts/featured.py rename to scripts/archive/featured.py diff --git a/tests/script_tests.py b/tests/script_tests.py index 68d394d..5f9fb85 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -23,6 +23,8 @@ scripts_path = join_root_path('scripts') +archive_path = join_root_path('scripts', 'archive') + if PY2: TK_IMPORT = 'Tkinter' else: @@ -77,13 +79,18 @@ 'script_wui', # depends on lua compiling ] + +def list_scripts(path, exclude=None): + """Return list of scripts in given path.""" + scripts = [name[0:-3] for name in os.listdir(path) # strip '.py' + if name.endswith('.py') and + not name.startswith('_') and # skip __init__.py and _* + name != exclude] + return scripts + script_list = (['login'] + - [name[0:-3] for name in os.listdir(scripts_path) # strip '.py' - if name.endswith('.py') and - not name.startswith('_') and # skip __init__.py and _* - name != 'login.py' # this is moved to be first - ] - ) + list_scripts(scripts_path, 'login.py') + + list_scripts(archive_path)) runnable_script_list = (['login'] + sorted(set(script_list) - @@ -115,7 +122,6 @@ 'checkimages', 'clean_sandbox', 'disambredir', - 'featured', 'imagerecat', 'login', 'lonelypages', diff --git a/tox.ini b/tox.ini index df4f55e..5437e66 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ tests/pwb/ : +T001 scripts/casechecker.py,scripts/imagetransfer.py : +T001 scripts/maintenance/make_i18n_dict.py : +T001 - scripts/archivebot.py,scripts/casechecker.py,scripts/commons_link.py,scripts/cfd.py,scripts/featured.py,scripts/imagecopy.py,scripts/imagecopy_self.py,scripts/interwiki.py,scripts/replicate_wiki.py,scripts/solve_disambiguation.py,scripts/maintenance/compat2core.py : +D102, D103 + scripts/archivebot.py,scripts/casechecker.py,scripts/commons_link.py,scripts/cfd.py,scripts/imagecopy.py,scripts/imagecopy_self.py,scripts/interwiki.py,scripts/replicate_wiki.py,scripts/solve_disambiguation.py,scripts/maintenance/compat2core.py,scripts/archive/ : +D102, D103 scripts/checkimages.py,scripts/freebasemappingupload.py,scripts/imagetransfer.py,scripts/lonelypages.py,scripts/movepages.py,scripts/nowcommons.py,scripts/redirect.py,scripts/isbn.py,scripts/reflinks.py,scripts/script_wui.py,scripts/revertbot.py,scripts/weblinkchecker.py,scripts/welcome.py : +D102 scripts/catall.py,scripts/imageharvest.py,scripts/makecat.py,scripts/maintenance/cache.py,scripts/maintenance/wikimedia_sites.py : +D103 scripts/interwiki.py,/""/ : +P102 -- To view, visit https://gerrit.wikimedia.org/r/267410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3143241f64e36762f4065f4eeef6f5460c114090 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2016