Pywikibot-commits December 2014

pywikibot-commits@lists.wikimedia.org

2 participants
317 discussions

[Gerrit] use ValueError when hardcoded config is insecure - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Dec '14

21 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: use ValueError when hardcoded config is insecure ...................................................................... use ValueError when hardcoded config is insecure The library exception UserActionRefuse is used by the library for action against a target user that are not possible, such as when attempting to send an email to a user that has email disabled. The script_wui constructor is using UserActionRefuse when its hardcoded config values include a page title which does not end in .js or .css, which is one way to have a semi-protected wiki page. The compat version subster.py does not use this exception. As this exception is raised only when there is a problem with the hard-coded config value defined in the same module, and backwards compatibility would require complicating the library exceptions for the benefit of only one script which is not in widespread use, and any working script which monkey-patches script_wui.bot_config needs must already have a valid config in order to bypass this exception and it extremely unlikely that any working script will be handling this exception appropriately, the exception raised is simply changed to ValueError. Change-Id: Ic3674c3a82484f7d263bae337db9ed6948c8d228 --- M scripts/script_wui.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 65d7148..12dea61 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -147,7 +147,11 @@ for item in self.refs: # security; first check if page is protected, reject any data if not if os.path.splitext(self.refs[item].title().lower())[1] not in ['.css', '.js']: - raise pywikibot.UserActionRefuse(u'Page %s is not secure, e.g. semi-protected!' % self.refs[item]) + raise ValueError(u'%s config %s = %s is not a secure page; ' + u'it should be a css or js userpage which are ' + u'automatically semi-protected.' + % (self.__class__.__name__, item, + self.refs[item])) self.refs[item].get(force=True) # load all page contents # init background timer -- To view, visit https://gerrit.wikimedia.org/r/180705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3674c3a82484f7d263bae337db9ed6948c8d228 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#1836 (master - 8cc0f76)
by Travis CI 20 Dec '14

20 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1836 Status: Fixed Duration: 21 minutes and 26 seconds Commit: 8cc0f76 (master) Author: gladoscc Message: [FIX] TokenWallet: Assert a username Follow up to Iccce554b5c9e83a42ae87c0bd69e38f880e3f6ac Fixes another place where assert would fail if the sysop username is different to the normal username. Bug: T74238 Change-Id: I7c438e16d40ff7128980fd2eecf1575eeac40114 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/bf42d7a01548...8cc0f76b… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/44712102 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FIX] TokenWallet: Assert a username - change (pywikibot/core)
by jenkins-bot (Code Review) 20 Dec '14

