Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] pep8 fixes - change (pywikibot/core)

by jenkins-bot (Code Review)

10 years, 8 months

[Gerrit] pep8 fixes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8 fixes ...................................................................... pep8 fixes Change-Id: I20a9ee539e8bd8c1c8eb02fbd902388ede8c65f5 --- M pywikibot/data/api.py 1 file changed, 58 insertions(+), 65 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 4849f7a..237d433 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -38,6 +38,7 @@ lagpattern = re.compile(r"Waiting for [\d.]+: (?P<lag>\d+) seconds? lagged") + class APIError(pywikibot.Error): """The wiki site returned an error message.""" def __init__(self, code, info, **kwargs): @@ -131,14 +132,14 @@ raise ValueError("'action' specification missing from Request.") self.update(**kwargs) self.write = self.params["action"] in ( - "edit", "move", "rollback", "delete", "undelete", - "protect", "block", "unblock", "watch", "patrol", - "import", "userrights", "upload", "wbeditentity", - "wbsetlabel", "wbsetdescription", "wbsetaliases", - "wblinktitles", "wbsetsitelink", "wbcreateclaim", - "wbremoveclaims", "wbsetclaimvalue", "wbsetreference", - "wbremovereferences" - ) + "edit", "move", "rollback", "delete", "undelete", + "protect", "block", "unblock", "watch", "patrol", + "import", "userrights", "upload", "wbeditentity", + "wbsetlabel", "wbsetdescription", "wbsetaliases", + "wblinktitles", "wbsetsitelink", "wbcreateclaim", + "wbremoveclaims", "wbsetclaimvalue", "wbsetreference", + "wbremovereferences" + ) if self.params["action"] == "edit": pywikibot.debug(u"Adding user assertion", _logger) self.params["assert"] = "user" # make sure user is logged in @@ -201,19 +202,17 @@ try: self.params[key] = "|".join(self.params[key]) if isinstance(self.params[key], unicode): - self.params[key] = self.params[key].encode( - self.site.encoding()) + self.params[key] = self.params[key].encode(self.site.encoding()) except Exception: pywikibot.error( -u"http_params: Key '%s' could not be encoded to '%s'; params=%r" - % (key, self.site.encoding(), self.params[key])) + u"http_params: Key '%s' could not be encoded to '%s'; params=%r" + % (key, self.site.encoding(), self.params[key])) return urllib.urlencode(self.params) def __str__(self): return urllib.unquote(self.site.scriptpath() + "/api.php?" - + self.http_params() - ) + + self.http_params()) def _simulate(self, action): if action and config.simulate and action in config.actions_to_block: @@ -252,7 +251,7 @@ if key == "file": local_filename = self.params[key] filetype = mimetypes.guess_type(local_filename)[0] \ - or 'application/octet-stream' + or 'application/octet-stream' file_content = file(local_filename, "rb").read() submsg = MIMENonMultipart(*filetype.split("/")) submsg.add_header("Content-disposition", @@ -272,18 +271,17 @@ container.attach(submsg) # strip the headers to get the HTTP message body body = container.as_string() - marker = "\n\n" # separates headers from body + marker = "\n\n" # separates headers from body eoh = body.find(marker) - body = body[ eoh + len(marker): ] + body = body[eoh + len(marker):] # retrieve the headers from the MIME object mimehead = dict(container.items()) rawdata = http.request(self.site, uri, ssl, method="POST", headers=mimehead, body=body) else: rawdata = http.request(self.site, uri, ssl, method="POST", - headers={'Content-Type': - 'application/x-www-form-urlencoded'}, - body=paramstring) + headers={'Content-Type': 'application/x-www-form-urlencoded'}, + body=paramstring) ## import traceback ## traceback.print_stack() ## print rawdata @@ -309,8 +307,8 @@ # if the result isn't valid JSON, there must be a server # problem. Wait a few seconds and try again pywikibot.warning( -"Non-JSON response received from server %s; the server may be down." - % self.site) + "Non-JSON response received from server %s; the server may be down." + % self.site) pywikibot.debug(rawdata, _logger) # there might also be an overflow, so try a smaller limit for param in self.params: @@ -329,7 +327,7 @@ if type(result) is not dict: raise APIError("Unknown", "Unable to process query response of type %s." - % type(result), + % type(result), {'data': result}) if self['action'] == 'query': if 'userinfo' in result.get('query', ()): @@ -338,11 +336,10 @@ else: self.site._userinfo = result['query']['userinfo'] status = self.site._loginstatus # save previous login status - if ( ("error" in result - and result["error"]["code"].endswith("limit")) - or (status >= 0 - and self.site._userinfo['name'] - != self.site._username[status])): + if (("error" in result + and result["error"]["code"].endswith("limit")) + or (status >= 0 + and self.site._userinfo['name'] != self.site._username[status])): # user is no longer logged in (session expired?) # reset userinfo, then make user log in again del self.site._userinfo @@ -387,9 +384,9 @@ # raise error try: pywikibot.log(u"API Error: query=\n%s" - % pprint.pformat(self.params)) + % pprint.pformat(self.params)) pywikibot.log(u" response=\n%s" - % result) + % result) raise APIError(code, info, **result["error"]) except TypeError: raise RuntimeError(result) @@ -508,7 +505,7 @@ kwargs["indexpageids"] = "" # always ask for list of pageids self.request = Request(**kwargs) self.prefix = None - self.update_limit() # sets self.prefix + self.update_limit() # sets self.prefix if self.api_limit is not None and "generator" in kwargs: self.prefix = "g" + self.prefix self.limit = None @@ -595,16 +592,15 @@ for mod in self.module.split('|'): for param in self._modules[mod].get("parameters", []): if param["name"] == "limit": - if (self.site.logged_in() - and self.site.has_right('apihighlimits')): + if self.site.logged_in() and self.site.has_right('apihighlimits'): self.api_limit = int(param["highmax"]) else: self.api_limit = int(param["max"]) if self.prefix is None: self.prefix = self._modules[mod]["prefix"] pywikibot.debug(u"%s: Set query_limit to %i." - % (self.__class__.__name__, - self.api_limit), + % (self.__class__.__name__, + self.api_limit), _logger) return @@ -621,7 +617,7 @@ for mod in self.module.split('|'): for param in self._modules[mod].get("parameters", []): if param["name"] == "namespace": - self.request[self.prefix+"namespace"] = namespaces + self.request[self.prefix + "namespace"] = namespaces return def __iter__(self): @@ -647,7 +643,7 @@ # so use 250 as a safer limit new_limit = min(new_limit, self.api_limit // 10, 250) if new_limit is not None: - self.request[self.prefix+"limit"] = str(new_limit) + self.request[self.prefix + "limit"] = str(new_limit) if not hasattr(self, "data"): try: self.data = self.request.submit() @@ -662,13 +658,13 @@ if not self.data or not isinstance(self.data, dict): pywikibot.debug( u"%s: stopped iteration because no dict retrieved from api." - % self.__class__.__name__, + % self.__class__.__name__, _logger) return if "query" not in self.data: pywikibot.debug( -u"%s: stopped iteration because 'query' not found in api response." - % (self.__class__.__name__, self.resultkey), + u"%s: stopped iteration because 'query' not found in api response." + % (self.__class__.__name__, self.resultkey), _logger) pywikibot.debug(unicode(self.data), _logger) return @@ -676,9 +672,9 @@ resultdata = self.data["query"][self.resultkey] if isinstance(resultdata, dict): pywikibot.debug(u"%s received %s; limit=%s" - % (self.__class__.__name__, - resultdata.keys(), - self.limit), + % (self.__class__.__name__, + resultdata.keys(), + self.limit), _logger) if "results" in resultdata: resultdata = resultdata["results"] @@ -692,14 +688,14 @@ for k in sorted(resultdata.keys())] else: pywikibot.debug(u"%s received %s; limit=%s" - % (self.__class__.__name__, - resultdata, - self.limit), + % (self.__class__.__name__, + resultdata, + self.limit), _logger) if "normalized" in self.data["query"]: self.normalized = dict((item['to'], item['from']) - for item in - self.data["query"]["normalized"]) + for item in + self.data["query"]["normalized"]) else: self.normalized = {} for item in resultdata: @@ -712,7 +708,7 @@ if not self.continuekey in self.data["query-continue"]: pywikibot.log( u"Missing '%s' key in ['query-continue'] value." - % self.continuekey) + % self.continuekey) return update = self.data["query-continue"][self.continuekey] for key, value in update.iteritems(): @@ -720,7 +716,7 @@ if isinstance(value, int): value = str(value) self.request[key] = value - del self.data # a new request with query-continue is needed + del self.data # a new request with query-continue is needed def result(self, data): """Process result data as needed for particular subclass.""" @@ -768,7 +764,7 @@ else: kwargs['iiprop'] = 'timestamp|user|comment|url|size|sha1|metadata' QueryGenerator.__init__(self, generator=generator, **kwargs) - self.resultkey = "pages" # element to look for in result + self.resultkey = "pages" # element to look for in result def result(self, pagedata): """Convert page dict entry from api to Page object. @@ -882,13 +878,12 @@ if datetime.datetime.now() < self._waituntil: diff = self._waituntil - datetime.datetime.now() pywikibot.warning(u"Too many tries, waiting %s seconds before retrying." - % diff.seconds) + % diff.seconds) time.sleep(diff.seconds) login_request = Request(site=self.site, action="login", lgname=self.username, - lgpassword=self.password - ) + lgpassword=self.password) self.site._loginstatus = -2 while True: login_result = login_request.submit() @@ -900,7 +895,7 @@ for key in ('Token', 'UserID', 'UserName'): cookies.append("%s%s=%s" % (prefix, key, - login_result['login']['lg'+key.lower()])) + login_result['login']['lg' + key.lower()])) self.username = login_result['login']['lgusername'] return "\n".join(cookies) elif login_result['login']['result'] == "NeedToken": @@ -908,10 +903,8 @@ login_request["lgtoken"] = token continue elif login_result['login']['result'] == "Throttled": - self._waituntil = datetime.datetime.now() \ - + datetime.timedelta(seconds=int( - login_result["login"]["wait"]) - ) + self._waituntil = datetime.datetime.now() + datetime.timedelta( + seconds=int(login_result["login"]["wait"])) break else: break @@ -937,8 +930,7 @@ page._pageid = 0 # Non-existent page else: raise AssertionError( - "Page %s has neither 'pageid' nor 'missing' attribute" - % pagedict['title']) + "Page %s has neither 'pageid' nor 'missing' attribute" % pagedict['title']) page._isredir = 'redirect' in pagedict if 'touched' in pagedict: page._timestamp = pagedict['touched'] @@ -953,10 +945,10 @@ timestamp=pywikibot.Timestamp.fromISOformat(rev['timestamp']), user=rev.get('user', u''), anon='anon' in rev, - comment=rev.get('comment', u''), + comment=rev.get('comment', u''), minor='minor' in rev, text=rev.get('*', None) - ) + ) page._revisions[revision.revid] = revision if 'lastrevid' in pagedict: @@ -968,8 +960,8 @@ page._catinfo = pagedict["categoryinfo"] if "templates" in pagedict: - page._templates = [ pywikibot.Page(page.site, tl['title']) - for tl in pagedict['templates'] ] + page._templates = [pywikibot.Page(page.site, tl['title']) + for tl in pagedict['templates']] if "langlinks" in pagedict: links = [] @@ -999,6 +991,7 @@ logging.getLogger("pywiki.data.api").setLevel(logging.DEBUG) mysite = Site("en", "wikipedia") pywikibot.output(u"starting test....") + def _test(): import doctest doctest.testmod() -- To view, visit https://gerrit.wikimedia.org/r/80172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20a9ee539e8bd8c1c8eb02fbd902388ede8c65f5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Revert "Finish implementation of must_be decorator" - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Revert "Finish implementation of must_be decorator" ...................................................................... Revert "Finish implementation of must_be decorator" Russblau reported that something broke with this and prevented his bot from editing. Reverting until we can debug and figure out what went wrong. This reverts commit 650ea9d2c319d5a58b708c87ad9048ad84491240. Change-Id: I80dd97a75b909f9d2db2485f3681af444ebcd9b9 --- M pywikibot/site.py 1 file changed, 18 insertions(+), 38 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 943e82b..bca3feb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -637,43 +637,28 @@ def globalusers_address(self, target='', limit=500, offset='', group=''): raise NotImplementedError - def must_be(group=None,right=None): + """ Decorator to require a certain user status. For now, only the values + group = 'user' and group = 'sysop' are supported. The right property + will be ignored for now. + + @param group: the group the logged in user should belong to + legal values: 'user' and 'sysop' + @param right: the rights the logged in user hsould have + not supported yet and thus ignored. + @returns: a decorator to make sure the requirement is statisfied when + the decorated function is called. """ - Decorator to require a certain user status. - You can use the group and right independently or together. - Example: - @must_be(group='user', right='edit) - def edit_page(...): - - @param group: any arbitrary group the user should belong to - @param right: the rights the logged in user should have. - @return: a decorator to make sure the requirement is statisfied when - the decorated function is called. - """ - - if group: - if group == 'user': - grp = lambda self: self.login(False) - elif group == 'sysop': - grp = lambda self: self.login(True) - else: - grp = lambda self: self.has_group(group) + if group == 'user': + run = lambda self: self.login(False) + elif group == 'sysop': + run = lambda self: self.login(True) else: - grp = lambda self: True # No group provided - - if right: - rht = lambda self: self.has_right(group) - else: - rht = lambda self: True # No right provided - - run = lambda self: grp(self) and rht(self) + raise Exception("Not implemented") def decorator(fn): def callee(self, *args, **kwargs): - ok = run(self) - if not ok: - raise NoUsername('') # FIXME: Pick a better error + run(self) return fn(self, *args, **kwargs) callee.__name__ = fn.__name__ callee.__doc__ = fn.__doc__ @@ -848,11 +833,6 @@ self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure if not hasattr(self, "_siteinfo"): self._getsiteinfo() - - if sysop: - return self._loginstatus == LoginStatus.AS_SYSOP - else: - return self._loginstatus == LoginStatus.AS_USER forceLogin = login # alias for backward-compatibility @@ -2563,7 +2543,7 @@ "editconflict": "Page %(title)s not saved due to edit conflict.", } - @must_be(group='user', right='edit') + @must_be(group='user') def editpage(self, page, summary, minor=True, notminor=False, bot=True, recreate=True, createonly=False, watch=None): """Submit an edited Page object to be saved to the wiki. @@ -2921,7 +2901,7 @@ #TODO: implement patrol - @must_be(right='block') + @must_be(group='sysop') def blockuser(self, user, expiry, reason, anononly=True, nocreate=True, autoblock=True, noemail=False, reblock=False): -- To view, visit https://gerrit.wikimedia.org/r/80173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80dd97a75b909f9d2db2485f3681af444ebcd9b9 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Making SSL connection true as default per disabling http for... - change (pywikibot/compat)

