Pywikibot-commits September 2016

pywikibot-commits@lists.wikimedia.org

2 participants
66 discussions

[Gerrit] pywikibot/core[master]: [IMPR] Improve pagefromfile.py
by jenkins-bot (Code Review) 16 Sep '16

16 Sep '16

jenkins-bot has submitted this change and it was merged. Change subject: [IMPR] Improve pagefromfile.py ...................................................................... [IMPR] Improve pagefromfile.py - rename run method of generator class and enable direct iteration - derive PageFromFileRobot from SingleSiteBot and CurrentPageBot - use instance site attribute - use run() method from super class - overwrite super class' init_page, just pass - overwrite treat: create a page and save the content to page instance - rename save method to treat_page - user put_current instead of userPut Change-Id: I2e293f19850abe216f8fe96a21ebe2183da847b8 --- M scripts/pagefromfile.py 1 file changed, 31 insertions(+), 37 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index f5fbd9d..23e5743 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -57,7 +57,7 @@ """ # # (C) Andre Engels, 2004 -# (C) Pywikibot team, 2005-2015 +# (C) Pywikibot team, 2005-2016 # # Distributed under the terms of the MIT license. # @@ -74,7 +74,8 @@ import pywikibot -from pywikibot import config, Bot, i18n +from pywikibot import config, i18n +from pywikibot.bot import SingleSiteBot, CurrentPageBot from pywikibot.exceptions import ArgumentDeprecationWarning @@ -87,7 +88,7 @@ self.offset = offset -class PageFromFileRobot(Bot): +class PageFromFileRobot(SingleSiteBot, CurrentPageBot): """ Responsible for writing pages to the wiki. @@ -96,7 +97,7 @@ """ - def __init__(self, reader, **kwargs): + def __init__(self, **kwargs): """Constructor.""" self.availableOptions.update({ 'always': True, @@ -113,34 +114,35 @@ super(PageFromFileRobot, self).__init__(**kwargs) self.availableOptions.update( {'always': False if self.getOption('showdiff') else True}) - self.reader = reader - def run(self): - """Start file processing and upload content.""" - for title, contents in self.reader.run(): - self.save(title, contents) + def init_page(self, page): + """Do not try to update site before calling treat.""" + pass - def save(self, title, contents): + def treat(self, page_tuple): + """Process page tuple, set page to current page and treat it.""" + title, content = page_tuple + page = pywikibot.Page(self.site, title) + page.text = content.strip() + super(PageFromFileRobot, self).treat(page) + + def treat_page(self): """Upload page content.""" - mysite = pywikibot.Site() - - page = pywikibot.Page(mysite, title) - self.current_page = page + page = self.current_page + title = page.title() + contents = page.text if self.getOption('summary'): comment = self.getOption('summary') else: - comment = i18n.twtranslate(mysite, 'pagefromfile-msg') + comment = i18n.twtranslate(self.site, 'pagefromfile-msg') comment_top = comment + " - " + i18n.twtranslate( - mysite, 'pagefromfile-msg_top') + self.site, 'pagefromfile-msg_top') comment_bottom = comment + " - " + i18n.twtranslate( - mysite, 'pagefromfile-msg_bottom') + self.site, 'pagefromfile-msg_bottom') comment_force = "%s *** %s ***" % ( - comment, i18n.twtranslate(mysite, 'pagefromfile-msg_force')) - - # Remove trailing newlines (cause troubles when creating redirects) - contents = re.sub('^[\r\n]*', '', contents) + comment, i18n.twtranslate(self.site, 'pagefromfile-msg_force')) if page.exists(): if not self.getOption('redirect') and page.isRedirectPage(): @@ -175,24 +177,16 @@ return else: if self.getOption('autosummary'): - comment = '' - config.default_edit_summary = '' + comment = config.default_edit_summary = '' - self.userPut(page, page.text, contents, - summary=comment, - minor=self.getOption('minor'), - show_diff=self.getOption('showdiff'), - ignore_save_related_errors=True) + self.put_current(contents, summary=comment, + minor=self.getOption('minor'), + show_diff=self.getOption('showdiff')) class PageFromFileReader(object): - """ - Responsible for reading the file. - - The run() method yields a (title, contents) tuple for each found page. - - """ + """Generator class, responsible for reading the file.""" def __init__(self, filename, pageStartMarker, pageEndMarker, titleStartMarker, titleEndMarker, include, notitle): @@ -210,8 +204,8 @@ self.include = include self.notitle = notitle - def run(self): - """Read file and yield page title and content.""" + def __iter__(self): + """Read file and yield a tuple of page title and content.""" pywikibot.output('\n\nReading \'%s\'...' % self.filename) try: with codecs.open(self.filename, 'r', @@ -351,7 +345,7 @@ reader = PageFromFileReader(filename, pageStartMarker, pageEndMarker, titleStartMarker, titleEndMarker, include, notitle) - bot = PageFromFileRobot(reader, **options) + bot = PageFromFileRobot(generator=reader, **options) bot.run() if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/272325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e293f19850abe216f8fe96a21ebe2183da847b8 Gerrit-PatchSet: 4 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Sn1per <geofbot(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#3628 (master - c3dc772)
by Travis CI 15 Sep '16

15 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3628 Status: Errored Duration: 38 minutes and 49 seconds Commit: c3dc772 (master) Author: jenkins-bot Message: Merge "Release 2.0rc5 ChangeLog" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/c20603aefdec...c3dc7720… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/160107418 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: Release 2.0rc5 ChangeLog
by jenkins-bot (Code Review) 15 Sep '16

15 Sep '16

jenkins-bot has submitted this change and it was merged. Change subject: Release 2.0rc5 ChangeLog ...................................................................... Release 2.0rc5 ChangeLog Backport If00943f8e64df231716ce67163b65ed2cba3f81d to master Change-Id: I3d1d5f707c975d6fa64c34277982e2ec6fbc1fd7 --- M ChangeLog 1 file changed, 35 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ChangeLog b/ChangeLog index 17a191d..00fa7f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +Release 2.0rc5 (17 August 2016) +=============================== + +Bugfixes +-------- +de630d8 Establish the project's name, once and for all +fcca7ad setup.py: Add Python 3.4 and 3.5 to pypi classifiers +e8be996 Remove item count output in page generators +de75825 Test Python 3.5 on Travis +f39c8fa Fix docstring capitalization in return types and behavior +0e9ecb0 Stop reading 'cookieprefix' upon login +65d62ae Fix travis global environment variables +18a1574 Fix notifications building from JSON +c846932 pywikibot: Store ImportError in imported variable +99d789b Use default tox pip install +eba4d95 Add asteroids that are being used as locations +2b95d9e [bugfix] Fix test_translateMagicWords test +76fa79c Fix ID for Rhea +4491ed7 [bugfix] pass User page object to NotEmailableError +ea0c637 Allow pywikibot to run on Windows 10 as well +8864e34 listpages.py: Fix help docstring +697b4f6 pwb.py: make sure pywikibot is correctly loaded before starting a script +c66c463 win32_unicode: force truetype font in console +16d8ff0 Update main copyright year to 2016 +ae0ddfc [L10N] add "sco" to redirected category pages +10dc22a date.py: fix Hungarian day-month title +b47b202 Prevent <references.../> from being destroyed +c414088 [FIX] Page: Use repr-like if it can't be encoded +ab2b9cc pywikibot.WARNING -> pywikibot.logging.WARNING +c4f950c Do not expand text by default in getCategoryLinks +435f6c4 Typo fix +2c5944f Prevent AttributeError for when filename is None +02872b7 Split TestUserContribs between user and non-user + + Release 2.0rc4 (15 December 2015) ================================= -- To view, visit https://gerrit.wikimedia.org/r/306643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d1d5f707c975d6fa64c34277982e2ec6fbc1fd7 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3627 (2.0 - 71bae9a)
by Travis CI 15 Sep '16

15 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3627 Status: Errored Duration: 39 minutes and 44 seconds Commit: 71bae9a (2.0) Author: Translation updater bot Message: Updated git submodules Project: pywikibot/i18n master 39901fbe04ee58e5a539282b557fbcbbe770ab39 Localisation updates from https://translatewiki.net. Change-Id: I1a31fe9e3c77ce968dbe37bc3d8a952d455b8b5a View the changeset: https://github.com/wikimedia/pywikibot-core/compare/55166495ffa5...71bae9a2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/160084830 -- 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#3627 (master - c20603a)
by Travis CI 15 Sep '16

15 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3627 Status: Errored Duration: 36 minutes and 10 seconds Commit: c20603a (master) Author: Translation updater bot Message: Updated git submodules Project: pywikibot/i18n master 39901fbe04ee58e5a539282b557fbcbbe770ab39 Localisation updates from https://translatewiki.net. Change-Id: I1a31fe9e3c77ce968dbe37bc3d8a952d455b8b5a View the changeset: https://github.com/wikimedia/pywikibot-core/compare/936170b7d26e...c20603ae… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/160084809 -- 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#3626 (master - 936170b)
by Travis CI 14 Sep '16

14 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3626 Status: Errored Duration: 31 minutes and 8 seconds Commit: 936170b (master) Author: zhuyifei1999 Message: Site.editpage: Moving locking mechanism into a try...finally block Repetition is the root of all evil. One place where self.unlock_page(page) is forgotten can cause a deadlock. Try...finally block is used everywhere else for unlocking in Site except for editpage. Bug: T145633 Change-Id: Ia5738f651fa23ab1a62d0f3ead85e0dbf4856136 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/2d2d51b759ac...936170b7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/159867784 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: Site.editpage: Moving locking mechanism into a try...finally...
by jenkins-bot (Code Review) 14 Sep '16

14 Sep '16

jenkins-bot has submitted this change and it was merged. Change subject: Site.editpage: Moving locking mechanism into a try...finally block ...................................................................... Site.editpage: Moving locking mechanism into a try...finally block Repetition is the root of all evil. One place where self.unlock_page(page) is forgotten can cause a deadlock. Try...finally block is used everywhere else for unlocking in Site except for editpage. Bug: T145633 Change-Id: Ia5738f651fa23ab1a62d0f3ead85e0dbf4856136 --- M pywikibot/site.py 1 file changed, 77 insertions(+), 79 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 27f45fc..92cf5e1 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4947,7 +4947,6 @@ token = self.tokens['edit'] if bot is None: bot = ("bot" in self.userinfo["rights"]) - self.lock_page(page) params = dict(action='edit', title=page, text=text, token=token, summary=summary, bot=bot, recreate=recreate, createonly=createonly, @@ -4973,92 +4972,91 @@ u"editpage: Invalid watch value '%(watch)s' ignored." % {'watch': watch}) req = self._simple_request(**params) - while True: - try: - result = req.submit() - pywikibot.debug(u"editpage response: %s" % result, - _logger) - except api.APIError as err: - self.unlock_page(page) - if err.code.endswith("anon") and self.logged_in(): + + self.lock_page(page) + try: + while True: + try: + result = req.submit() + pywikibot.debug(u"editpage response: %s" % result, + _logger) + except api.APIError as err: + if err.code.endswith("anon") and self.logged_in(): + pywikibot.debug( + u"editpage: received '%s' even though bot is logged in" + % err.code, + _logger) + if err.code in self._ep_errors: + if isinstance(self._ep_errors[err.code], basestring): + errdata = { + 'site': self, + 'title': page.title(withSection=False), + 'user': self.user(), + 'info': err.info + } + raise Error(self._ep_errors[err.code] % errdata) + else: + raise self._ep_errors[err.code](page) pywikibot.debug( - u"editpage: received '%s' even though bot is logged in" + u"editpage: Unexpected error code '%s' received." % err.code, _logger) - if err.code in self._ep_errors: - if isinstance(self._ep_errors[err.code], basestring): - errdata = { - 'site': self, - 'title': page.title(withSection=False), - 'user': self.user(), - 'info': err.info - } - raise Error(self._ep_errors[err.code] % errdata) - else: - raise self._ep_errors[err.code](page) - pywikibot.debug( - u"editpage: Unexpected error code '%s' received." - % err.code, - _logger) - raise - assert "edit" in result and "result" in result["edit"], result - if result["edit"]["result"] == "Success": - self.unlock_page(page) - if "nochange" in result["edit"]: - # null edit, page not changed - pywikibot.log(u"Page [[%s]] saved without any changes." - % page.title()) + raise + assert "edit" in result and "result" in result["edit"], result + if result["edit"]["result"] == "Success": + if "nochange" in result["edit"]: + # null edit, page not changed + pywikibot.log(u"Page [[%s]] saved without any changes." + % page.title()) + return True + page.latest_revision_id = result["edit"]["newrevid"] + # see https://www.mediawiki.org/wiki/API:Wikimania_2006_API_discussion#Notes + # not safe to assume that saved text is the same as sent + del page.text return True - page.latest_revision_id = result["edit"]["newrevid"] - # see https://www.mediawiki.org/wiki/API:Wikimania_2006_API_discussion#Notes - # not safe to assume that saved text is the same as sent - del page.text - return True - elif result["edit"]["result"] == "Failure": - if "captcha" in result["edit"]: - captcha = result["edit"]["captcha"] - req['captchaid'] = captcha['id'] - if captcha["type"] == "math": - # TODO: Should the input be parsed through eval in py3? - req['captchaword'] = input(captcha["question"]) - continue - elif "url" in captcha: - import webbrowser - webbrowser.open('%s://%s%s' - % (self.protocol(), - self.hostname(), - captcha["url"])) - req['captchaword'] = pywikibot.input( - "Please view CAPTCHA in your browser, " - "then type answer here:") - continue - else: - self.unlock_page(page) + elif result["edit"]["result"] == "Failure": + if "captcha" in result["edit"]: + captcha = result["edit"]["captcha"] + req['captchaid'] = captcha['id'] + if captcha["type"] == "math": + # TODO: Should the input be parsed through eval in py3? + req['captchaword'] = input(captcha["question"]) + continue + elif "url" in captcha: + import webbrowser + webbrowser.open('%s://%s%s' + % (self.protocol(), + self.hostname(), + captcha["url"])) + req['captchaword'] = pywikibot.input( + "Please view CAPTCHA in your browser, " + "then type answer here:") + continue + else: + pywikibot.error( + u"editpage: unknown CAPTCHA response %s, " + u"page not saved" + % captcha) + return False + elif 'spamblacklist' in result['edit']: + raise SpamfilterError(page, result['edit']['spamblacklist']) + elif 'code' in result['edit'] and 'info' in result['edit']: pywikibot.error( - u"editpage: unknown CAPTCHA response %s, " - u"page not saved" - % captcha) + u"editpage: %s\n%s, " + % (result['edit']['code'], result['edit']['info'])) return False - elif 'spamblacklist' in result['edit']: - raise SpamfilterError(page, result['edit']['spamblacklist']) - elif 'code' in result['edit'] and 'info' in result['edit']: - self.unlock_page(page) - pywikibot.error( - u"editpage: %s\n%s, " - % (result['edit']['code'], result['edit']['info'])) - return False + else: + pywikibot.error(u"editpage: unknown failure reason %s" + % str(result)) + return False else: - self.unlock_page(page) - pywikibot.error(u"editpage: unknown failure reason %s" - % str(result)) + pywikibot.error( + u"editpage: Unknown result code '%s' received; " + u"page not saved" % result["edit"]["result"]) + pywikibot.log(str(result)) return False - else: - self.unlock_page(page) - pywikibot.error( - u"editpage: Unknown result code '%s' received; " - u"page not saved" % result["edit"]["result"]) - pywikibot.log(str(result)) - return False + finally: + self.unlock_page(page) OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page') -- To view, visit https://gerrit.wikimedia.org/r/310531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5738f651fa23ab1a62d0f3ead85e0dbf4856136 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3625 (master - 2d2d51b)
by Travis CI 14 Sep '16

14 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3625 Status: Errored Duration: 36 minutes and 44 seconds Commit: 2d2d51b (master) Author: jenkins-bot Message: Merge "tools.py: add file_mode_checker()" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/8200a2453361...2d2d51b7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/159818645 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: tools.py: add file_mode_checker()
by jenkins-bot (Code Review) 14 Sep '16

14 Sep '16

jenkins-bot has submitted this change and it was merged. Change subject: tools.py: add file_mode_checker() ...................................................................... tools.py: add file_mode_checker() Implement a single function for file permission checks. File permission check is currently done in http.py and login.py, with code repetitions. Tests added (they are skipped if 'mock' module is not available). Change-Id: I47fc750a20b024fce4fad20c4c9a726170a25da0 --- M pywikibot/comms/http.py M pywikibot/login.py M pywikibot/tools/__init__.py M tests/tools_tests.py 4 files changed, 77 insertions(+), 23 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 0f6e083..c3acdbc 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -23,8 +23,6 @@ __docformat__ = 'epytext' import atexit -import os -import stat import sys from distutils.version import StrictVersion @@ -56,6 +54,7 @@ from pywikibot.logging import critical, debug, error, log, warning from pywikibot.tools import ( deprecate_arg, + file_mode_checker, issue_deprecation_warning, PY2, StringTypes, @@ -77,18 +76,6 @@ config.socket_timeout = min(config.socket_timeout) -def mode_check(filename): - """Check if filename has mode 600 and, if not, set it.""" - mode_600 = stat.S_IRUSR | stat.S_IWUSR - warn_str = 'File {0} had no {1:o} mode; converted to {1:o} mode' - st_mode = os.stat(filename).st_mode - if stat.S_ISREG(st_mode) and (st_mode - stat.S_IFREG != mode_600): - os.chmod(filename, mode_600) - # re-read and check changes - if os.stat(filename).st_mode != st_mode: - pywikibot.warning(warn_str.format(filename, mode_600)) - - def mode_check_decorator(func): """Decorate load()/save() CookieJar methods.""" def wrapper(cls, **kwargs): @@ -97,7 +84,7 @@ except KeyError: filename = cls.filename res = func(cls, **kwargs) - mode_check(filename) + file_mode_checker(filename, mode=0o600) return res return wrapper diff --git a/pywikibot/login.py b/pywikibot/login.py index 4ce223b..dfc5cdf 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -3,7 +3,7 @@ """Library to log the bot in to a wiki account.""" # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikibot team, 2003-2015 +# (C) Pywikibot team, 2003-2016 # # Distributed under the terms of the MIT license. # @@ -13,8 +13,9 @@ # import codecs import os -import stat import webbrowser + +from pywikibot.tools import file_mode_checker from warnings import warn @@ -236,12 +237,8 @@ if not os.path.isfile(password_file): password_file = config.password_file - # We fix password file permission first, - # lift upper permission (regular file) from st_mode - # to compare it with private_files_permission. - if os.stat(password_file).st_mode - stat.S_IFREG \ - != config.private_files_permission: - os.chmod(password_file, config.private_files_permission) + # We fix password file permission first. + file_mode_checker(password_file, mode=config.private_files_permission) password_f = codecs.open(password_file, encoding='utf-8') for line_nr, line in enumerate(password_f): diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 5e4cb80..ffafbdf 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -12,7 +12,9 @@ import gzip import inspect import itertools +import os import re +import stat import subprocess import sys import threading @@ -168,6 +170,7 @@ class UnicodeMixin(object): + """Mixin class to add __str__ method in Python 2 or 3.""" @py2_encode_utf_8 @@ -1666,3 +1669,21 @@ def open_compressed(filename, use_extension=False): """DEPRECATED: Open a file and uncompress it if needed.""" return open_archive(filename, use_extension=use_extension) + + +def file_mode_checker(filename, mode=0o600): + """Check file mode and update it, if needed. + + @param filename: filename path + @type filename: basestring + @param mode: requested file mode + @type mode: int + + """ + warn_str = 'File {0} had {1:o} mode; converted to {2:o} mode.' + st_mode = os.stat(filename).st_mode + if stat.S_ISREG(st_mode) and (st_mode - stat.S_IFREG != mode): + os.chmod(filename, mode) + # re-read and check changes + if os.stat(filename).st_mode != st_mode: + warn(warn_str.format(filename, st_mode - stat.S_IFREG, mode)) diff --git a/tests/tools_tests.py b/tests/tools_tests.py index b38048b..c6525e9 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -17,12 +17,19 @@ import tempfile import warnings +try: + import mock +except ImportError as e: + mock = e + from pywikibot import tools from tests import join_xml_data_path + from tests.aspects import ( unittest, require_modules, DeprecationTestCase, TestCase, MetaTestCaseClass ) + from tests.utils import expected_failure_if, add_metaclass @@ -675,6 +682,48 @@ return inspect.getargspec(method) +@require_modules('mock') +class TestFileModeChecker(TestCase): + + """Test parsing password files.""" + + net = False + + def patch(self, name): + """Patch up <name> in self.setUp.""" + patcher = mock.patch(name) + self.addCleanup(patcher.stop) + return patcher.start() + + def setUp(self): + """Patch a variety of dependencies.""" + super(TestFileModeChecker, self).setUp() + self.stat = self.patch('os.stat') + self.chmod = self.patch('os.chmod') + self.file = '~FakeFile' + + def test_auto_chmod_for_dir(self): + """Do not chmod files that have mode private_files_permission.""" + self.stat.return_value.st_mode = 0o040600 # dir + tools.file_mode_checker(self.file, mode=0o600) + self.stat.assert_called_with(self.file) + self.assertFalse(self.chmod.called) + + def test_auto_chmod_OK(self): + """Do not chmod files that have mode private_files_permission.""" + self.stat.return_value.st_mode = 0o100600 # regular file + tools.file_mode_checker(self.file, mode=0o600) + self.stat.assert_called_with(self.file) + self.assertFalse(self.chmod.called) + + def test_auto_chmod_not_OK(self): + """Chmod files that do not have mode private_files_permission.""" + self.stat.return_value.st_mode = 0o100644 # regular file + tools.file_mode_checker(self.file, mode=0o600) + self.stat.assert_called_with(self.file) + self.chmod.assert_called_once_with(self.file, 0o600) + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/308354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47fc750a20b024fce4fad20c4c9a726170a25da0 Gerrit-PatchSet: 8 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: Merlijn van Deen <valhallasw(a)arctus.nl> 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#3624 (master - 8200a24)
by Travis CI 13 Sep '16

13 Sep '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3624 Status: Errored Duration: 43 minutes and 26 seconds Commit: 8200a24 (master) Author: jenkins-bot Message: Merge "Revert "[bugfix] fix tests for wikidata"" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/44be554579de...8200a245… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/159508799 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2016