20 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] TokenWallet: Assert a username ...................................................................... [FIX] TokenWallet: Assert a username Follow up to Iccce554b5c9e83a42ae87c0bd69e38f880e3f6ac Fixes another place where assert would fail if the sysop username is different to the normal username. Bug: T74238 Change-Id: I7c438e16d40ff7128980fd2eecf1575eeac40114 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 48aafc8..6fa32a7 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1331,7 +1331,7 @@ in one request. @type all: bool """ - assert(self.site.logged_in()) + assert(self.site.user()) self._tokens.setdefault(self.site.user(), {}).update( self.site.get_tokens(types, all=all)) -- To view, visit https://gerrit.wikimedia.org/r/181353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c438e16d40ff7128980fd2eecf1575eeac40114 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Unicodesnowman <admin(a)glados.cc> 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: jenkins-bot <>

1 0

Broken: wikimedia/pywikibot-core#1835 (master - bf42d7a)
by Travis CI 20 Dec '14

20 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1835 Status: Broken Duration: 40 minutes and 36 seconds Commit: bf42d7a (master) Author: jenkins-bot Message: Merge "[IMPROV] Add additional documentation" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/29ae32b28e80...bf42d7a0… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/44705681 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Passed: wikimedia/pywikibot-core#1834 (master - 29ae32b)
by Travis CI 20 Dec '14

20 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1834 Status: Passed Duration: 41 minutes and 33 seconds Commit: 29ae32b (master) Author: jenkins-bot Message: Merge "Reimplement Site.undelete and Page.undelete" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ceac37a80906...29ae32b2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/44703286 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [IMPROV] Add additional documentation - change (pywikibot/core)
by jenkins-bot (Code Review) 20 Dec '14

20 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Add additional documentation ...................................................................... [IMPROV] Add additional documentation This adds a few missing docstrings, so that some files are now not failing the non-voting jenkins test. Repurposed the tests so that the normal flake8 test is now also doing the docstring tests because the docstrings-mandatory test was doing the normal flake8 tests anyway. The docstrings-mandatory test now contains all files which already pass the non-voting docstrings test. Change-Id: I213f1d05235a7f242a0776e44d37f8f89a8437c9 --- M pywikibot/site.py M pywikibot/textlib.py M pywikibot/tools.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/xmlreader.py M tox.ini 7 files changed, 150 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 8f82568..6e1fbc4 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -100,6 +100,7 @@ @classmethod def name(cls, search_value): + """Return the name of a LoginStatus by it's value.""" for key, value in cls.__dict__.items(): if key == key.upper() and value == search_value: return key @@ -107,9 +108,11 @@ % search_value) def __init__(self, state): + """Constructor.""" self.state = state def __repr__(self): + """Return internal representation.""" return 'LoginStatus(%s)' % (LoginStatus.name(self.state)) @@ -301,12 +304,15 @@ return Namespace._colons(self.id, self.custom_name) def __int__(self): + """Return the namespace id.""" return self.id def __index__(self): + """Return the namespace id.""" return self.id def __hash__(self): + """Return the namespace id.""" return self.id def __eq__(self, other): @@ -325,12 +331,15 @@ return not self.__eq__(other) def __mod__(self, other): + """Apply modulo on the namespace id.""" return self.id.__mod__(other) def __sub__(self, other): + """Apply subtraction on the namespace id.""" return -(other) + self.id def __add__(self, other): + """Apply addition on the namespace id.""" return other + self.id def _cmpkey(self): @@ -560,6 +569,7 @@ return self._username[False] def username(self, sysop=False): + """Return the username/sysopname used for the site.""" return self._username[sysop] def __getattr__(self, attr): @@ -853,21 +863,27 @@ # namespace shortcuts for backwards-compatibility def special_namespace(self): + """Return local name for the Special: namespace.""" return self.namespace(-1) def image_namespace(self): + """Return local name for the File namespace.""" return self.namespace(6) def mediawiki_namespace(self): + """Return local name for the MediaWiki namespace.""" return self.namespace(8) def template_namespace(self): + """Return local name for the Template namespace.""" return self.namespace(10) def category_namespace(self): + """Return local name for the Category namespace.""" return self.namespace(14) def category_namespaces(self): + """Return names for the Category namespace.""" return self.namespace(14, all=True) # site-specific formatting preferences @@ -1300,6 +1316,7 @@ """Container for tokens.""" def __init__(self, site): + """Constructor.""" self.site = site self._tokens = {} self.failed_cache = set() # cache unavailable tokens. @@ -1329,6 +1346,7 @@ self.failed_cache.add((self.site.user(), key)) def __getitem__(self, key): + """Get token value for the given key.""" assert(self.site.user()) user_tokens = self._tokens.setdefault(self.site.user(), {}) @@ -1357,12 +1375,15 @@ .format(key, self.site.user(), self.site)) def __contains__(self, key): + """Return True if the given token name is cached.""" return key in self._tokens.setdefault(self.site.user(), {}) def __str__(self): + """Return a str representation of the internal tokens dictionary.""" return self._tokens.__str__() def __repr__(self): + """Return a representation of the internal tokens dictionary.""" return self._tokens.__repr__() @@ -2272,6 +2293,7 @@ self._update_page(page, query, 'loadcoordinfo') def loadpageprops(self, page): + """Load page props for the given page.""" title = page.title(withSection=False) query = self._generator(api.PropertyGenerator, type_arg="pageprops", @@ -3744,6 +3766,11 @@ @deprecated("Site.randompages()") def randomredirectpage(self): + """ + DEPRECATED: Use Site.randompages() instead. + + @return: Return a random redirect page + """ return self.randompages(total=1, redirects=True) def randompages(self, step=None, total=10, namespaces=None, @@ -4345,7 +4372,14 @@ @must_be(group='sysop') def unblockuser(self, user, reason): + """ + Remove the block for the user. + @param user: The username/IP without a namespace. + @type user: User + @param reason: Reason for the unblock. + @type reason: basestring + """ token = self.tokens['block'] req = api.Request(site=self, action='unblock', user=user.username, reason=reason, token=token) @@ -4691,6 +4725,11 @@ @deprecated("Site().newfiles()") @deprecated_args(number=None, repeat=None) def newimages(self, *args, **kwargs): + """ + Yield information about newly uploaded files. + + DEPRECATED: Use newfiles() instead. + """ return self.newfiles(*args, **kwargs) @deprecated_args(number=None, repeat=None) @@ -4885,6 +4924,10 @@ @deprecated("Site().unusedfiles()") @deprecated_args(number=None, repeat=None) def unusedimages(self, *args, **kwargs): + """Yield FilePage objects from Special:Unusedimages. + + DEPRECATED: Use L{APISite.unusedfiles} instead. + """ return self.unusedfiles(*args, **kwargs) @deprecated_args(number=None, repeat=None) diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index d37f654..530dc70 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -379,7 +379,7 @@ def findmarker(text, startwith=u'@@', append=None): - # find a string which is not part of text + """Find a string which is not part of text.""" if not append: append = u'@' mymarker = startwith @@ -653,8 +653,8 @@ return s -# Sort sites according to local interwiki sort logic def interwikiSort(sites, insite=None): + """Sort sites according to local interwiki sort logic.""" if not sites: return [] if insite is None: @@ -1241,19 +1241,24 @@ """ def __init__(self, offset, name): + """Constructor.""" self.__offset = datetime.timedelta(minutes=offset) self.__name = name def utcoffset(self, dt): + """Return the offset to UTC.""" return self.__offset def tzname(self, dt): + """Return the name of the timezone.""" return self.__name def dst(self, dt): + """Return no daylight savings time.""" return datetime.timedelta(0) def __repr__(self): + """Return the internal representation of the timezone.""" return "%s(%s, %s)" % ( self.__class__.__name__, self.__offset.days * 86400 + self.__offset.seconds, @@ -1266,6 +1271,7 @@ """Find timestamp in page and return it as timezone aware datetime object.""" def __init__(self, site=None): + """Constructor.""" if site is None: self.site = pywikibot.Site() else: diff --git a/pywikibot/tools.py b/pywikibot/tools.py index d3112cb..3eaae65 100644 --- a/pywikibot/tools.py +++ b/pywikibot/tools.py @@ -43,9 +43,11 @@ if sys.version_info[0] > 2: def __str__(self): + """Return the unicode representation as the str representation.""" return self.__unicode__() else: def __str__(self): + """Return the str representation of the UTF-8 encoded Unicode.""" return self.__unicode__().encode('utf8') @@ -55,21 +57,27 @@ """Mixin class to allow comparing to other objects which are comparable.""" def __lt__(self, other): + """Compare if other is less than self.""" return other >= self._cmpkey() def __le__(self, other): + """Compare if other is less equals self.""" return other > self._cmpkey() def __eq__(self, other): + """Compare if other is equal to self.""" return other == self._cmpkey() def __ge__(self, other): + """Compare if other is greater equals self.""" return other < self._cmpkey() def __gt__(self, other): + """Compare if other is greater than self.""" return other <= self._cmpkey() def __ne__(self, other): + """Compare if other is not equal to self.""" return other != self._cmpkey() diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 3336392..bc6fc08 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -46,6 +46,12 @@ """Base for terminal user interfaces.""" def __init__(self): + """ + Initialize the UI. + + This caches the std-streams locally so any attempts to monkey-patch the + streams later will not work. + """ self.stdin = sys.stdin self.stdout = sys.stdout self.stderr = sys.stderr @@ -98,7 +104,11 @@ root_logger.addHandler(warning_handler) def printNonColorized(self, text, targetStream): - # We add *** after the text as a whole if anything needed to be colorized. + """ + Write the text non colorized to the target stream. + + To each line which contains a color tag a ' ***' is added at the end. + """ lines = text.split('\n') for i, line in enumerate(lines): if i > 0: @@ -349,6 +359,7 @@ u'What is the solution of the CAPTCHA at this url ?') def argvu(self): + """Return the decoded arguments from argv.""" try: return [s.decode(self.encoding) for s in self.argv] except AttributeError: # in python 3, self.argv is unicode and thus cannot be decoded @@ -393,6 +404,7 @@ self.stream.flush() def emit(self, record): + """Emit the record formatted to the output and return it.""" text = self.format(record) return self.UI.output(text, targetStream=self.stream) @@ -414,9 +426,11 @@ """ def __init__(self, level=None): + """Constructor.""" self.level = level def filter(self, record): + """Return true if the level is below or equal to the set level.""" if self.level: return record.levelno <= self.level else: diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index bb6384d..b980cf6 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -36,6 +36,7 @@ """User interface for unix terminals.""" def printColorized(self, text, targetStream): + """Print the text colorized using the Unix colors.""" totalcount = 0 for key, value in unixColors.items(): ckey = '\03{%s}' % key diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index dceeb4b..bf5eee3 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -52,6 +52,7 @@ def __init__(self, title, ns, id, text, username, ipedit, timestamp, editRestriction, moveRestriction, revisionid, comment, redirect): + """Constructor.""" # TODO: there are more tags we can read. self.title = title self.ns = ns @@ -80,11 +81,13 @@ """ def __init__(self, filename, handler): + """Constructor.""" threading.Thread.__init__(self) self.filename = filename self.handler = handler def run(self): + """Parse the file in a single thread.""" xml.sax.parse(self.filename, self.handler) @@ -102,6 +105,7 @@ """ def __init__(self, filename, allrevisions=False): + """Constructor.""" self.filename = filename if allrevisions: self._parse = self._parse_all diff --git a/tox.ini b/tox.ini index 20b989d..2bb2ebe 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,9 @@ install_command = pip install --process-dependency-links --pre {opts} {packages} [testenv:flake8] -commands = flake8 {posargs} +commands = flake8 --ignore=D102,D103,E122,E127,E241 {posargs} deps = flake8 + flake8-docstrings [testenv:flake8-docstrings] commands = flake8 {posargs} @@ -19,7 +20,75 @@ flake8-docstrings [testenv:flake8-docstrings-mandatory] -commands = flake8 --ignore=D102,D103,E122,E127,E241 +commands = flake8 \ + ez_setup.py \ + generate_user_files.py \ + pwb.py \ + pywikibot/__init__.py \ + pywikibot/backports.py \ + pywikibot/bot.py \ + pywikibot/comms/__init__.py \ + pywikibot/comms/http.py \ + pywikibot/compat/ \ + pywikibot/config2.py \ + pywikibot/data/__init__.py \ + pywikibot/data/wikistats.py \ + pywikibot/date.py \ + pywikibot/diff.py \ + pywikibot/echo.py \ + pywikibot/editor.py \ + pywikibot/exceptions.py \ + pywikibot/families/ \ + pywikibot/fixes.py \ + pywikibot/i18n.py \ + pywikibot/pagegenerators.py \ + pywikibot/plural.py \ + pywikibot/throttle.py \ + pywikibot/userinterfaces/__init__.py \ + pywikibot/userinterfaces/terminal_interface.py \ + pywikibot/weblib.py \ + scripts/__init__.py \ + scripts/add_text.py \ + scripts/basic.py \ + scripts/category_redirect.py \ + scripts/claimit.py \ + scripts/clean_sandbox.py \ + scripts/commonscat.py \ + scripts/coordinate_import.py \ + scripts/delete.py \ + scripts/flickrripper.py \ + scripts/harvest_template.py \ + scripts/illustrate_wikidata.py \ + scripts/image.py \ + scripts/imagerecat.py \ + scripts/imageuncat.py \ + scripts/listpages.py \ + scripts/login.py \ + scripts/maintenance/__init__.py \ + scripts/newitem.py \ + scripts/pagefromfile.py \ + scripts/protect.py \ + scripts/shell.py \ + scripts/spamremove.py \ + scripts/states_redirect.py \ + scripts/template.py \ + scripts/transferbot.py \ + scripts/upload.py \ + scripts/watchlist.py \ + setup.py \ + tests/__init__.py \ + tests/archivebot_tests.py \ + tests/category_tests.py \ + tests/date_tests.py \ + tests/edit_failure_tests.py \ + tests/exceptions_tests.py \ + tests/family_tests.py \ + tests/i18n/ \ + tests/pwb/ \ + tests/pwb_tests.py \ + tests/script_tests.py \ + tests/upload_tests.py \ + tests/wikidataquery_tests.py deps = flake8>=2.2.5 flake8-docstrings -- To view, visit https://gerrit.wikimedia.org/r/181079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I213f1d05235a7f242a0776e44d37f8f89a8437c9 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Reimplement Site.undelete and Page.undelete - change (pywikibot/core)
by jenkins-bot (Code Review) 20 Dec '14