by Merlijn van Deen (Code Review)

Merlijn van Deen has submitted this change and it was merged. Change subject: Making SSL connection true as default per disabling http for logged in users in 21 August ...................................................................... Making SSL connection true as default per disabling http for logged in users in 21 August Change-Id: I856ac9eac7261912eb6778ed7e04c1c7771f9981 --- M family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved diff --git a/family.py b/family.py index 871519d..255cc3d 100644 --- a/family.py +++ b/family.py @@ -4726,3 +4726,6 @@ def shared_image_repository(self, code): return ('commons', 'commons') + + def protocol(self, code): + return 'https' -- To view, visit https://gerrit.wikimedia.org/r/80003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I856ac9eac7261912eb6778ed7e04c1c7771f9981 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Making SSL connection true as default per disabling http for... - change (pywikibot/core)

by Merlijn van Deen (Code Review)

Merlijn van Deen has submitted this change and it was merged. Change subject: Making SSL connection true as default per disabling http for logged in users in 21 August ...................................................................... Making SSL connection true as default per disabling http for logged in users in 21 August Change-Id: I7a95c627970ba7a691cde899b650291db3c21947 --- M pywikibot/family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index dcd04dc..46a40c1 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -941,3 +941,6 @@ def shared_image_repository(self, code): return ('commons', 'commons') + + def protocol(self, code): + return 'https' \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/80006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a95c627970ba7a691cde899b650291db3c21947 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] minor docu fix and enhanced some parts - change (pywikibot/core)

by DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged. Change subject: minor docu fix and enhanced some parts ...................................................................... minor docu fix and enhanced some parts Change-Id: Ia2fed28377a4867120c03cdd5795581258ddf77d --- M externals/README 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: DrTrigon: Verified; Looks good to me, approved diff --git a/externals/README b/externals/README index aa1a445..4ca2ba0 100644 --- a/externals/README +++ b/externals/README @@ -11,15 +11,20 @@ * parse-crontab: Parse and use crontab schedules in Python - Version .14 (from https://github.com/josiahcarlson/parse-crontab) - Checkout the gip repository and copy the 'crontab' dir into the path - 'externals/crontab' afterwards. + Checkout the git repository and copy the 'crontab' dir into the path + 'externals/crontab' afterwards. Or download the zip archive and unpack the + 'parse-crontab-master/crontab' dir into the path 'externals/crontab'. + $ wget https://github.com/josiahcarlson/parse-crontab/archive/master.zip + $ unzip master.zip + $ mv parse-crontab-master/crontab crontab + $ rm -rf parse-crontab-master * lunatic-python: Two-way bridge between Python and Lua - Version 1.0 (from http://labix.org/lunatic-python) Download the zip archive and unpack the 'lunatic-python-1.0' dir into the path 'externals/_lua' afterwards. $ wget http://labix.org/download/lunatic-python/lunatic-python-1.0.tar.bz2 - $ tar -xvf lunatic-python-1.0.tar.bz2 + $ tar -xvf lunatic-python-1.0.tar.bz2 $ mv lunatic-python-1.0 _lua Patch package dir in order to work with newer lua (>= 5.1) versions $ patch -p1 -d [path-to-install-dir]/_lua < [path-to-externals]/patch-lua -- To view, visit https://gerrit.wikimedia.org/r/79819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2fed28377a4867120c03cdd5795581258ddf77d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch>

10 years, 8 months

[Gerrit] Make MockSite.login return True ('login successful') - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Make MockSite.login return True ('login successful') ...................................................................... Make MockSite.login return True ('login successful') Otherwise the must_be decorator thinks the login failed, and raises an Exception. Fix-For-Change-Id: Ic7196732b0841a5c3a956fa0c7a2b558eba16371 Change-Id: Id34be756f50565a0279e040f00ac5956668f8b31 --- M tests/dry_site_tests.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index f5b7af4..affb8a9 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -34,6 +34,7 @@ def login(self, as_sysop): self.last_login = 'sysop' if as_sysop else 'user' + return True def inner_fn(self, *args, **kwargs): self.last_fn_called = (args, kwargs) -- To view, visit https://gerrit.wikimedia.org/r/79758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id34be756f50565a0279e040f00ac5956668f8b31 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Switch from string-based to os.path-based path management - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: Switch from string-based to os.path-based path management ...................................................................... Switch from string-based to os.path-based path management Instead of doing string manipulation, we now use os.path.split and os.path.join to copy and delete the relevant i18n test file Change-Id: I7f177ad85d135e347220ae9fa77ca0eeb8053541 --- M tests/i18n_tests.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index be8a542..8bef1e6 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -59,11 +59,12 @@ class TestTWTranslate(unittest.TestCase): def setUp(self): - self.path = os.path.realpath(__file__)[:-13] - shutil.copyfile(self.path + 'i18n/test.py', self.path + '../scripts/i18n/test.py') + self.path = os.path.split(os.path.realpath(__file__))[0] + shutil.copyfile(os.path.join(self.path, 'i18n', 'test.py'), + os.path.join(self.path, '..', 'scripts', 'i18n', 'test.py')) def tearDown(self): - os.remove(self.path + '../scripts/i18n/test.py') + os.remove(os.path.join(self.path, '..', 'scripts', 'i18n', 'test.py')) def testLocalized(self): self.assertEqual(i18n.twtranslate('en', 'test-localized'), -- To view, visit https://gerrit.wikimedia.org/r/79597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f177ad85d135e347220ae9fa77ca0eeb8053541 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Finish implementation of must_be decorator - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Finish implementation of must_be decorator ...................................................................... Finish implementation of must_be decorator Converted a few uses to use the proper userright, which eventually all uses should use instead of a specific group Change-Id: Ic7196732b0841a5c3a956fa0c7a2b558eba16371 --- M pywikibot/site.py 1 file changed, 38 insertions(+), 18 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index bca3feb..943e82b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -637,28 +637,43 @@ def globalusers_address(self, target='', limit=500, offset='', group=''): raise NotImplementedError -def must_be(group=None,right=None): - """ Decorator to require a certain user status. For now, only the values - group = 'user' and group = 'sysop' are supported. The right property - will be ignored for now. - @param group: the group the logged in user should belong to - legal values: 'user' and 'sysop' - @param right: the rights the logged in user hsould have - not supported yet and thus ignored. - @returns: a decorator to make sure the requirement is statisfied when - the decorated function is called. +def must_be(group=None,right=None): """ - if group == 'user': - run = lambda self: self.login(False) - elif group == 'sysop': - run = lambda self: self.login(True) + Decorator to require a certain user status. + You can use the group and right independently or together. + Example: + @must_be(group='user', right='edit) + def edit_page(...): + + @param group: any arbitrary group the user should belong to + @param right: the rights the logged in user should have. + @return: a decorator to make sure the requirement is statisfied when + the decorated function is called. + """ + + if group: + if group == 'user': + grp = lambda self: self.login(False) + elif group == 'sysop': + grp = lambda self: self.login(True) + else: + grp = lambda self: self.has_group(group) else: - raise Exception("Not implemented") + grp = lambda self: True # No group provided + + if right: + rht = lambda self: self.has_right(group) + else: + rht = lambda self: True # No right provided + + run = lambda self: grp(self) and rht(self) def decorator(fn): def callee(self, *args, **kwargs): - run(self) + ok = run(self) + if not ok: + raise NoUsername('') # FIXME: Pick a better error return fn(self, *args, **kwargs) callee.__name__ = fn.__name__ callee.__doc__ = fn.__doc__ @@ -833,6 +848,11 @@ self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure if not hasattr(self, "_siteinfo"): self._getsiteinfo() + + if sysop: + return self._loginstatus == LoginStatus.AS_SYSOP + else: + return self._loginstatus == LoginStatus.AS_USER forceLogin = login # alias for backward-compatibility @@ -2543,7 +2563,7 @@ "editconflict": "Page %(title)s not saved due to edit conflict.", } - @must_be(group='user') + @must_be(group='user', right='edit') def editpage(self, page, summary, minor=True, notminor=False, bot=True, recreate=True, createonly=False, watch=None): """Submit an edited Page object to be saved to the wiki. @@ -2901,7 +2921,7 @@ #TODO: implement patrol - @must_be(group='sysop') + @must_be(right='block') def blockuser(self, user, expiry, reason, anononly=True, nocreate=True, autoblock=True, noemail=False, reblock=False): -- To view, visit https://gerrit.wikimedia.org/r/79557 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7196732b0841a5c3a956fa0c7a2b558eba16371 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] pep8-ified editor.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified editor.py ...................................................................... pep8-ified editor.py Change-Id: I012471704402ad1b6efe9fced20530eee660bb1f --- M pywikibot/editor.py 1 file changed, 14 insertions(+), 13 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/editor.py b/pywikibot/editor.py index 5fa57dc..871c4a7 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -25,7 +25,7 @@ def __init__(self): pass - def command(self, tempFilename, text, jumpIndex = None): + def command(self, tempFilename, text, jumpIndex=None): command = config.editor if jumpIndex: # Some editors make it possible to mark occurences of substrings, @@ -41,25 +41,25 @@ if config.editor.startswith('kate'): command += " -l %i -c %i" % (line + 1, column + 1) elif config.editor.startswith('gedit'): - command += " +%i" % (line + 1) # seems not to support columns + command += " +%i" % (line + 1) # seems not to support columns elif config.editor.startswith('emacs'): - command += " +%i" % (line + 1) # seems not to support columns + command += " +%i" % (line + 1) # seems not to support columns elif config.editor.startswith('jedit'): - command += " +line:%i" % (line + 1) # seems not to support columns + command += " +line:%i" % (line + 1) # seems not to support columns elif config.editor.startswith('vim'): - command += " +%i" % (line + 1) # seems not to support columns + command += " +%i" % (line + 1) # seems not to support columns elif config.editor.startswith('nano'): command += " +%i,%i" % (line + 1, column + 1) # Windows editors elif config.editor.lower().endswith('notepad++.exe'): - command += " -n%i" % (line + 1) # seems not to support columns + command += " -n%i" % (line + 1) # seems not to support columns command += ' %s' % tempFilename #print command return command def convertLinebreaks(self, text): - if sys.platform=='win32': + if sys.platform == 'win32': return text.replace('\r\n', '\n') # TODO: Mac OS handling return text @@ -67,12 +67,12 @@ def restoreLinebreaks(self, text): if text is None: return None - if sys.platform=='win32': + if sys.platform == 'win32': return text.replace('\n', '\r\n') # TODO: Mac OS handling return text - def edit(self, text, jumpIndex = None, highlight = None): + def edit(self, text, jumpIndex=None, highlight=None): """ Calls the editor and thus allows the user to change the text. Returns the modified text. Halts the thread's operation until the editor @@ -100,11 +100,12 @@ # Nothing changed return None else: - newcontent = open(tempFilename).read().decode( - config.editor_encoding) + newcontent = open(tempFilename).read().decode(config.editor_encoding) os.unlink(tempFilename) return self.restoreLinebreaks(newcontent) else: return self.restoreLinebreaks( - pywikibot.editText(text, jumpIndex=jumpIndex, - highlight=highlight)) + pywikibot.editText( + text, + jumpIndex=jumpIndex, + highlight=highlight)) -- To view, visit https://gerrit.wikimedia.org/r/79589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I012471704402ad1b6efe9fced20530eee660bb1f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013