20 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: Reimplement Site.undelete and Page.undelete ...................................................................... Reimplement Site.undelete and Page.undelete * Reimplement Site.undelete and Page.undelete * Make Page.markDeletedRevision raise ValueError if an invalid timestamp is passed, fix marking * Add tests in page_tests.py (requires sysop) * Rename summary param for delete/undelete to reason Site.deletedrevs needs to be updated to listdeletedrevisions for 1.25wmf. Change-Id: I1eb2c158f6450bf7b4e9c3f26c83bb7674b9f766 Bug: T74733 --- M pywikibot/page.py M pywikibot/site.py M tests/page_tests.py 3 files changed, 96 insertions(+), 20 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index d96b8cb..386f6cc 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1532,10 +1532,8 @@ self.text = template + self.text return self.save(comment=reason) - # all these DeletedRevisions methods need to be reviewed and harmonized - # with the new framework; they do not appear functional def loadDeletedRevisions(self, step=None, total=None): - """Retrieve all deleted revisions for this Page from Special/Undelete. + """Retrieve deleted revisions for this Page. Stores all revisions' timestamps, dates, editors and comments in self._deletedRevs attribute. @@ -1576,21 +1574,18 @@ """Mark the revision identified by timestamp for undeletion. @param undelete: if False, mark the revision to remain deleted. - + @type undelete: bool """ if not hasattr(self, "_deletedRevs"): self.loadDeletedRevisions() if timestamp not in self._deletedRevs: - # TODO: Throw an exception? - return - self._deletedRevs[timestamp][4] = undelete - self._deletedRevsModified = True + raise ValueError(u'Timestamp %d is not a deleted revision' % timestamp) + self._deletedRevs[timestamp]['marked'] = undelete - @deprecate_arg("throttle", None) - def undelete(self, comment=None): + @deprecate_arg('throttle', None) + @deprecate_arg('comment', 'reason') + def undelete(self, reason=None): """Undelete revisions based on the markers set by previous calls. - - NOT IMPLEMENTED. If no calls have been made since loadDeletedRevisions(), everything will be restored. @@ -1608,11 +1603,17 @@ pg.markDeletedRevision(rev) #mark for undeletion pg.undelete('This will restore only selected revisions.') - @param comment: The undeletion edit summary. - @type comment: basestring + @param reason: Reason for the action. + @type reason: basestring + """ - # FIXME: Site.undelete needs to be implemented. - raise NotImplementedError('Page.undelete is not implemented.') + undelete_revs = [ts for ts, rev in self._deletedRevs.items() + if 'marked' in rev and rev['marked']] + if reason is None: + pywikibot.warning('Not passing a reason for undelete() is deprecated.') + pywikibot.output(u'Undeleting %s.' % (self.title(asLink=True))) + reason = pywikibot.input(u'Please enter a reason for the undeletion:') + self.site.undelete_page(self, reason, undelete_revs) @deprecate_arg("throttle", None) def protect(self, edit=False, move=False, create=None, upload=None, diff --git a/pywikibot/site.py b/pywikibot/site.py index b1e9c7d..1483080 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1411,6 +1411,7 @@ 'centralauth', 'delete', 'deleteglobalaccount', + 'undelete', 'edit', 'email', 'import', @@ -3657,6 +3658,7 @@ wlgen.request["wlshow"] = "|".join(wlshow) return wlgen + # TODO: T75370 def deletedrevs(self, page, start=None, end=None, reverse=None, get_text=False, step=None, total=None): """Iterate deleted revisions. @@ -4114,23 +4116,64 @@ _dl_errors = { "noapiwrite": "API editing not enabled on %(site)s wiki", "writeapidenied": "User %(user)s not allowed to edit through the API", - "permissiondenied": "User %(user)s not authorized to delete pages on %(site)s wiki.", + "permissiondenied": "User %(user)s not authorized to (un)delete " + "pages on %(site)s wiki.", "cantdelete": "Could not delete [[%(title)s]]. Maybe it was deleted already.", + "cantundelete": "Could not undelete [[%(title)s]]. " + "Revision may not exist or was already undeleted." } # other errors shouldn't occur because of pre-submission checks @must_be(group='sysop') - def deletepage(self, page, summary): + @deprecate_arg("summary", "reason") + def deletepage(self, page, reason): """Delete page from the wiki. Requires appropriate privilege level. @param page: Page to be deleted. - @param summary: Edit summary (required!). + @type page: Page + @param reason: Deletion reason. + @type reason: basestring """ token = self.tokens['delete'] self.lock_page(page) req = api.Request(site=self, action="delete", token=token, title=page.title(withSection=False), - reason=summary) + reason=reason) + try: + req.submit() + except api.APIError as err: + errdata = { + 'site': self, + 'title': page.title(withSection=False), + 'user': self.user(), + } + if err.code in self._dl_errors: + raise Error(self._dl_errors[err.code] % errdata) + pywikibot.debug(u"delete: Unexpected error code '%s' received." + % err.code, + _logger) + raise + finally: + self.unlock_page(page) + + @must_be(group='sysop') + @deprecate_arg("summary", "reason") + def undelete_page(self, page, reason, revisions=None): + """Undelete page from the wiki. Requires appropriate privilege level. + + @param page: Page to be deleted. + @type page: Page + @param revisions: List of timestamps to restore. If None, restores all revisions. + @type revisions: list + @param reason: Undeletion reason. + @type reason: basestring + + """ + token = self.tokens['undelete'] + self.lock_page(page) + req = api.Request(site=self, action="undelete", token=token, + title=page.title(withSection=False), + timestamps=revisions, reason=reason) try: req.submit() except api.APIError as err: diff --git a/tests/page_tests.py b/tests/page_tests.py index a756d5d..63e5e32 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -575,6 +575,38 @@ self.assertTrue(rv) +class TestPageDelete(TestCase): + + """Test page delete / undelete actions.""" + + family = 'test' + code = 'test' + + write = True + sysop = True + + def test_delete(self): + """Test the site.delete and site.undelete method.""" + site = self.get_site() + p = pywikibot.Page(site, u'User:Unicodesnowman/DeleteTest') + # Ensure the page exists + p.text = 'pywikibot unit test page' + p.save('unit test', botflag=True) + # Test deletion + p.delete(reason='pywikibot unit test', prompt=False, mark=False) + self.assertRaises(pywikibot.NoPage, p.get, force=True) + # Test undeleting last two revisions + del_revs = list(p.loadDeletedRevisions()) + revid = p.getDeletedRevision(del_revs[-1])[u'revid'] + p.markDeletedRevision(del_revs[-1]) + p.markDeletedRevision(del_revs[-2]) + self.assertRaises(ValueError, p.markDeletedRevision, 123) + p.undelete(reason='pywikibot unit test') + revs = list(p.getVersionHistory()) + self.assertEqual(len(revs), 2) + self.assertEqual(revs[1].revid, revid) + + class TestPageProtect(TestCase): """Test page protect / unprotect actions.""" -- To view, visit https://gerrit.wikimedia.org/r/181235 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1eb2c158f6450bf7b4e9c3f26c83bb7674b9f766 Gerrit-PatchSet: 9 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Unicodesnowman <admin(a)glados.cc> 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: Unicodesnowman <admin(a)glados.cc> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#1833 (master - ceac37a)
by Travis CI 20 Dec '14

20 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1833 Status: Fixed Duration: 43 minutes and 51 seconds Commit: ceac37a (master) Author: jenkins-bot Message: Merge "[BUGFIX] Do not inherit future statements from pwb.py" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/f55560af24f8...ceac37a8… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/44670935 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [bugfix] new regex for retrieving page titles from special p... - change (pywikibot/compat)
by jenkins-bot (Code Review) 20 Dec '14

20 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] new regex for retrieving page titles from special page. ...................................................................... [bugfix] new regex for retrieving page titles from special page. The title part or list elements may contain html entities which will be interpreted as section while instanciating the page and leads to an invalid title exception (e.g. invalid section in category). Now the page title will be fetched from that part inside the <a /> tag. Change-Id: I15383809fbb911e4d8722dfb87c04b71d182bf7f --- M redirect.py 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/redirect.py b/redirect.py index 1cd7c40..cb26269 100644 --- a/redirect.py +++ b/redirect.py @@ -69,6 +69,8 @@ import query import xmlreader +SPECIALPAGE_REGEX = '\<li\>\<a href=".+?" title=".*?">(.+?)</a>' + class RedirectGenerator: def __init__(self, xmlFilename=None, namespaces=[], offset=-1, @@ -127,7 +129,7 @@ if target.startswith('%s:' % code) \ or target.startswith(':%s:' % code): if code == self.site.language(): - # link to our wiki, but with the lang prefix + # link to our wiki, but with the lang prefix target = target[(len(code) + 1):] if target.startswith(':'): target = target[1:] @@ -234,7 +236,7 @@ params = { 'action': 'query', 'redirects': 1, - #'': '', + # '': '', } for apiQ in self._next_redirect_group(): params['pageids'] = apiQ @@ -294,7 +296,7 @@ # regular expression which finds redirects which point to a # non-existing page inside the HTML - Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)"') + Rredir = re.compile(SPECIALPAGE_REGEX) redir_names = Rredir.findall(maintenance_txt) pywikibot.output(u'Retrieved %d redirects from special page.\n' @@ -350,7 +352,7 @@ # regular expression which finds redirects which point to # another redirect inside the HTML - Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)">') + Rredir = re.compile(SPECIALPAGE_REGEX) redir_names = Rredir.findall(maintenance_txt) pywikibot.output(u'Retrieved %i redirects from special page.\n' % len(redir_names)) @@ -521,8 +523,8 @@ u"Won't delete anything." % targetPage.title(asLink=True)) else: - #we successfully get the target page, meaning that - #it exists and is not a redirect: no reason to touch it. + # we successfully get the target page, meaning that + # it exists and is not a redirect: no reason to touch it. pywikibot.output( u'Redirect target %s does exist! Won\'t delete anything.' % targetPage.title(asLink=True)) -- To view, visit https://gerrit.wikimedia.org/r/178480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15383809fbb911e4d8722dfb87c04b71d182bf7f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw> Gerrit-Reviewer: Andre Engels <andreengels(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#1832 (master - f55560a)
by Travis CI 20 Dec '14

20 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1832 Status: Fixed Duration: 46 minutes and 1 second Commit: f55560a (master) Author: jenkins-bot Message: Merge "[FIX] Protect: Use Python 2.6 compatible format" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/573965ec66c5...f55560af… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/44670768 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2014