Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] complete the changes and implement the ideas given in change... - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: complete the changes and implement the ideas given in change 79977 ...................................................................... complete the changes and implement the ideas given in change 79977 * replace te numerous y/n questions by one 0-3/s selection * output more verbose and meaningful informations * cleaned up other messages to have a smooth (non repeating) output Change-Id: Ieb5f9efbfa4ed82c92ca461a8fb85d463bd247fa --- M externals/__init__.py 1 file changed, 72 insertions(+), 45 deletions(-) Approvals: DrTrigon: Checked; Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index c94047c..b355d6d 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -167,6 +167,7 @@ import os import sys +import inspect import wikipedia as pywikibot # sets externals path #from pywikibot.comms import http @@ -197,27 +198,52 @@ return ("%s-%s" % (platform.system(), platform.dist()[0])).lower() -def show_question(which_files, admin=True): - lowlevel_warning("Required package missing: %s" % which_files) - lowlevel_warning("A required package is missing, but externals can" - " automatically install it.") - if admin: - lowlevel_warning("If you say Yes, externals will need administrator" - " privileges, and you might be asked for the" - " administrator password.") - lowlevel_warning("For more info, please confer:\n" - " http://www.mediawiki.org/wiki/Manual:Pywikipediabot/" +def show_question(module): + lowlevel_warning("Required package missing: %s\n" + "This package is not installed, but required by the file" + " '%s'." % (module, inspect.stack()[2][1])) + lowlevel_warning("For more and additional information, please confer:\n" + "http://www.mediawiki.org/wiki/Manual:Pywikipediabot/" "Installation#Dependencies") - lowlevel_warning("Give externals permission to try to install package?" - " (y/N)") - v = raw_input().upper() - return v == 'Y' or v == 'YES' + options = [(i+1) for i, item in enumerate(modules_needed[module]) if item] + options += [0, 's', ''] + options.sort() + options_msg = ("There are multiple ways to solve this:\n" + "RECOMMENDED for admins: always option [0] or the next available" + " (e.g. [1])\n" + "RECOMMENDED for non-admins: always option [2] (if available)\n" + "0: automatically determine the best of the following methods (may need\n" + " administrator privileges)\n") + if 1 in options: + options_msg += ("1: install the package using the OS package" + " management system like yum\n" + " or apt (needs administrator privileges)\n") + if 2 in options: + options_msg += ("2: download the package from its source URL and" + " install it locally into\n" + " the pywikipedia package externals directory\n") + if 3 in options: + options_msg += ("3: download the package from its mercurial repo and" + " install it locally into\n" + " the pywikipedia package externals directory\n") + options_msg += "s: SKIP and solve manually" + lowlevel_warning(options_msg) + v = None + while (v not in options): + lowlevel_warning("Please choose [%s, s - default]: " % + (", ".join(map(str, options[:-2])))) + v = raw_input().lower() + try: + v = int(v) + except: + pass + return v def show_patch_question(): global _patch_permission if _patch_permission is None: lowlevel_warning("Give externals permission to execute the patch command?" - " (y/N)") + " [y(es), n(o) - default]: ") v = raw_input().upper() _patch_permission = (v == 'Y') or (v == 'YES') return _patch_permission @@ -253,8 +279,6 @@ raise TypeError("Expected string or list of strings") cmd += ' ' + package - lowlevel_warning("externals wants to install package(s) '%s'" % - package_name) sucmd = "sudo %s" % cmd result = os.system(sucmd) return (result == 0) # 0 indicates success @@ -271,8 +295,6 @@ raise TypeError("Expected string or list of strings") cmd += ' ' + package - lowlevel_warning("externals wants to install package(s) '%s'" % - package_name) sucmd = "su -c'%s'" % cmd result = os.system(sucmd) return (result == 0) @@ -289,8 +311,13 @@ return False else: files = dependency_dictionary[distro] + lowlevel_warning('Installing package(s) "%s"' % files) func = distro.replace('-', '_') + '_install' - if files and (func in globals()) and show_question(files): + lowlevel_warning("Externals will need administrator privileges, and" + " you might get asked for the administrator" + " password. This prompt can be skipped with [Ctrl]+" + "[c] or [Enter].") + if files and (func in globals()): callable_ = globals()[func] return callable_(files) else: @@ -310,7 +337,7 @@ def download_install(package, module, path): - if package and show_question(module, admin=False): + if package: lowlevel_warning(u'Download package "%s" from %s' % (module, package['url'])) import mimetypes @@ -351,8 +378,9 @@ result = 0 if ('patch' in package) and show_patch_question(): - lowlevel_warning(u'Install package "%s" by applying patch to %s.' - % (module, os.path.join(path, module))) + lowlevel_warning(u'Applying patch to %s in order to finish' + u'installation of package "%s".' + % (os.path.join(path, module), module)) if sys.platform == 'win32': cmd = '%s -p0 -d %s -i %s --binary' \ % (os.path.join(path, 'patch.exe'), path, @@ -369,7 +397,7 @@ def mercurial_repo_install(package, module, path): - if package and show_question(module): + if package: cmd = 'hg clone' lowlevel_warning(u'Mercurial clone "%s" from %s' % (module, package['url'])) @@ -389,33 +417,32 @@ if os.path.exists(mf): return + sel = show_question(m) + # install the missing module dist = guess_system() func = dist.split(u'-')[0] + '_install' - lowlevel_warning(u'Trying to install by use of "%s" package management system:' % dist) - if (func in globals()) and globals()[func](modules_needed[m][0]): - return - else: - lowlevel_warning(u'No suitable package could be installed or found!') - lowlevel_warning(u'Trying to install by download from source URL:') - if download_install(modules_needed[m][1], m, path): - return - else: - lowlevel_warning(u'No suitable package could be installed or found!') - lowlevel_warning(u'Trying to install by use of mercurial:') - if (len(modules_needed[m]) > 2) and\ - mercurial_repo_install(modules_needed[m][2], m, path): - return - else: - lowlevel_warning(u'No suitable package could be installed or found!') + if sel in [0, 1]: + lowlevel_warning(u'(1) Trying to install by use of "%s" package management system:' % dist) + if (func in globals()) and globals()[func](modules_needed[m][0]): + return + if sel in [0, 2]: + lowlevel_warning(u'(2) Trying to install by download from source URL:') + if download_install(modules_needed[m][1], m, path): + return + if sel in [0, 3]: + lowlevel_warning(u'(3) Trying to install by use of mercurial:') + if (len(modules_needed[m]) > 2) and\ + mercurial_repo_install(modules_needed[m][2], m, path): + return + if sel in [0, 1, 2, 3]: + lowlevel_warning(u'No suitable package could be found nor installed!') - lowlevel_warning(u'Package "%s" could not be found nor installed!' % m) - lowlevel_warning(u'Several scripts might fail, if some modules are not' + lowlevel_warning(u'Several scripts might fail, if the modules are not' u' installed as needed! You can either install them' u' by yourself to the system or extract them into the' - u' externals/ directory. If you chose to not install them' - u' this script will ask you again next time whether you' - u' whish to install the external code.') + u' externals/ directory. If you do not install them, this' + u' script will ask you again next time when executed.') def check_setup_all(): -- To view, visit https://gerrit.wikimedia.org/r/80869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb5f9efbfa4ed82c92ca461a8fb85d463bd247fa Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] support edit summary in Site.editSource and Site.changeClaim... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: support edit summary in Site.editSource and Site.changeClaimTarget ...................................................................... support edit summary in Site.editSource and Site.changeClaimTarget Change-Id: Ic4b9da9d1e0a3a7e7aa1b9551b304d7cfed9e7dc --- M pywikibot/site.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 7f2563b..231d510 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3481,6 +3481,8 @@ ) if bot: params['bot'] = 1 + if 'summary' in kwargs: + params['summary'] = kwargs['summary'] params['token'] = self.token(claim, 'edit') if snaktype == 'value': params['value'] = json.dumps(claim._formatDataValue()) @@ -3532,7 +3534,7 @@ } params['snaks'] = json.dumps(snak) for arg in kwargs: - if arg in ['bot', 'lastrevid']: + if arg in ['bot', 'lastrevid', 'summary']: params[arg] = kwargs[arg] req = api.Request(site=self, **params) -- To view, visit https://gerrit.wikimedia.org/r/81178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4b9da9d1e0a3a7e7aa1b9551b304d7cfed9e7dc Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] bug fix for "SyntaxError: EOL while scanning string literal" - change (pywikibot/core)

by DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged. Change subject: bug fix for "SyntaxError: EOL while scanning string literal" ...................................................................... bug fix for "SyntaxError: EOL while scanning string literal" (what went wrong with this review - how has that been merged...? ;)) Change-Id: I9b0b6b7d33f0c0fe53d9f99109d0f935c866f215 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: DrTrigon: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 0135bd8..4e5dfaf 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2847,7 +2847,7 @@ u"Rollback of %s aborted; only one user in revision history." % page.title(asLink=True)) summary = summary or ( - u"Reverted edits by [[Special:Contributions/%(last_user)s|%(last_user)s]] "" + u"Reverted edits by [[Special:Contributions/%(last_user)s|%(last_user)s]] " u"([[User talk:%(last_user)s|Talk]]) to last version by %(prev_user)s" % locals()) token = self.token(page, "rollback") -- To view, visit https://gerrit.wikimedia.org/r/81199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b0b6b7d33f0c0fe53d9f99109d0f935c866f215 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> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

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

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified pywikibot/site.py ...................................................................... pep8-ified pywikibot/site.py Change-Id: I8e09bf2655bd9c7f39f981bfc8381c0ee8168ec8 --- M pywikibot/site.py 1 file changed, 183 insertions(+), 159 deletions(-) Approvals: Xqt: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index bca3feb..8964e32 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -61,9 +61,10 @@ @classmethod def name(cls, search_value): for key, value in cls.__dict__.iteritems(): - if key==key.upper() and value==search_value: + if key == key.upper() and value == search_value: return key raise KeyError("Value %r could not be found in this enum" % search_value) + def Family(fam=None, fatal=True): """Import the named family. @@ -150,8 +151,7 @@ if sysop: sysop = sysop[0].upper() + sysop[1:] self._username = [user, sysop] - self.use_hard_category_redirects = \ - self.code in self.family.use_hard_category_redirects + self.use_hard_category_redirects = self.code in self.family.use_hard_category_redirects # following are for use with lock_page and unlock_page methods self._pagemutex = threading.Lock() @@ -209,7 +209,7 @@ return self._username[False] return None - def username(self, sysop = False): + def username(self, sysop=False): return self._username[sysop] def __getattr__(self, attr): @@ -219,19 +219,18 @@ return getattr(self.__class__, attr) try: method = getattr(self.family, attr) - f = lambda *args, **kwargs: \ - method(self.code, *args, **kwargs) + f = lambda *args, **kwargs: method(self.code, *args, **kwargs) if hasattr(method, "__doc__"): f.__doc__ = method.__doc__ return f except AttributeError: raise AttributeError("%s instance has no attribute '%s'" - % (self.__class__.__name__, attr) ) + % (self.__class__.__name__, attr)) def sitename(self): """Return string representing this Site's name and code.""" - return self.family.name+':'+self.code + return self.family.name + ':' + self.code __str__ = sitename @@ -264,7 +263,7 @@ nsnames = [name for name in self.namespaces().itervalues()] return [lang for lang in self.languages() - if lang[:1].upper() + lang[1:] not in nsnames] + if lang[:1].upper() + lang[1:] not in nsnames] def ns_index(self, namespace): """Given a namespace name, return its int index, or None if invalid.""" @@ -352,14 +351,14 @@ """Return Category in which disambig pages are listed.""" try: - name = self.namespace(14)+':'+self.family.disambcatname[self.code] + name = self.namespace(14) + ':' + self.family.disambcatname[self.code] except KeyError: raise Error(u"No disambiguation category name found for %(site)s" - % {'site': self}) + % {'site': self}) return pywikibot.Category(pywikibot.Link(name, self)) @deprecated("pywikibot.Link") - def linkto(self, title, othersite = None): + def linkto(self, title, othersite=None): """Return unicode string in the form of a wikilink to 'title' Use optional Site argument 'othersite' to generate an interwiki link. @@ -375,7 +374,7 @@ """ linkfam, linkcode = pywikibot.Link(text, self).parse_site() - return (linkfam != self.family.name or linkcode != self.code) + return linkfam != self.family.name or linkcode != self.code def redirectRegex(self, pattern=None): """Return a compiled regular expression matching on redirect pages. @@ -389,7 +388,7 @@ # arbitrary stuff, then a wikilink. The wikilink may contain # a label, although this is not useful. return re.compile(r'\s*#%(pattern)s\s*:?\s*\[\[(.+?)(?:\|.*?)?\]\]' - % locals(), + % locals(), re.IGNORECASE | re.UNICODE | re.DOTALL) def sametitle(self, title1, title2): @@ -413,7 +412,7 @@ ns2, name2 = title2.split(":", 1) else: ns2, name2 = 0, title2 - for space in self.namespaces(): # iterate over all valid namespaces + for space in self.namespaces(): # iterate over all valid namespaces if type(ns1) is not int and valid_namespace(ns1, space): ns1 = space if type(ns2) is not int and valid_namespace(ns2, space): @@ -470,8 +469,7 @@ # TODO: is this even needed? No family in the framework has this # dictionary defined! if self.lang in self.family.interwiki_putfirst_doubled: - if len(list_of_links) >= \ - self.family.interwiki_putfirst_doubled[self.lang][0]: + if len(list_of_links) >= self.family.interwiki_putfirst_doubled[self.lang][0]: links2 = [lang.language() for lang in list_of_links] result = [] for lang in self.family.interwiki_putfirst_doubled[self.lang][1]: @@ -540,104 +538,153 @@ def checkCharset(self, charset): raise NotImplementedError + def getToken(self, getalways=True, getagain=False, sysop=False): raise NotImplementedError + def export_address(self): raise NotImplementedError + def move_address(self): raise NotImplementedError + def delete_address(self, s): raise NotImplementedError + def undelete_view_address(self, s, ts=''): raise NotImplementedError + def undelete_address(self): raise NotImplementedError + def protect_address(self, s): raise NotImplementedError + def unprotect_address(self, s): raise NotImplementedError + def put_address(self, s): raise NotImplementedError + def get_address(self, s): raise NotImplementedError + def edit_address(self, s): raise NotImplementedError + def purge_address(self, s): raise NotImplementedError + def block_address(self): raise NotImplementedError + def unblock_address(self): raise NotImplementedError + def blocksearch_address(self, s): raise NotImplementedError + def linksearch_address(self, s, limit=500, offset=0): raise NotImplementedError + def search_address(self, q, n=50, ns=0): raise NotImplementedError - def allpages_address(self, s, ns = 0): + + def allpages_address(self, s, ns=0): raise NotImplementedError + def log_address(self, n=50, mode='', user=''): raise NotImplementedError + def newpages_address(self, n=50, namespace=0): raise NotImplementedError + def longpages_address(self, n=500): raise NotImplementedError + def shortpages_address(self, n=500): raise NotImplementedError + def unusedfiles_address(self, n=500): raise NotImplementedError + def categories_address(self, n=500): raise NotImplementedError + def deadendpages_address(self, n=500): raise NotImplementedError + def ancientpages_address(self, n=500): raise NotImplementedError + def lonelypages_address(self, n=500): raise NotImplementedError + def protectedpages_address(self, n=500): raise NotImplementedError + def unwatchedpages_address(self, n=500): raise NotImplementedError + def uncategorizedcategories_address(self, n=500): raise NotImplementedError + def uncategorizedimages_address(self, n=500): raise NotImplementedError + def uncategorizedpages_address(self, n=500): raise NotImplementedError + def uncategorizedtemplates_address(self, n=500): raise NotImplementedError + def unusedcategories_address(self, n=500): raise NotImplementedError + def wantedcategories_address(self, n=500): raise NotImplementedError + def withoutinterwiki_address(self, n=500): raise NotImplementedError + def references_address(self, s): raise NotImplementedError + def allmessages_address(self): raise NotImplementedError + def upload_address(self): raise NotImplementedError - def double_redirects_address(self, default_limit = True): + + def double_redirects_address(self, default_limit=True): raise NotImplementedError - def broken_redirects_address(self, default_limit = True): + + def broken_redirects_address(self, default_limit=True): raise NotImplementedError + def random_address(self): raise NotImplementedError + def randomredirect_address(self): raise NotImplementedError + def login_address(self): raise NotImplementedError + def captcha_image_address(self, id): raise NotImplementedError + def watchlist_address(self): raise NotImplementedError + def contribs_address(self, target, limit=500, offset=''): raise NotImplementedError + def globalusers_address(self, target='', limit=500, offset='', group=''): raise NotImplementedError -def must_be(group=None,right=None): + +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. @@ -704,23 +751,23 @@ # canonical forms are capitalized -2: [u"Media"], -1: [u"Special"], - 0: [u""], - 1: [u"Talk"], - 2: [u"User"], - 3: [u"User talk"], - 4: [u"Project"], - 5: [u"Project talk"], - 6: [u"Image"], - 7: [u"Image talk"], - 8: [u"MediaWiki"], - 9: [u"MediaWiki talk"], + 0: [u""], + 1: [u"Talk"], + 2: [u"User"], + 3: [u"User talk"], + 4: [u"Project"], + 5: [u"Project talk"], + 6: [u"Image"], + 7: [u"Image talk"], + 8: [u"MediaWiki"], + 9: [u"MediaWiki talk"], 10: [u"Template"], 11: [u"Template talk"], 12: [u"Help"], 13: [u"Help talk"], 14: [u"Category"], 15: [u"Category talk"], - } + } if self.family.versionnumber(self.code) >= 14: self._namespaces[6] = [u"File"] self._namespaces[7] = [u"File talk"] @@ -804,7 +851,7 @@ return True @deprecated("Site.user()") - def loggedInAs(self, sysop = False): + def loggedInAs(self, sysop=False): """Return the current username if logged in, otherwise return None. DEPRECATED (use .user() method instead) @@ -823,14 +870,14 @@ return loginMan = api.LoginManager(site=self, sysop=sysop, user=self._username[sysop]) - if loginMan.login(retry = True): + if loginMan.login(retry=True): self._username[sysop] = loginMan.username if hasattr(self, "_userinfo"): del self._userinfo self.getuserinfo() self._loginstatus = LoginStatus.AS_SYSOP if sysop else LoginStatus.AS_USER else: - self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure + self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure if not hasattr(self, "_siteinfo"): self._getsiteinfo() @@ -855,11 +902,11 @@ or self._userinfo['name'] != self._username["sysop" in self._userinfo["groups"]]): uirequest = api.Request( - site=self, - action="query", - meta="userinfo", - uiprop="blockinfo|hasmsg|groups|rights" - ) + site=self, + action="query", + meta="userinfo", + uiprop="blockinfo|hasmsg|groups|rights" + ) uidata = uirequest.submit() assert 'query' in uidata, \ "API userinfo response lacks 'query' key" @@ -887,7 +934,7 @@ _logger) return self.is_blocked(sysop) - def checkBlocks(self, sysop = False): + def checkBlocks(self, sysop=False): """Check if the user is blocked, and raise an exception if so.""" if self.is_blocked(sysop): # User blocked @@ -972,12 +1019,12 @@ """Return list of localized "word" magic words for the site.""" if not hasattr(self, "_magicwords"): sirequest = api.CachedRequest( - expiry=config.API_config_expiry, - site=self, - action="query", - meta="siteinfo", - siprop="magicwords" - ) + expiry=config.API_config_expiry, + site=self, + action="query", + meta="siteinfo", + siprop="magicwords" + ) try: sidata = sirequest.submit() assert 'query' in sidata, \ @@ -1017,7 +1064,7 @@ try: keywords = set(s.lstrip("#") for s in self.getmagicwords("redirect")) - keywords.add("REDIRECT") # just in case + keywords.add("REDIRECT") # just in case pattern = "(?:" + "|".join(keywords) + ")" except KeyError: # no localized keyword for redirects @@ -1035,23 +1082,23 @@ def _getsiteinfo(self, force=False): """Retrieve siteinfo and namespaces from site.""" sirequest = api.CachedRequest( - expiry=(0 if force else config.API_config_expiry), - site=self, - action="query", - meta="siteinfo", - siprop="general|namespaces|namespacealiases" - ) + expiry=(0 if force else config.API_config_expiry), + site=self, + action="query", + meta="siteinfo", + siprop="general|namespaces|namespacealiases" + ) try: sidata = sirequest.submit() except api.APIError: # hack for older sites that don't support 1.12 properties # probably should delete if we're not going to support pre-1.12 sirequest = api.Request( - site=self, - action="query", - meta="siteinfo", - siprop="general|namespaces" - ) + site=self, + action="query", + meta="siteinfo", + siprop="general|namespaces" + ) sidata = sirequest.submit() assert 'query' in sidata, \ @@ -1196,7 +1243,7 @@ if not self.sametitle(pageitem['title'], title): pywikibot.warning( u"loadpageinfo: Query on %s returned data on '%s'" - % (page, pageitem['title'])) + % (page, pageitem['title'])) continue api.update_page(page, pageitem) @@ -1241,8 +1288,7 @@ u"loadimageinfo: Query on %s returned data on '%s'" % (page, pageitem['title'])) api.update_page(page, pageitem) - return pageitem['imageinfo'] \ - if history else pageitem['imageinfo'][0] + return pageitem['imageinfo'] if history else pageitem['imageinfo'][0] def page_exists(self, page): """Return True if and only if page is an existing page on site.""" @@ -1296,7 +1342,7 @@ "getredirtarget: No 'redirects' found for page %s." % title) redirmap = dict((item['from'], item['to']) - for item in result['query']['redirects']) + for item in result['query']['redirects']) if title not in redirmap: raise RuntimeError( "getredirtarget: 'redirects' contains no key for page %s." @@ -1318,7 +1364,7 @@ return page._redirtarget def preloadpages(self, pagelist, groupsize=50, templates=False, - langlinks=False): + langlinks=False): """Return a generator to a list of preloaded pages. Note that [at least in current implementation] pages may be iterated @@ -1334,8 +1380,7 @@ from pywikibot.tools import itergroup for sublist in itergroup(pagelist, groupsize): pageids = [str(p._pageid) for p in sublist - if hasattr(p, "_pageid") - and p._pageid > 0] + if hasattr(p, "_pageid") and p._pageid > 0] cache = dict((p.title(withSection=False), p) for p in sublist) props = "revisions|info|categoryinfo" @@ -1344,17 +1389,15 @@ if langlinks: props += '|langlinks' rvgen = api.PropertyGenerator(props, site=self) - rvgen.set_maximum_items(-1) # suppress use of "rvlimit" parameter + rvgen.set_maximum_items(-1) # suppress use of "rvlimit" parameter if len(pageids) == len(sublist): # only use pageids if all pages have them rvgen.request["pageids"] = "|".join(pageids) else: rvgen.request["titles"] = "|".join(cache.keys()) - rvgen.request[u"rvprop"] = \ - u"ids|flags|timestamp|user|comment|content" + rvgen.request[u"rvprop"] = u"ids|flags|timestamp|user|comment|content" pywikibot.output(u"Retrieving %s pages from %s." - % (len(cache), self) - ) + % (len(cache), self)) for pagedata in rvgen: pywikibot.debug(u"Preloading %s" % pagedata, _logger) try: @@ -1373,7 +1416,7 @@ else: pywikibot.warning( u"preloadpages: Query returned unexpected title '%s'" - % pagedata['title']) + % pagedata['title']) continue except KeyError: pywikibot.debug(u"No 'title' in %s" % pagedata, _logger) @@ -1400,7 +1443,7 @@ if not self.sametitle(item['title'], page.title(withSection=False)): raise Error( u"token: Query on page %s returned data on page [[%s]]" - % (page.title(withSection=False, asLink=True), + % (page.title(withSection=False, asLink=True), item['title'])) api.update_page(page, item) pywikibot.debug(unicode(item), _logger) @@ -1429,8 +1472,7 @@ bltitle = page.title(withSection=False).encode(self.encoding()) blargs = {"gbltitle": bltitle} if filterRedirects is not None: - blargs["gblfilterredir"] = filterRedirects and "redirects" \ - or "nonredirects" + blargs["gblfilterredir"] = filterRedirects and "redirects" or "nonredirects" blgen = self._generator(api.PageGenerator, type_arg="backlinks", namespaces=namespaces, step=step, total=total, g_content=content, **blargs) @@ -1455,10 +1497,11 @@ continue if redir.getRedirectTarget() == page: genlist[redir.title()] = self.pagebacklinks( - redir, followRedirects=True, - filterRedirects=filterRedirects, - namespaces=namespaces, - content=content) + redir, followRedirects=True, + filterRedirects=filterRedirects, + namespaces=namespaces, + content=content + ) return itertools.chain(*genlist.values()) return blgen @@ -1476,11 +1519,9 @@ (default False) """ - eiargs = {"geititle": - page.title(withSection=False).encode(self.encoding())} + eiargs = {"geititle": page.title(withSection=False).encode(self.encoding())} if filterRedirects is not None: - eiargs["geifilterredir"] = filterRedirects and "redirects"\ - or "nonredirects" + eiargs["geifilterredir"] = filterRedirects and "redirects" or "nonredirects" eigen = self._generator(api.PageGenerator, type_arg="embeddedin", namespaces=namespaces, step=step, total=total, g_content=content, **eiargs) @@ -1501,15 +1542,14 @@ namespaces=namespaces, step=step, total=total, content=content) return itertools.islice( - itertools.chain( - self.pagebacklinks( - page, followRedirects, filterRedirects, - namespaces=namespaces, step=step, content=content), - self.page_embeddedin( - page, filterRedirects, namespaces=namespaces, - step=step, content=content) - ), - total) + itertools.chain( + self.pagebacklinks( + page, followRedirects, filterRedirects, + namespaces=namespaces, step=step, content=content), + self.page_embeddedin( + page, filterRedirects, namespaces=namespaces, + step=step, content=content) + ), total) def pagelinks(self, page, namespaces=None, follow_redirects=False, step=None, total=None, content=False): @@ -1536,7 +1576,7 @@ g_content=content, **plargs) return plgen - @deprecate_arg("withSortKey", None) # Sortkey doesn't work with generator + @deprecate_arg("withSortKey", None) # Sortkey doesn't work with generator def pagecategories(self, page, step=None, total=None, content=False): """Iterate categories to which page belongs. @@ -1549,8 +1589,7 @@ if hasattr(page, "_pageid"): clargs['pageids'] = str(page._pageid) else: - clargs['titles'] = page.title(withSection=False - ).encode(self.encoding()) + clargs['titles'] = page.title(withSection=False).encode(self.encoding()) clgen = self._generator(api.CategoryPageGenerator, type_arg="categories", step=step, total=total, g_content=content, **clargs) @@ -1634,8 +1673,8 @@ cmargs["gcmsort"] = sortby elif sortby: raise ValueError( - "categorymembers: invalid sortby value '%(sortby)s'" - % locals()) + "categorymembers: invalid sortby value '%(sortby)s'" + % locals()) if starttime and endtime and starttime > endtime: raise ValueError( "categorymembers: starttime must be before endtime") @@ -1762,8 +1801,7 @@ type_arg=u"info|revisions", revids=ids, step=step, total=total) if getText: - rvgen.request[u"rvprop"] = \ - u"ids|flags|timestamp|user|comment|content" + rvgen.request[u"rvprop"] = u"ids|flags|timestamp|user|comment|content" if section is not None: rvgen.request[u"rvsection"] = unicode(section) if latest or "revids" in rvgen.request: @@ -1857,7 +1895,7 @@ self.getcategoryinfo(category) if not hasattr(category, "_catinfo"): # a category that exists but has no contents returns no API result - category._catinfo = {'size':0, 'pages':0, 'files':0, 'subcats':0} + category._catinfo = {'size': 0, 'pages': 0, 'files': 0, 'subcats': 0} return category._catinfo @deprecate_arg("throttle", None) @@ -1901,8 +1939,8 @@ raise Error("allpages: only one namespace permitted.") if includeredirects is not None: pywikibot.debug( -u"allpages: 'includeRedirects' argument is deprecated; use 'filterredirs'.", - _logger) + u"allpages: 'includeRedirects' argument is deprecated; use 'filterredirs'.", + _logger) if includeredirects: if includeredirects == "only": filterredirs = True @@ -1946,7 +1984,6 @@ """ return self.allpages(prefix=prefix, namespace=namespace, includeredirects=includeredirects) - def alllinks(self, start="!", prefix="", namespace=0, unique=False, fromids=False, step=None, total=None): @@ -2103,15 +2140,14 @@ if reverse: if starttime > endtime: raise pywikibot.Error( - "blocks: starttime must be before endtime with reverse=True") + "blocks: starttime must be before endtime with reverse=True") else: if endtime > starttime: raise pywikibot.Error( - "blocks: endtime must be before starttime with reverse=False") + "blocks: endtime must be before starttime with reverse=False") bkgen = self._generator(api.ListGenerator, type_arg="blocks", step=step, total=total) - bkgen.request["bkprop"] = \ - "id|user|by|timestamp|expiry|reason|range|flags" + bkgen.request["bkprop"] = "id|user|by|timestamp|expiry|reason|range|flags" if starttime: bkgen.request["bkstart"] = str(starttime) if endtime: @@ -2156,7 +2192,7 @@ iuargs = dict(giutitle=image.title(withSection=False)) if filterredir is not None: iuargs["giufilterredir"] = (filterredir and "redirects" - or "nonredirects") + or "nonredirects") iugen = self._generator(api.PageGenerator, type_arg="imageusage", namespaces=namespaces, step=step, total=total, g_content=content, **iuargs) @@ -2181,11 +2217,11 @@ if reverse: if end < start: raise Error( - "logevents: end must be later than start with reverse=True") + "logevents: end must be later than start with reverse=True") else: if start < end: raise Error( - "logevents: start must be later than end with reverse=False") + "logevents: start must be later than end with reverse=False") legen = self._generator(api.LogEntryListGenerator, type_arg=logtype, step=step, total=total) if logtype is not None: @@ -2235,11 +2271,11 @@ if reverse: if end < start: raise Error( - "recentchanges: end must be later than start with reverse=True") + "recentchanges: end must be later than start with reverse=True") else: if start < end: raise Error( - "recentchanges: start must be later than end with reverse=False") + "recentchanges: start must be later than end with reverse=False") rcgen = self._generator(api.ListGenerator, type_arg="recentchanges", rcprop="user|comment|timestamp|title|ids" "|sizes|redirect|loginfo|flags", @@ -2273,7 +2309,7 @@ rcshow = [] for item in filters: if filters[item] is not None: - rcshow.append(filters[item] and item or ("!"+item)) + rcshow.append(filters[item] and item or ("!" + item)) if rcshow: rcgen.request["rcshow"] = "|".join(rcshow) return rcgen @@ -2408,7 +2444,7 @@ wlshow = [] for item in filters: if filters[item] is not None: - wlshow.append(filters[item] and item or ("!"+item)) + wlshow.append(filters[item] and item or ("!" + item)) if wlshow: wlgen.request["wlshow"] = "|".join(wlshow) return wlgen @@ -2439,7 +2475,7 @@ else: if start < end: raise Error( -"deletedrevs: start must be later than end with reverse=False") + "deletedrevs: start must be later than end with reverse=False") if not self.logged_in(): self.login() if "deletedhistory" not in self.userinfo['rights']: @@ -2449,8 +2485,8 @@ pass if "deletedhistory" not in self.userinfo['rights']: raise Error( -"deletedrevs: User:%s not authorized to access deleted revisions." - % self.user()) + "deletedrevs: User:%s not authorized to access deleted revisions." + % self.user()) if get_text: if "undelete" not in self.userinfo['rights']: try: @@ -2459,8 +2495,8 @@ pass if "undelete" not in self.userinfo['rights']: raise Error( -"deletedrevs: User:%s not authorized to view deleted content." - % self.user()) + "deletedrevs: User:%s not authorized to view deleted content." + % self.user()) drgen = self._generator(api.ListGenerator, type_arg="deletedrevs", titles=page.title(withSection=False), @@ -2486,8 +2522,9 @@ if not isinstance(usernames, basestring): usernames = u"|".join(usernames) usgen = api.ListGenerator( - "users", ususers=usernames, site=self, - usprop="blockinfo|groups|editcount|registration|emailable") + "users", ususers=usernames, site=self, + usprop="blockinfo|groups|editcount|registration|emailable" + ) return usgen def randompages(self, step=None, total=1, namespaces=None, @@ -2515,31 +2552,19 @@ # catalog of editpage error codes, for use in generating messages _ep_errors = { "noapiwrite": "API editing not enabled on %(site)s wiki", - "writeapidenied": -"User %(user)s is not authorized to edit on %(site)s wiki", - "protectedtitle": -"Title %(title)s is protected against creation on %(site)s", - "cantcreate": -"User %(user)s not authorized to create new pages on %(site)s wiki", - "cantcreate-anon": -"""Bot is not logged in, and anon users are not authorized to create new pages -on %(site)s wiki""", + "writeapidenied": "User %(user)s is not authorized to edit on %(site)s wiki", + "protectedtitle": "Title %(title)s is protected against creation on %(site)s", + "cantcreate": "User %(user)s not authorized to create new pages on %(site)s wiki", + "cantcreate-anon": """Bot is not logged in, and anon users are not authorized to create new pages on %(site)s wiki""", "articleexists": "Page %(title)s already exists on %(site)s wiki", - "noimageredirect-anon": -"""Bot is not logged in, and anon users are not authorized to create image -redirects on %(site)s wiki""", - "noimageredirect": -"User %(user)s not authorized to create image redirects on %(site)s wiki", - "spamdetected": -"Edit to page %(title)s rejected by spam filter due to content:\n", + "noimageredirect-anon": """Bot is not logged in, and anon users are not authorized to create image redirects on %(site)s wiki""", + "noimageredirect": "User %(user)s not authorized to create image redirects on %(site)s wiki", + "spamdetected": "Edit to page %(title)s rejected by spam filter due to content:\n", "filtered": "%(info)s", "contenttoobig": "%(info)s", - "noedit-anon": -"""Bot is not logged in, and anon users are not authorized to edit on -%(site)s wiki""", + "noedit-anon": """Bot is not logged in, and anon users are not authorized to edit on %(site)s wiki""", "noedit": "User %(user)s not authorized to edit pages on %(site)s wiki", - "pagedeleted": -"Page %(title)s has been deleted since last retrieved from %(site)s wiki", + "pagedeleted": "Page %(title)s has been deleted since last retrieved from %(site)s wiki", "editconflict": "Page %(title)s not saved due to edit conflict.", } @@ -2609,7 +2634,7 @@ elif watch: pywikibot.warning( u"editpage: Invalid watch value '%(watch)s' ignored." - % locals()) + % locals()) ## FIXME: API gives 'badmd5' error ## md5hash = md5() ## md5hash.update(urllib.quote_plus(text.encode(self.encoding()))) @@ -2623,8 +2648,7 @@ except api.APIError, err: self.unlock_page(page) if err.code.endswith("anon") and self.logged_in(): - pywikibot.debug( -u"editpage: received '%s' even though bot is logged in" % err.code, + pywikibot.debug(u"editpage: received '%s' even though bot is logged in" % err.code, _logger) errdata = { 'site': self, @@ -2634,7 +2658,7 @@ } if err.code == "spamdetected": raise SpamfilterError(self._ep_errors[err.code] % errdata - + err.info[ err.info.index("fragment: ") + 9: ]) + + err.info[err.info.index("fragment: ") + 9:]) if err.code == "editconflict": raise EditConflict(self._ep_errors[err.code] % errdata) @@ -2644,7 +2668,7 @@ raise Error(self._ep_errors[err.code] % errdata) pywikibot.debug( u"editpage: Unexpected error code '%s' received." - % err.code, + % err.code, _logger) raise assert ("edit" in result and "result" in result["edit"]), result @@ -2653,7 +2677,7 @@ if "nochange" in result["edit"]: # null edit, page not changed pywikibot.log(u"Page [[%s]] saved without any changes." - % page.title()) + % page.title()) return True page._revid = result["edit"]["newrevid"] # see http://www.mediawiki.org/wiki/API:Wikimania_2006_API_discussion#Notes @@ -2675,8 +2699,8 @@ else: self.unlock_page(page) pywikibot.error( - u"editpage: unknown CAPTCHA response %s, page not saved" - % captcha) + u"editpage: unknown CAPTCHA response %s, page not saved" + % captcha) return False else: self.unlock_page(page) @@ -2686,8 +2710,8 @@ else: self.unlock_page(page) pywikibot.error( -u"editpage: Unknown result code '%s' received; page not saved" - % result["edit"]["result"]) + u"editpage: Unknown result code '%s' received; page not saved" + % result["edit"]["result"]) pywikibot.log(str(result)) return False @@ -2759,8 +2783,8 @@ except api.APIError, err: if err.code.endswith("anon") and self.logged_in(): pywikibot.debug( -u"movepage: received '%s' even though bot is logged in" % err.code, - _logger) + u"movepage: received '%s' even though bot is logged in" % err.code, + _logger) errdata = { 'site': self, 'oldtitle': oldtitle, @@ -2772,7 +2796,7 @@ if err.code in self._mv_errors: raise Error(self._mv_errors[err.code] % errdata) pywikibot.debug(u"movepage: Unexpected error code '%s' received." - % err.code, + % err.code, _logger) raise finally: @@ -2823,9 +2847,9 @@ u"Rollback of %s aborted; only one user in revision history." % page.title(asLink=True)) summary = summary or ( -u"Reverted edits by [[Special:Contributions/%(last_user)s|%(last_user)s]] " -u"([[User talk:%(last_user)s|Talk]]) to last version by %(prev_user)s" - % locals()) + u"Reverted edits by [[Special:Contributions/%(last_user)s|%(last_user)s]] "" + u"([[User talk:%(last_user)s|Talk]]) to last version by %(prev_user)s" + % locals()) token = self.token(page, "rollback") self.lock_page(page) req = api.Request(site=self, action="rollback", @@ -2843,7 +2867,7 @@ if err.code in self._rb_errors: raise Error(self._rb_errors[err.code] % errdata) pywikibot.debug(u"rollback: Unexpected error code '%s' received." - % err.code, + % err.code, _logger) raise finally: -- To view, visit https://gerrit.wikimedia.org/r/80294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e09bf2655bd9c7f39f981bfc8381c0ee8168ec8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] use **kwargs in ItemPage.addClaim to support edit summary - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: use **kwargs in ItemPage.addClaim to support edit summary ...................................................................... use **kwargs in ItemPage.addClaim to support edit summary The Wikibase extension (used on Wikidata) has recently enabled the edit summary on entities. ItemPage.editEntity and Claim.addSource already support it, but ItemPage.addClaim doesn't. Change-Id: Id70a0be601f603238c8eed817cc5fc58c4705c88 --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 7956ae1..8816da2 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2615,7 +2615,7 @@ data = {'sitelinks': data} self.editEntity(data, **kwargs) - def addClaim(self, claim, bot=True): + def addClaim(self, claim, bot=True, **kwargs): """ Adds the claim to the item @param claim The claim to add @@ -2623,7 +2623,7 @@ @param bot Whether to flag as bot (if possible) @type bot bool """ - self.repo.addClaim(self, claim, bot=bot) + self.repo.addClaim(self, claim, bot=bot, **kwargs) claim.on_item = self def removeClaims(self, claims, **kwargs): diff --git a/pywikibot/site.py b/pywikibot/site.py index ef00047..7f2563b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3439,7 +3439,7 @@ return data @must_be(group='user') - def addClaim(self, item, claim, bot=True): + def addClaim(self, item, claim, bot=True, **kwargs): params = dict(action='wbcreateclaim', entity=item.getID(), @@ -3451,6 +3451,8 @@ params['bot'] = 1 if claim.getSnakType() == 'value': params['value'] = json.dumps(claim._formatDataValue()) + if 'summary' in kwargs: + params['summary'] = kwargs['summary'] params['token'] = self.token(item, 'edit') req = api.Request(site=self, **params) data = req.submit() @@ -3545,7 +3547,7 @@ params['claim'] = '|'.join(claim.snak for claim in claims) params['token'] = self.token(pywikibot.Page(self, u'Main Page'), 'edit') # Use a dummy page for kwarg in kwargs: - if kwarg in ['bot', 'baserevid']: + if kwarg in ['bot', 'baserevid', 'summary']: params[kwarg] = kwargs[kwarg] req = api.Request(site=self, **params) data = req.submit() -- To view, visit https://gerrit.wikimedia.org/r/81156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id70a0be601f603238c8eed817cc5fc58c4705c88 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified scripts/imageuncat.py ...................................................................... pep8-ified scripts/imageuncat.py Change-Id: I64d0b4d4913d8650f1d2a43ce97440d5db7a56e9 --- M scripts/imageuncat.py 1 file changed, 1,215 insertions(+), 1,206 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index aa3ff6c..1f7e9ff 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -13,7 +13,10 @@ # # -import os, sys, re, codecs +import os +import sys +import re +import codecs from datetime import datetime from datetime import timedelta import pywikibot @@ -42,1219 +45,1221 @@ u'Uncat'] #Ignore the templates in this really long list when looking for relevant categories -ignoreTemplates = [ u'1000Bit', - u'1922 cyc', - u'2MASS', - u'Aa', - u'Ab', - u'AbuGhraibPic', - u'ADRM', - u'ADRM2', - u'AerialPhotograph-mlitJP', - u'Af', - u'Agência Brasil', - u'AgenciaBrasil', - u'AgenciaCamaraBr', - u'AgenciaSenadoBr', - u'Ak', - u'AL2TB', - u'Alabordache', - u'Alexj2002C220PD', - u'Alexj2002InkscapePD', - u'Aln', - u'Als', - u'Am', - u'An', - u'Ang', - u'Anonymous work', - u'AnotherAuthor', - u'Apache', - u'Ar', - u'Arc', - u'Arn', - u'Artistic-2', - u'As', - u'Ashipilin', - u'AskedForInfo', - u'Ast', - u'AstronautPhoto', - u'Attribution', - u'Attribution Entomart', - u'Attribution-Ubisoft', - u'Auroranorthlicense', - u'Author-de', - u'Autorisation photos aériennes Francis Leroy', - u'Autotravel', - u'Av', - u'Avk', - u'Ay', - u'Az', - u'Ba', - u'BadJPEG', - u'Bar', - u'BArch-License', - u'BArch-link', - u'Bat-smg', - u'Bcl', - u'Be', - u'Be-tarask', - u'Be-x-old', - u'BeeldbankVenW', - u'Bg', - u'Bh', - u'Bi', - u'Blue Marble', - u'Bm', - u'Bmz', - u'Bn', - u'Bo', - u'Botev license', - u'Botev relicensed', - u'BotMoveToCommons', - u'Bpy', - u'Br', - u'Bs', - u'BSD', - u'BSDwithdisclaimer', - u'Byp', - u'C0', - u'Ca', - u'CatedralDeSal', - u'Cc', - u'CC-AR-Presidency', - u'Cc-by', - u'Cc-by-1.0', - u'Cc-by-1.0-nl', - u'Cc-by-2.0', - u'Cc-by-2.0-at', - u'Cc-by-2.0-be', - u'Cc-by-2.0-br', - u'Cc-by-2.0-cl', - u'Cc-by-2.0-de', - u'Cc-by-2.0-es', - u'Cc-by-2.0-fr', - u'Cc-by-2.0-it', - u'Cc-by-2.0-kr', - u'Cc-by-2.0-nl', - u'Cc-by-2.0-uk', - u'Cc-by-2.1-au', - u'Cc-by-2.1-es', - u'Cc-by-2.1-jp', - u'Cc-by-2.5', - u'Cc-by-2.5-bg', - u'Cc-by-2.5-br', - u'Cc-by-2.5-dk', - u'Cc-by-2.5-es', - u'Cc-by-2.5-in', - u'Cc-by-2.5-it', - u'Cc-by-2.5-my', - u'Cc-by-2.5-nl', - u'Cc-by-2.5-pl', - u'Cc-by-2.5-se', - u'Cc-by-2.5,2.0,1.0', - u'Cc-by-3.0', - u'Cc-by-3.0-gr', - u'Cc-by-3.0-IndiaFM', - u'Cc-by-3.0-nl', - u'Cc-by-3.0-rs', - u'Cc-by-3.0-us', - u'Cc-by-3.0,2.5,2.0,1.0', - u'Cc-by-all', - u'Cc-by-nc-sa-2.0-dual', - u'Cc-by-sa', - u'Cc-by-sa-1.0', - u'Cc-by-sa-1.0-fi', - u'Cc-by-sa-1.0-tw', - u'Cc-by-sa-2.0', - u'Cc-by-sa-2.0-at', - u'Cc-by-sa-2.0-au', - u'Cc-by-sa-2.0-be', - u'Cc-by-sa-2.0-br', - u'Cc-by-sa-2.0-ca', - u'Cc-by-sa-2.0-cl', - u'Cc-by-sa-2.0-de', - u'Cc-by-sa-2.0-es', - u'Cc-by-sa-2.0-fr', - u'Cc-by-sa-2.0-it', - u'Cc-by-sa-2.0-kr', - u'Cc-by-sa-2.0-nl', - u'Cc-by-sa-2.0-tw', - u'Cc-by-sa-2.0-uk', - u'Cc-by-sa-2.1-au', - u'Cc-by-sa-2.1-es', - u'Cc-by-sa-2.1-jp', - u'Cc-by-sa-2.5', - u'CC-BY-SA-2.5', - u'Cc-by-sa-2.5-ar', - u'Cc-by-sa-2.5-au', - u'Cc-by-sa-2.5-bg', - u'Cc-by-sa-2.5-br', - u'Cc-by-sa-2.5-ca', - u'Cc-by-sa-2.5-ch', - u'Cc-by-sa-2.5-cl', - u'Cc-by-sa-2.5-cn', - u'Cc-by-sa-2.5-de', - u'Cc-by-sa-2.5-dk', - u'Cc-by-sa-2.5-es', - u'Cc-by-sa-2.5-hu', - u'Cc-by-sa-2.5-in', - u'Cc-by-sa-2.5-it', - u'Cc-by-sa-2.5-mx', - u'Cc-by-sa-2.5-my', - u'Cc-by-sa-2.5-nl', - u'Cc-by-sa-2.5-pl', - u'Cc-by-sa-2.5-pt', - u'Cc-by-sa-2.5-se', - u'Cc-by-sa-2.5-si', - u'Cc-by-sa-2.5-tw', - u'Cc-by-sa-2.5,1.0', - u'Cc-by-sa-2.5,2.0,1.0', - u'Cc-by-sa-2.5,2.0,1.0-no-link', - u'Cc-by-sa-3.0', - u'Cc-by-sa-3.0-gr', - u'Cc-by-sa-3.0-nl', - u'Cc-by-sa-3.0-rs', - u'Cc-by-sa-3.0-tw', - u'Cc-by-sa-3.0-us', - u'Cc-by-sa-3.0,2.5,2.0,1.0', - u'Cc-by-sa-3.0,2.5,2.0,1.0-no-link', - u'Cc-by-sa-all', - u'Cc-by-sa-jul', - u'CC-LukeFord', - u'Cc-pd', - u'Cc-sa-1.0', - u'Cc-zero', - u'Cdo', - u'Ce', - u'Ceb', - u'CeCILL', - u'CERN-CMS', - u'Ch', - u'China-PD', - u'Cho', - u'Chr', - u'Chuck', - u'Chy', - u'Cityview', - u'Cityview2', - u'Civertan license', - u'Claude', - u'CNG', - u'Co', - u'Coa-Germany-b1945', - u'Coloured SVG boxes', - u'Common Public License', - u'Contact-VP', - u'Convert to SVG', - u'CopyAttribEmail', - u'Copyright by Wikimedia', - u'Copyright jalpeyrie', - u'Copyrighted free use', - u'Copyrighted free use provided that', - u'Copyrighted IOC', - u'CopyrightedFreeUse', - u'CopyrightedFreeUse-Link', - u'Cr', - u'Created by ForrestSjap', - u'Created with Inkscape', - u'Creator', - u'Credit line', - u'Credits-panoramafotos.net', - u'Crh', - u'Crh-cyrl', - u'Croatian currency', - u'Cs', - u'Csb', - u'Cu', - u'Cv', - u'Cy', - u'Cz', - u'Da', - u'Date', - u'De', - u'De-cc-by-sa-2.0', - u'Debora Cordeiro', - u'Diq', - u'DMonniaux', - u'DMonniaux-DADVSI-20060507', - u'Dsb', - u'DSL', - u'Dum', - u'Dv', - u'Dz', - u'EdwardCurtis', - u'Ee', - u'EEK banknote', - u'EEK coin', - u'El', - u'Elephants Dream', - u'Eml', - u'En', - u'En icon', - u'Eo', - u'EPL', - u'Erin Silversmith Licence', - u'Es', - u'EST-Land Board', - u'Estremeñu', - u'Et', - u'Eu', - u'EU location', - u'Euro coin common face', - u'Europe location', - u'Expat', - u'Ext', - u'Fa', - u'FAL', - u'Fancyfootworklicense', - u'Faroe stamps', - u'Fcb981c', - u'Ff', - u'Fi', - u'FirefoxWiki', - u'Fiu-vro', - u'Fj', - u'Flag-Germany-b1945', - u'Flickr', - u'Flickr-change-of-license', - u'Flickr-unfree-but', - u'Flickrreview', - u'Fo', - u'FOLP', - u'FOP', - u'Fr', - u'Fr icon', - u'Frc', - u'Free screenshot', - u'Frp', - u'Fur', - u'FWL', - u'Fy', - u'Ga', - u'Gag', - u'Gakk Copyright', - u'Gan', - u'Gd', - u'Geograph', - u'GFDL', - u'GFDL or cc-by-nc-sa', - u'GFDL or cc-by-nc-sa/2.5', - u'GFDL-1.2', - u'GFDL-1.2-en', - u'GFDL-CC-triple', - u'GFDL-DD', - u'GFDL-en', - u'GFDL-GMT', - u'GFDL-Institut de Qualitat Agroalimentària', - u'GFDL-IS', - u'GFDL-it', - u'GFDL-ja', - u'GFDL-Landsat-Kashmir3d', - u'GFDL-OpenGeoDB', - u'GFDL-retouched', - u'GFDL-Samoborac', - u'GFDL-self', - u'GFDL-Self', - u'GFDL-self-en', - u'GFDL-user', - u'GFDL-user-als', - u'GFDL-user-ar', - u'GFDL-user-bat-smg', - u'GFDL-user-bs', - u'GFDL-user-cs', - u'GFDL-user-da', - u'GFDL-user-de', - u'GFDL-user-el', - u'GFDL-user-en', - u'GFDL-user-en-no-disclaimers', - u'GFDL-user-en-note', - u'GFDL-user-en-with-disclaimers', - u'GFDL-user-es', - u'GFDL-user-fa', - u'GFDL-user-fi', - u'GFDL-user-fr', - u'GFDL-user-gl', - u'GFDL-user-he', - u'GFDL-user-hi', - u'GFDL-user-hu', - u'GFDL-user-id', - u'GFDL-user-it', - u'GFDL-user-ja', - u'GFDL-user-ko', - u'GFDL-user-lt', - u'GFDL-user-nl', - u'GFDL-user-nn', - u'GFDL-user-no', - u'GFDL-user-pl', - u'GFDL-user-pt', - u'GFDL-user-ru', - u'GFDL-user-sk', - u'GFDL-user-sq', - u'GFDL-user-tr', - u'GFDL-user-uk', - u'GFDL-user-vi', - u'GFDL-user-vls', - u'GFDL-user-w', - u'GFDL-user-zh', - u'Giovannino Copyright', - u'Gl', - u'Glk', - u'Gloumouth1Credit', - u'Gn', - u'GNOME-icon-theme', - u'Got', - u'GPL', - u'GPLv2 only', - u'GPLv3', - u'Gr', - u'Grays Anatomy plate', - u'Gu', - u'Gv', - u'GWArt', - u'GWArtOld', - u'GWPDA', - u'Ha', - u'HAER', - u'Hak', - u'Halibutt Copyright GFDL', - u'Halibutt Copyright Ogg', - u'HALS', - u'Harry', - u'Harry2', - u'Haw', - u'He', - u'Heraldic Badge', - u'Hi', - u'Hiuppo Copyright GFDL', - u'Ho', - u'Hr', - u'Hsb', - u'Ht', - u'Hu', - u'Hy', - u'Hz', - u'Ia', - u'Ibiblio-Hyperwar.org', - u'Icelandic currency', - u'Icelandic stamp', - u'Id', - u'Ie', - u'Ig', - u'Ii', - u'Ik', - u'Ike-latn', - u'Ilo', - u'ImageUpload', - u'Img-confirmation', - u'INewton', - u'Information', - u'Information Picswiss', - u'Inkscape', - u'Insignia', - u'Insignia Catalonia', - u'Insignia Navarre', - u'Io', - u'IPPAR', - u'Is', - u'It', - u'It icon', - u'Iu', - u'Ja', - u'Ja2', - u'James K. Lindsey permission', - u'Jbo', - u'Jean-PolGRANDMONTCredit', - u'JewishEncyclopedia', - u'Joergens.mi licence', - u'JPEG version of PNG', - u'Jv', - u'Ka', - u'Kaa', - u'Kab', - u'Kameno doba', - u'Kg', - u'Ki', - u'Kirkeinfo', - u'Kirkenorge', - u'Kj', - u'Kk', - u'Kl', - u'Km', - u'Kn', - u'Ko', - u'Kopimi', - u'Kr', - u'Krj', - u'Ks', - u'Ksh', - u'Ku', - u'Kv', - u'Kw', - u'Ky', - u'La', - u'LA2-Blitz', - u'Lad', - u'Lan', - u'LarsenCopyright', - u'Lb', - u'Lbe', - u'Lfn', - u'Lg', - u'LGPL', - u'Li', - u'LibriVox public domain', - u'License', - u'Lij', - u'LinuxeristCopyright', - u'Lld', - u'Lmo', - u'Ln', - u'Lo', - u'LOC-image', - u'LOC-pchrom', - u'LOC-prok', - u'LOC-prokc', - u'Location', - u'Location dec', - u'Location dms', - u'LocationRequired', - u'Lothar1976', - u'Loz', - u'Ls', - u'Lt', - u'Lueger', - u'Lv', - u'LviatourCredit', - u'Map of Japan-Shigenobu AOKI', - u'Map-Austria-GNu', - u'Marine-marchande.net', - u'MartinX', - u'Master son', - u'MdB', - u'Mdf', - u'Met.no', - u'Mg', - u'Mh', - u'Mi', - u'Mildenhall', - u'MindInfo', - u'MIT', - u'Mk', - u'Ml', - u'MLDoan', - u'Mn', - u'Mo', - u'MoengCredit', - u'Money-EU banknote', - u'Money-Eu', - u'Money-REAL', - u'MORS', - u'MPL', - u'Mr', - u'Ms', - u'Mt', - u'MTL', - u'Museum.ru', - u'My', - u'Myv', - u'Mzn', - u'Na', - u'Nah', - u'Namespace', - u'NAMESPACE', - u'Nap', - u'NAUMANN', - u'Nb', - u'Nds', - u'Nds-nl', - u'Ne', - u'NetMarine', - u'New', - u'Newsflash Photo', - u'Ng', - u'NGC7000', - u'NGruev', - u'NGW', - u'Ngw2', - u'Nickshanks-cc-by-2.0-email', - u'Njegos.org', - u'Nl', - u'Nl icon', - u'Nn', - u'Nn icon', - u'No', - u'No icon', - u'Non', - u'Norges Golfforbund', - u'Norwegian coat of arms', - u'Not-PD-US-URAA', - u'Nov', - u'Nrbelex Photo', - u'Nrbelex Photo 400D', - u'Nrm', - u'Nso', - u'Nv', - u'Ny', - u'NYC Subway map', - u'NYPL-image-full', - u'OAL', - u'Object location', - u'Oc', - u'OldOS', - u'Olessi Copyright Ogg', - u'Om', - u'Open Beelden', - u'Open Font', - u'Openphotoreview', - u'Or', - u'Originally uploaded', - u'Os', - u'OsborneFossils', - u'OTrondal', - u'OTRS', - u'Otrs pending', - u'OTRS pending', - u'Own', - u'Own work', - u'Pa', - u'Pag', - u'PAGENAME', - u'PAGENAMEE', - u'Painting', - u'Pam', - u'Pap', - u'Parlament.ch', - u'PAshieldsource', - u'PBresseler', - u'PCL', - u'PD', - u'PD Colombia', - u'PD patents', - u'PD-1923', - u'PD-AB-exempt', - u'PD-Abdul Hamid', - u'PD-AIGA', - u'PD-Albania-exempt', - u'PD-Algeria', - u'PD-AM-exempt', - u'PD-ancient-script', - u'PD-AR-Anonymous', - u'PD-AR-Movie', - u'PD-AR-Photo', - u'PD-Archivesnormandie', - u'PD-Armenia', - u'PD-Art', - u'PD-art', - u'PD-art-life-70', - u'PD-art-US', - u'PD-Art-YorckProject', - u'PD-Australia', - u'PD-AustrianGov', - u'PD-author', - u'PD-AZ-exempt', - u'PD-Azerbaijan', - u'PD-Bahrain', - u'PD-Bain', - u'PD-Bangladesh', - u'PD-because', - u'PD-BH-exempt', - u'PD-BnFMandragorePic', - u'PD-Brady-Handy', - u'PD-Brazil-media', - u'PD-BrazilGov', - u'PD-Britannica', - u'PD-Brockhaus&Efron', - u'PD-BulgarianGov', - u'PD-BW', - u'PD-BY-exempt', - u'PD-Canada', - u'PD-Canada-creator', - u'PD-Canada-Crown', - u'PD-Canada-photo', - u'PD-Canada-stamp', - u'PD-Challenger Report', - u'PD-chem', - u'PD-Chile', - u'PD-China', - u'PD-Coa-Finland', - u'PD-Coa-Germany', - u'PD-Coa-Hungary', - u'PD-Coins-Krenzer', - u'PD-collective anonymous work', - u'PD-copyright holder', - u'PD-Croatia', - u'PD-CroatiaGov', - u'PD-CSIRO', - u'PD-Cuba', - u'PD-CzechGov', - u'PD-DAUI', - u'PD-DBZ stamps', - u'PD-Demis', - u'PD-Denmark50', - u'PD-DenmarkEVH', - u'PD-Detroit', - u'PD-Deutsche Bundespost stamps', - u'PD-Edison Records', - u'PD-EE-exempt', - u'PD-EEA', - u'PD-Egypt', - u'PD-EstoniaPub', - u'PD-EU-no author disclosure', - u'PD-Feldman-1905', - u'PD-Fiji', - u'PD-Finland', - u'PD-Finland50', - u'PD-FinlandGov', - u'PD-flag', - u'PD-Flag', - u'PD-flag-50', - u'PD-Flag-Germany', - u'PD-FLGov', - u'PD-font', - u'PD-FOP-DE', - u'PD-Fröléens konversationslexikon', - u'PD-GallicaPic', - u'PD-GDR stamps', - u'PD-GE-exempt', - u'PD-Generic', - u'PD-German Empire stamps', - u'PD-German postmarks', - u'PD-German stamps', - u'PD-GermanGov', - u'PD-Google books', - u'PD-Gottscho', - u'PD-GreekGov', - u'PD-Gutenberg', - u'PD-heirs', - u'PD-Highsmith', - u'PD-HK', - u'PD-HK-PR', - u'PD-HU-exempt', - u'PD-Hubble', - u'PD-IDGov', - u'PD-IDOld-Art29', - u'PD-IDOld-Art30', - u'PD-imf.org', - u'PD-India', - u'PD-ineligible', - u'PD-Internationale', - u'PD-Iran', - u'PD-Iraq', - u'PD-Ireland', - u'PD-IrishGov', - u'PD-Israel', - u'PD-Israel-Photo', - u'PD-ItalyGov', - u'PD-Japan', - u'PD-Japan-exempt', - u'PD-Japan-film', - u'PD-Japan-oldphoto', - u'PD-Japan-organization', - u'PD-Jordan', - u'PD-Jordan-Photo', - u'PD-JORF', - u'PD-JORF-nor-conso', - u'PD-Kenya', - u'PD-KG-exempt', - u'PD-Kuwait', - u'PD-KZ-exempt', - u'PD-Lebanon', - u'PD-Libya', - u'PD-link', - u'PD-LOC', - u'PD-Look', - u'PD-LosAlamos', - u'PD-Lozinski', - u'PD-LT-exempt', - u'PD-LV-exempt', - u'PD-MacaoGov', - u'PD-magic', - u'PD-Malawi', - u'PD-Manchukuo-stamps', - u'PD-MapLibrary', - u'PD-Mauritius', - u'PD-MD-exempt', - u'PD-Mexico', - u'PD-Mexico-NIP', - u'PD-Meyers', - u'PD-Meyers-5th-edition', - u'PD-Meyers-6th-edition', - u'PD-MNGov', - u'PD-MO', - u'PD-money-Romania', - u'PD-Morocco', - u'PD-Namibia', - u'PD-National Photo Company', - u'PD-Nigeria', - u'PD-NL-gemeentevlag', - u'PD-NL-gemeentewapen', - u'PD-NL-Gov', - u'PD-NL-verkeersbord', - u'PD-Nordens Flora', - u'PD-North Korea', - u'PD-Norway50', - u'PD-NorwayGov', - u'PD-NTBB', - u'PD-NZ', - u'PD-NZ-50-years', - u'PD-old', - u'Pd-old', - u'PD-Old', - u'PD-old-100', - u'PD-old-50', - u'PD-old-70', - u'PD-old-75', - u'PD-old-80', - u'PD-old-Edition', - u'PD-Oman', - u'PD-OpenClipart', - u'PD-Orgelbrand', - u'PD-Ornament1898', - u'PD-Pakistan', - u'PD-PCL-portraits', - u'PD-PDFnet', - u'PD-PDphoto.org', - u'PD-Peru', - u'PD-Philippines', - u'PD-PhilippinesPubDoc', - u'PD-PMR-exempt', - u'PD-Polish', - u'PD-Polishsymbol', - u'PD-PRC-exempt', - u'PD-PT', - u'PD-retouched-user', - u'PD-retouched-user-w', - u'PD-RO-exempt', - u'PD-ROC-exempt', - u'PD-ROC-Traffic Indicating Lines', - u'PD-ROC-Traffic Signs', - u'PD-RU-exempt', - u'PD-RusEmpire', - u'PD-Russia', - u'PD-Russia-2008', - u'PD-SAGov', - u'PD-Saudi Arabia', - u'PD-SBH', - u'PD-scan', - u'PD-Scan', - u'PD-SCGGov', - u'PD-ScottForesman', - u'PD-ScottForesman-raw', - u'PD-script', - u'PD-Seal-Germany', - u'PD-Seattle-Neighborhood-Atlas', - u'PD-SeaWiFS', - u'PD-self', - u'PD-self2', - u'PD-SerbiaGov', - u'PD-Seychelles', - u'PD-SFJ', - u'PD-shape', - u'PD-Sjöfartsverket', - u'PD-SlovakGov', - u'PD-South Korea', - u'PD-South-Africa', - u'PD-Soviet-revised', - u'PD-SRBGov', - u'PD-STFP', - u'PD-StVZVO', - u'PD-Sudan', - u'PD-Suomen', - u'PD-Sweden', - u'PD-Sweden-1969', - u'PD-Sweden-photo', - u'PD-Sweden-self', - u'PD-Switzerland-official', - u'PD-Switzerland-photo', - u'PD-Syria', - u'PD-Taiwan', - u'PD-text', - u'PD-textlogo', - u'PD-TH-exempt', - u'PD-Thailand', - u'PD-TJ-exempt', - u'PD-TK-exempt', - u'PD-TR-Gov', - u'PD-Traditional', - u'PD-Tunisia', - u'PD-UA-exempt', - u'PD-UEA', - u'PD-Uganda', - u'PD-Ugglan', - u'PD-UK-known', - u'PD-UK-unknown', - u'PD-UKGov', - u'PD-Ukraine', - u'PD-UN', - u'PD-United Arab Emirates', - u'PD-URAA', - u'PD-Uruguay', - u'PD-US', - u'PD-US-1978-89', - u'PD-US-flag', - u'PD-US-no notice', - u'PD-US-not renewed', - u'PD-US-patent', - u'PD-US-patent-no notice', - u'PD-US-record', - u'PD-user', - u'PD-User', - u'PD-user-als', - u'PD-user-ar', - u'PD-user-ca', - u'PD-user-cs', - u'PD-user-da', - u'PD-user-de', - u'PD-user-en', - u'PD-user-fa', - u'PD-user-fr', - u'PD-user-he', - u'PD-user-hi', - u'PD-user-hr', - u'PD-user-hu', - u'PD-user-it', - u'PD-user-ja', - u'PD-user-lt', - u'PD-user-nl', - u'PD-user-nn', - u'PD-user-no', - u'PD-user-pl', - u'PD-user-pt', - u'PD-user-ro', - u'PD-user-ru', - u'PD-user-sk', - u'PD-user-sl', - u'PD-user-th', - u'PD-user-uk', - u'PD-user-vls', - u'PD-user-w', - u'PD-user-zh', - u'PD-USGov', - u'PD-USGov-ARM', - u'PD-USGov-Atlas', - u'PD-USGov-Award', - u'PD-USGov-BLM', - u'PD-USGov-CIA', - u'PD-USGov-CIA-WF', - u'PD-USGov-Congress', - u'PD-USGov-Congress-AOC', - u'PD-USGov-Congress-Bio', - u'PD-USGov-DEA', - u'PD-USGov-DHS', - u'PD-USGov-DHS-CG', - u'PD-USGov-DHS-CGAUX', - u'PD-USGov-DOC', - u'PD-USGov-DOC-Census', - u'PD-USGov-DOE', - u'PD-USGov-DOJ', - u'PD-USGov-DOL', - u'PD-USGov-DOS', - u'PD-USGov-DOT', - u'PD-USGov-DVA', - u'PD-USGov-ED', - u'PD-USGov-EPA', - u'PD-USGov-FAA', - u'PD-USGov-FBI', - u'PD-USGov-FDA', - u'PD-USGov-Federal Reserve', - u'PD-USGov-FEMA', - u'PD-USGov-FSA', - u'PD-USGov-FWS', - u'PD-USGov-HHS', - u'PD-USGov-HHS-CDC', - u'PD-USGov-HHS-NIH', - u'PD-USGov-Interior', - u'PD-USGov-Interior-HABS', - u'PD-USGov-Interior-MMS', - u'PD-USGov-Interior-USBR', - u'PD-USGov-Interior-USGS-Minerals', - u'PD-USGov-Military', - u'PD-USGov-Military award', - u'PD-USGov-Military-Air Force', - u'PD-USGov-Military-Air Force Auxiliary', - u'PD-USGov-Military-Army', - u'PD-USGov-Military-Army-USACE', - u'PD-USGov-Military-Army-USACMH', - u'PD-USGov-Military-Army-USAIOH', - u'PD-USGov-Military-Badge', - u'PD-USGov-Military-Coast Guard', - u'PD-USGov-Military-DVIC', - u'PD-USGov-Military-Marines', - u'PD-USGov-Military-MDA', - u'PD-USGov-Military-National Guard', - u'PD-USGov-Military-Navy', - u'PD-USGov-Military-NGA', - u'PD-USGov-money', - u'PD-USGov-MUTCD', - u'PD-USGov-NASA', - u'PD-USGov-NASA/copyright', - u'PD-USGov-NCBI-scienceprimer', - u'PD-USGov-NIH', - u'PD-USGov-NIST', - u'PD-USGov-NOAA', - u'PD-USGov-NPS', - u'PD-USGov-NRO', - u'PD-USGov-NSA', - u'PD-USGov-NSF', - u'PD-USGov-NTSB', - u'PD-USGov-POTUS', - u'PD-USGov-State', - u'PD-USGov-Treasury', - u'PD-USGov-TVA', - u'PD-USGov-USAID', - u'PD-USGov-USDA', - u'PD-USGov-USDA-ARS', - u'PD-USGov-USDA-FS', - u'PD-USGov-USDA-NAL', - u'PD-USGov-USDA-NRCS', - u'PD-USGov-USGS', - u'PD-USGov-USIA', - u'PD-USGov-VOA', - u'PD-USGov-WPA', - u'PD-USNWR', - u'PD-UZ-exempt', - u'PD-Van Vechten', - u'PD-Vegagerdin', - u'PD-Venezuela', - u'PD-Vietnam', - u'PD-VL-shield', - u'PD-Vlaams-gemeentewapen', - u'PD-Vlaamse-gemeentevlag', - u'PD-VzKat', - u'PD-WorldWind', - u'PD-Yemen', - u'PD-Yugoslavia', - u'PD-Zimbabwe', - u'Pd', - u'Pdc', - u'Peregrine981', - u'PermissionOTRS', - u'PermissionOTRS-ID', - u'Personality rights', - u'Photo-by-Wojciechowscy-GFDL', - u'Photocity.ru', - u'PhotoManifs-PP', - u'Photos by Bagn Bygdesamling', - u'Photos by Kulturhistorisk museum', - u'Photos by Stortinget', - u'Photos by the Norwegian Museum of Cultural History', - u'Pi', - u'Picswiss', - u'Piratpartiet', - u'Pl', - u'Pl icon', - u'PLoS', - u'Pms', - u'PNG with JPEG version', - u'Pnt', - u'Polish coats of arms by Tadeusz Gajl', - u'PolishPresidentCopyright', - u'PolishSenateCopyright', - u'Polishsymbol', - u'Politas FZ30', - u'Portpictures.nl', - u'Pousbeeld', - u'Pressefotos Die Gruenen', - u'Ps', - u'Pt', - u'Pt icon', - u'Pt-br', - u'Qu', - u'QualityImage', - u'RadioSenadoBr', - u'RetouchedPicture', - u'Rm', - u'Rmy', - u'Rn', - u'Ro', - u'Roa-rup', - u'RomanianMCTICopyright', - u'RTCNCA License', - u'Rtl-lang', - u'Ru', - u'Rw', - u'Sa', - u'Sah', - u'Sc', - u'Scn', - u'Sco', - u'Sd', - u'Sdc', - u'Se', - u'Seattle Neighborhood Atlas disclaimer', - u'Second Life', - u'Sei', - u'SejmCopyright', - u'Self', - u'Self2', - u'Self2-name', - u'Self3', - u'Self4', - u'Self-GFDL-German', - u'SelfSA-GFDL-German', - u'SenadoMexico', - u'Sergeymila', - u'Sg', - u'SgiraldoaCredit', - u'Sh', - u'Shi', - u'Si', - u'SIB', - u'Simple', - u'Simple English', - u'Sk', - u'Sl', - u'Sm', - u'Sma', - u'Sn', - u'So', - u'Solkoll', - u'Solkoll 2D', - u'Solkoll 3D', - u'South Korean currency', - u'SpaceShuttle', - u'SPD-Parteivorstand', - u'Spui', - u'Spuiother', - u'Sq', - u'Sr', - u'Srn', - u'Ss', - u'St', - u'Stan Shebs photo', - u'Stationsweb', - u'Statistics Netherlands map', - u'Stielers Handatlas 1891', - u'Stortinget3', - u'Stq', - u'Stratosphere', - u'Su', - u'SupersededPNG', - u'SupersededSVG', - u'Supported by Wikimedia France', - u'Sv', - u'Svensk porträttgalleri', - u'Svg', - u'SVG', - u'SVG-Map Africa by Slomox', - u'Sw', - u'Swiss Government Portrait', - u'SygnaturaPixela', - u'Szl', - u'Ta', - u'Tango', - u'Taxonavigation', - u'Tcolphoto', - u'Te', - u'Texas State Highway', - u'Tet', - u'Tg', - u'Tgl', - u'Tintazul', - u'Th', - u'ThomasBredolCredit2', - u'ThomasBredolCredit3', - u'Ti', - u'Tk', - u'Tl', - u'Tlx', - u'Tn', - u'To', - u'TomCorserCredit', - u'Tpi', - u'Tr', - u'Trademark', - u'Trademarked', - u'Ts', - u'Tt', - u'Tum', - u'TVSenadoBr', - u'Tw', - u'Ty', - u'Tyv', - u'Udm', - u'Ug', - u'Uk', - u'UN map', - u'Ur', - u'User:FlickreviewR/reviewed-pass', - u'User:Fir0002/20D', - u'USDA', - u'UWiscCIMSS', - u'Uz', - u'Ve', - u'Vec', - u'Vector-Images.com', - u'Vector version available', - u'Vi', - u'Viollet-le-Duc', - u'Vl', - u'Vls', - u'Vo', - u'W', - u'Wa', - u'Walks.ru', - u'War', - u'WEF', - u'Wikimedia relicensing', - u'Wikipedia-screenshot', - u'Wikiportrait', - u'Wikispecies', - u'WLA', - u'Wo', - u'Wulfstan GFDL', - u'Wuu', - u'Www.bordeaux-port.fr', - u'Www.folketinget.dk', - u'Www.hotelviewarea.com', - u'Www.nordenskirker.dk', - u'Xal', - u'XGSC image', - u'Xh', - u'YAM', - u'Ydd', - u'Yi', - u'Yo', - u'Yue', - u'Za', - u'Zea', - u'Zh', - u'Zh-classical', - u'Zh-cn', - u'Zh-hans', - u'Zh-hant', - u'Zh-hk', - u'Zh-min-nan', - u'Zh-sg', - u'Zh-tw' - u'Zh-yue', - u'Zlib', - u'Zu', - u'Zxx',] +ignoreTemplates = [u'1000Bit', + u'1922 cyc', + u'2MASS', + u'Aa', + u'Ab', + u'AbuGhraibPic', + u'ADRM', + u'ADRM2', + u'AerialPhotograph-mlitJP', + u'Af', + u'Agência Brasil', + u'AgenciaBrasil', + u'AgenciaCamaraBr', + u'AgenciaSenadoBr', + u'Ak', + u'AL2TB', + u'Alabordache', + u'Alexj2002C220PD', + u'Alexj2002InkscapePD', + u'Aln', + u'Als', + u'Am', + u'An', + u'Ang', + u'Anonymous work', + u'AnotherAuthor', + u'Apache', + u'Ar', + u'Arc', + u'Arn', + u'Artistic-2', + u'As', + u'Ashipilin', + u'AskedForInfo', + u'Ast', + u'AstronautPhoto', + u'Attribution', + u'Attribution Entomart', + u'Attribution-Ubisoft', + u'Auroranorthlicense', + u'Author-de', + u'Autorisation photos aériennes Francis Leroy', + u'Autotravel', + u'Av', + u'Avk', + u'Ay', + u'Az', + u'Ba', + u'BadJPEG', + u'Bar', + u'BArch-License', + u'BArch-link', + u'Bat-smg', + u'Bcl', + u'Be', + u'Be-tarask', + u'Be-x-old', + u'BeeldbankVenW', + u'Bg', + u'Bh', + u'Bi', + u'Blue Marble', + u'Bm', + u'Bmz', + u'Bn', + u'Bo', + u'Botev license', + u'Botev relicensed', + u'BotMoveToCommons', + u'Bpy', + u'Br', + u'Bs', + u'BSD', + u'BSDwithdisclaimer', + u'Byp', + u'C0', + u'Ca', + u'CatedralDeSal', + u'Cc', + u'CC-AR-Presidency', + u'Cc-by', + u'Cc-by-1.0', + u'Cc-by-1.0-nl', + u'Cc-by-2.0', + u'Cc-by-2.0-at', + u'Cc-by-2.0-be', + u'Cc-by-2.0-br', + u'Cc-by-2.0-cl', + u'Cc-by-2.0-de', + u'Cc-by-2.0-es', + u'Cc-by-2.0-fr', + u'Cc-by-2.0-it', + u'Cc-by-2.0-kr', + u'Cc-by-2.0-nl', + u'Cc-by-2.0-uk', + u'Cc-by-2.1-au', + u'Cc-by-2.1-es', + u'Cc-by-2.1-jp', + u'Cc-by-2.5', + u'Cc-by-2.5-bg', + u'Cc-by-2.5-br', + u'Cc-by-2.5-dk', + u'Cc-by-2.5-es', + u'Cc-by-2.5-in', + u'Cc-by-2.5-it', + u'Cc-by-2.5-my', + u'Cc-by-2.5-nl', + u'Cc-by-2.5-pl', + u'Cc-by-2.5-se', + u'Cc-by-2.5,2.0,1.0', + u'Cc-by-3.0', + u'Cc-by-3.0-gr', + u'Cc-by-3.0-IndiaFM', + u'Cc-by-3.0-nl', + u'Cc-by-3.0-rs', + u'Cc-by-3.0-us', + u'Cc-by-3.0,2.5,2.0,1.0', + u'Cc-by-all', + u'Cc-by-nc-sa-2.0-dual', + u'Cc-by-sa', + u'Cc-by-sa-1.0', + u'Cc-by-sa-1.0-fi', + u'Cc-by-sa-1.0-tw', + u'Cc-by-sa-2.0', + u'Cc-by-sa-2.0-at', + u'Cc-by-sa-2.0-au', + u'Cc-by-sa-2.0-be', + u'Cc-by-sa-2.0-br', + u'Cc-by-sa-2.0-ca', + u'Cc-by-sa-2.0-cl', + u'Cc-by-sa-2.0-de', + u'Cc-by-sa-2.0-es', + u'Cc-by-sa-2.0-fr', + u'Cc-by-sa-2.0-it', + u'Cc-by-sa-2.0-kr', + u'Cc-by-sa-2.0-nl', + u'Cc-by-sa-2.0-tw', + u'Cc-by-sa-2.0-uk', + u'Cc-by-sa-2.1-au', + u'Cc-by-sa-2.1-es', + u'Cc-by-sa-2.1-jp', + u'Cc-by-sa-2.5', + u'CC-BY-SA-2.5', + u'Cc-by-sa-2.5-ar', + u'Cc-by-sa-2.5-au', + u'Cc-by-sa-2.5-bg', + u'Cc-by-sa-2.5-br', + u'Cc-by-sa-2.5-ca', + u'Cc-by-sa-2.5-ch', + u'Cc-by-sa-2.5-cl', + u'Cc-by-sa-2.5-cn', + u'Cc-by-sa-2.5-de', + u'Cc-by-sa-2.5-dk', + u'Cc-by-sa-2.5-es', + u'Cc-by-sa-2.5-hu', + u'Cc-by-sa-2.5-in', + u'Cc-by-sa-2.5-it', + u'Cc-by-sa-2.5-mx', + u'Cc-by-sa-2.5-my', + u'Cc-by-sa-2.5-nl', + u'Cc-by-sa-2.5-pl', + u'Cc-by-sa-2.5-pt', + u'Cc-by-sa-2.5-se', + u'Cc-by-sa-2.5-si', + u'Cc-by-sa-2.5-tw', + u'Cc-by-sa-2.5,1.0', + u'Cc-by-sa-2.5,2.0,1.0', + u'Cc-by-sa-2.5,2.0,1.0-no-link', + u'Cc-by-sa-3.0', + u'Cc-by-sa-3.0-gr', + u'Cc-by-sa-3.0-nl', + u'Cc-by-sa-3.0-rs', + u'Cc-by-sa-3.0-tw', + u'Cc-by-sa-3.0-us', + u'Cc-by-sa-3.0,2.5,2.0,1.0', + u'Cc-by-sa-3.0,2.5,2.0,1.0-no-link', + u'Cc-by-sa-all', + u'Cc-by-sa-jul', + u'CC-LukeFord', + u'Cc-pd', + u'Cc-sa-1.0', + u'Cc-zero', + u'Cdo', + u'Ce', + u'Ceb', + u'CeCILL', + u'CERN-CMS', + u'Ch', + u'China-PD', + u'Cho', + u'Chr', + u'Chuck', + u'Chy', + u'Cityview', + u'Cityview2', + u'Civertan license', + u'Claude', + u'CNG', + u'Co', + u'Coa-Germany-b1945', + u'Coloured SVG boxes', + u'Common Public License', + u'Contact-VP', + u'Convert to SVG', + u'CopyAttribEmail', + u'Copyright by Wikimedia', + u'Copyright jalpeyrie', + u'Copyrighted free use', + u'Copyrighted free use provided that', + u'Copyrighted IOC', + u'CopyrightedFreeUse', + u'CopyrightedFreeUse-Link', + u'Cr', + u'Created by ForrestSjap', + u'Created with Inkscape', + u'Creator', + u'Credit line', + u'Credits-panoramafotos.net', + u'Crh', + u'Crh-cyrl', + u'Croatian currency', + u'Cs', + u'Csb', + u'Cu', + u'Cv', + u'Cy', + u'Cz', + u'Da', + u'Date', + u'De', + u'De-cc-by-sa-2.0', + u'Debora Cordeiro', + u'Diq', + u'DMonniaux', + u'DMonniaux-DADVSI-20060507', + u'Dsb', + u'DSL', + u'Dum', + u'Dv', + u'Dz', + u'EdwardCurtis', + u'Ee', + u'EEK banknote', + u'EEK coin', + u'El', + u'Elephants Dream', + u'Eml', + u'En', + u'En icon', + u'Eo', + u'EPL', + u'Erin Silversmith Licence', + u'Es', + u'EST-Land Board', + u'Estremeñu', + u'Et', + u'Eu', + u'EU location', + u'Euro coin common face', + u'Europe location', + u'Expat', + u'Ext', + u'Fa', + u'FAL', + u'Fancyfootworklicense', + u'Faroe stamps', + u'Fcb981c', + u'Ff', + u'Fi', + u'FirefoxWiki', + u'Fiu-vro', + u'Fj', + u'Flag-Germany-b1945', + u'Flickr', + u'Flickr-change-of-license', + u'Flickr-unfree-but', + u'Flickrreview', + u'Fo', + u'FOLP', + u'FOP', + u'Fr', + u'Fr icon', + u'Frc', + u'Free screenshot', + u'Frp', + u'Fur', + u'FWL', + u'Fy', + u'Ga', + u'Gag', + u'Gakk Copyright', + u'Gan', + u'Gd', + u'Geograph', + u'GFDL', + u'GFDL or cc-by-nc-sa', + u'GFDL or cc-by-nc-sa/2.5', + u'GFDL-1.2', + u'GFDL-1.2-en', + u'GFDL-CC-triple', + u'GFDL-DD', + u'GFDL-en', + u'GFDL-GMT', + u'GFDL-Institut de Qualitat Agroalimentària', + u'GFDL-IS', + u'GFDL-it', + u'GFDL-ja', + u'GFDL-Landsat-Kashmir3d', + u'GFDL-OpenGeoDB', + u'GFDL-retouched', + u'GFDL-Samoborac', + u'GFDL-self', + u'GFDL-Self', + u'GFDL-self-en', + u'GFDL-user', + u'GFDL-user-als', + u'GFDL-user-ar', + u'GFDL-user-bat-smg', + u'GFDL-user-bs', + u'GFDL-user-cs', + u'GFDL-user-da', + u'GFDL-user-de', + u'GFDL-user-el', + u'GFDL-user-en', + u'GFDL-user-en-no-disclaimers', + u'GFDL-user-en-note', + u'GFDL-user-en-with-disclaimers', + u'GFDL-user-es', + u'GFDL-user-fa', + u'GFDL-user-fi', + u'GFDL-user-fr', + u'GFDL-user-gl', + u'GFDL-user-he', + u'GFDL-user-hi', + u'GFDL-user-hu', + u'GFDL-user-id', + u'GFDL-user-it', + u'GFDL-user-ja', + u'GFDL-user-ko', + u'GFDL-user-lt', + u'GFDL-user-nl', + u'GFDL-user-nn', + u'GFDL-user-no', + u'GFDL-user-pl', + u'GFDL-user-pt', + u'GFDL-user-ru', + u'GFDL-user-sk', + u'GFDL-user-sq', + u'GFDL-user-tr', + u'GFDL-user-uk', + u'GFDL-user-vi', + u'GFDL-user-vls', + u'GFDL-user-w', + u'GFDL-user-zh', + u'Giovannino Copyright', + u'Gl', + u'Glk', + u'Gloumouth1Credit', + u'Gn', + u'GNOME-icon-theme', + u'Got', + u'GPL', + u'GPLv2 only', + u'GPLv3', + u'Gr', + u'Grays Anatomy plate', + u'Gu', + u'Gv', + u'GWArt', + u'GWArtOld', + u'GWPDA', + u'Ha', + u'HAER', + u'Hak', + u'Halibutt Copyright GFDL', + u'Halibutt Copyright Ogg', + u'HALS', + u'Harry', + u'Harry2', + u'Haw', + u'He', + u'Heraldic Badge', + u'Hi', + u'Hiuppo Copyright GFDL', + u'Ho', + u'Hr', + u'Hsb', + u'Ht', + u'Hu', + u'Hy', + u'Hz', + u'Ia', + u'Ibiblio-Hyperwar.org', + u'Icelandic currency', + u'Icelandic stamp', + u'Id', + u'Ie', + u'Ig', + u'Ii', + u'Ik', + u'Ike-latn', + u'Ilo', + u'ImageUpload', + u'Img-confirmation', + u'INewton', + u'Information', + u'Information Picswiss', + u'Inkscape', + u'Insignia', + u'Insignia Catalonia', + u'Insignia Navarre', + u'Io', + u'IPPAR', + u'Is', + u'It', + u'It icon', + u'Iu', + u'Ja', + u'Ja2', + u'James K. Lindsey permission', + u'Jbo', + u'Jean-PolGRANDMONTCredit', + u'JewishEncyclopedia', + u'Joergens.mi licence', + u'JPEG version of PNG', + u'Jv', + u'Ka', + u'Kaa', + u'Kab', + u'Kameno doba', + u'Kg', + u'Ki', + u'Kirkeinfo', + u'Kirkenorge', + u'Kj', + u'Kk', + u'Kl', + u'Km', + u'Kn', + u'Ko', + u'Kopimi', + u'Kr', + u'Krj', + u'Ks', + u'Ksh', + u'Ku', + u'Kv', + u'Kw', + u'Ky', + u'La', + u'LA2-Blitz', + u'Lad', + u'Lan', + u'LarsenCopyright', + u'Lb', + u'Lbe', + u'Lfn', + u'Lg', + u'LGPL', + u'Li', + u'LibriVox public domain', + u'License', + u'Lij', + u'LinuxeristCopyright', + u'Lld', + u'Lmo', + u'Ln', + u'Lo', + u'LOC-image', + u'LOC-pchrom', + u'LOC-prok', + u'LOC-prokc', + u'Location', + u'Location dec', + u'Location dms', + u'LocationRequired', + u'Lothar1976', + u'Loz', + u'Ls', + u'Lt', + u'Lueger', + u'Lv', + u'LviatourCredit', + u'Map of Japan-Shigenobu AOKI', + u'Map-Austria-GNu', + u'Marine-marchande.net', + u'MartinX', + u'Master son', + u'MdB', + u'Mdf', + u'Met.no', + u'Mg', + u'Mh', + u'Mi', + u'Mildenhall', + u'MindInfo', + u'MIT', + u'Mk', + u'Ml', + u'MLDoan', + u'Mn', + u'Mo', + u'MoengCredit', + u'Money-EU banknote', + u'Money-Eu', + u'Money-REAL', + u'MORS', + u'MPL', + u'Mr', + u'Ms', + u'Mt', + u'MTL', + u'Museum.ru', + u'My', + u'Myv', + u'Mzn', + u'Na', + u'Nah', + u'Namespace', + u'NAMESPACE', + u'Nap', + u'NAUMANN', + u'Nb', + u'Nds', + u'Nds-nl', + u'Ne', + u'NetMarine', + u'New', + u'Newsflash Photo', + u'Ng', + u'NGC7000', + u'NGruev', + u'NGW', + u'Ngw2', + u'Nickshanks-cc-by-2.0-email', + u'Njegos.org', + u'Nl', + u'Nl icon', + u'Nn', + u'Nn icon', + u'No', + u'No icon', + u'Non', + u'Norges Golfforbund', + u'Norwegian coat of arms', + u'Not-PD-US-URAA', + u'Nov', + u'Nrbelex Photo', + u'Nrbelex Photo 400D', + u'Nrm', + u'Nso', + u'Nv', + u'Ny', + u'NYC Subway map', + u'NYPL-image-full', + u'OAL', + u'Object location', + u'Oc', + u'OldOS', + u'Olessi Copyright Ogg', + u'Om', + u'Open Beelden', + u'Open Font', + u'Openphotoreview', + u'Or', + u'Originally uploaded', + u'Os', + u'OsborneFossils', + u'OTrondal', + u'OTRS', + u'Otrs pending', + u'OTRS pending', + u'Own', + u'Own work', + u'Pa', + u'Pag', + u'PAGENAME', + u'PAGENAMEE', + u'Painting', + u'Pam', + u'Pap', + u'Parlament.ch', + u'PAshieldsource', + u'PBresseler', + u'PCL', + u'PD', + u'PD Colombia', + u'PD patents', + u'PD-1923', + u'PD-AB-exempt', + u'PD-Abdul Hamid', + u'PD-AIGA', + u'PD-Albania-exempt', + u'PD-Algeria', + u'PD-AM-exempt', + u'PD-ancient-script', + u'PD-AR-Anonymous', + u'PD-AR-Movie', + u'PD-AR-Photo', + u'PD-Archivesnormandie', + u'PD-Armenia', + u'PD-Art', + u'PD-art', + u'PD-art-life-70', + u'PD-art-US', + u'PD-Art-YorckProject', + u'PD-Australia', + u'PD-AustrianGov', + u'PD-author', + u'PD-AZ-exempt', + u'PD-Azerbaijan', + u'PD-Bahrain', + u'PD-Bain', + u'PD-Bangladesh', + u'PD-because', + u'PD-BH-exempt', + u'PD-BnFMandragorePic', + u'PD-Brady-Handy', + u'PD-Brazil-media', + u'PD-BrazilGov', + u'PD-Britannica', + u'PD-Brockhaus&Efron', + u'PD-BulgarianGov', + u'PD-BW', + u'PD-BY-exempt', + u'PD-Canada', + u'PD-Canada-creator', + u'PD-Canada-Crown', + u'PD-Canada-photo', + u'PD-Canada-stamp', + u'PD-Challenger Report', + u'PD-chem', + u'PD-Chile', + u'PD-China', + u'PD-Coa-Finland', + u'PD-Coa-Germany', + u'PD-Coa-Hungary', + u'PD-Coins-Krenzer', + u'PD-collective anonymous work', + u'PD-copyright holder', + u'PD-Croatia', + u'PD-CroatiaGov', + u'PD-CSIRO', + u'PD-Cuba', + u'PD-CzechGov', + u'PD-DAUI', + u'PD-DBZ stamps', + u'PD-Demis', + u'PD-Denmark50', + u'PD-DenmarkEVH', + u'PD-Detroit', + u'PD-Deutsche Bundespost stamps', + u'PD-Edison Records', + u'PD-EE-exempt', + u'PD-EEA', + u'PD-Egypt', + u'PD-EstoniaPub', + u'PD-EU-no author disclosure', + u'PD-Feldman-1905', + u'PD-Fiji', + u'PD-Finland', + u'PD-Finland50', + u'PD-FinlandGov', + u'PD-flag', + u'PD-Flag', + u'PD-flag-50', + u'PD-Flag-Germany', + u'PD-FLGov', + u'PD-font', + u'PD-FOP-DE', + u'PD-Fröléens konversationslexikon', + u'PD-GallicaPic', + u'PD-GDR stamps', + u'PD-GE-exempt', + u'PD-Generic', + u'PD-German Empire stamps', + u'PD-German postmarks', + u'PD-German stamps', + u'PD-GermanGov', + u'PD-Google books', + u'PD-Gottscho', + u'PD-GreekGov', + u'PD-Gutenberg', + u'PD-heirs', + u'PD-Highsmith', + u'PD-HK', + u'PD-HK-PR', + u'PD-HU-exempt', + u'PD-Hubble', + u'PD-IDGov', + u'PD-IDOld-Art29', + u'PD-IDOld-Art30', + u'PD-imf.org', + u'PD-India', + u'PD-ineligible', + u'PD-Internationale', + u'PD-Iran', + u'PD-Iraq', + u'PD-Ireland', + u'PD-IrishGov', + u'PD-Israel', + u'PD-Israel-Photo', + u'PD-ItalyGov', + u'PD-Japan', + u'PD-Japan-exempt', + u'PD-Japan-film', + u'PD-Japan-oldphoto', + u'PD-Japan-organization', + u'PD-Jordan', + u'PD-Jordan-Photo', + u'PD-JORF', + u'PD-JORF-nor-conso', + u'PD-Kenya', + u'PD-KG-exempt', + u'PD-Kuwait', + u'PD-KZ-exempt', + u'PD-Lebanon', + u'PD-Libya', + u'PD-link', + u'PD-LOC', + u'PD-Look', + u'PD-LosAlamos', + u'PD-Lozinski', + u'PD-LT-exempt', + u'PD-LV-exempt', + u'PD-MacaoGov', + u'PD-magic', + u'PD-Malawi', + u'PD-Manchukuo-stamps', + u'PD-MapLibrary', + u'PD-Mauritius', + u'PD-MD-exempt', + u'PD-Mexico', + u'PD-Mexico-NIP', + u'PD-Meyers', + u'PD-Meyers-5th-edition', + u'PD-Meyers-6th-edition', + u'PD-MNGov', + u'PD-MO', + u'PD-money-Romania', + u'PD-Morocco', + u'PD-Namibia', + u'PD-National Photo Company', + u'PD-Nigeria', + u'PD-NL-gemeentevlag', + u'PD-NL-gemeentewapen', + u'PD-NL-Gov', + u'PD-NL-verkeersbord', + u'PD-Nordens Flora', + u'PD-North Korea', + u'PD-Norway50', + u'PD-NorwayGov', + u'PD-NTBB', + u'PD-NZ', + u'PD-NZ-50-years', + u'PD-old', + u'Pd-old', + u'PD-Old', + u'PD-old-100', + u'PD-old-50', + u'PD-old-70', + u'PD-old-75', + u'PD-old-80', + u'PD-old-Edition', + u'PD-Oman', + u'PD-OpenClipart', + u'PD-Orgelbrand', + u'PD-Ornament1898', + u'PD-Pakistan', + u'PD-PCL-portraits', + u'PD-PDFnet', + u'PD-PDphoto.org', + u'PD-Peru', + u'PD-Philippines', + u'PD-PhilippinesPubDoc', + u'PD-PMR-exempt', + u'PD-Polish', + u'PD-Polishsymbol', + u'PD-PRC-exempt', + u'PD-PT', + u'PD-retouched-user', + u'PD-retouched-user-w', + u'PD-RO-exempt', + u'PD-ROC-exempt', + u'PD-ROC-Traffic Indicating Lines', + u'PD-ROC-Traffic Signs', + u'PD-RU-exempt', + u'PD-RusEmpire', + u'PD-Russia', + u'PD-Russia-2008', + u'PD-SAGov', + u'PD-Saudi Arabia', + u'PD-SBH', + u'PD-scan', + u'PD-Scan', + u'PD-SCGGov', + u'PD-ScottForesman', + u'PD-ScottForesman-raw', + u'PD-script', + u'PD-Seal-Germany', + u'PD-Seattle-Neighborhood-Atlas', + u'PD-SeaWiFS', + u'PD-self', + u'PD-self2', + u'PD-SerbiaGov', + u'PD-Seychelles', + u'PD-SFJ', + u'PD-shape', + u'PD-Sjöfartsverket', + u'PD-SlovakGov', + u'PD-South Korea', + u'PD-South-Africa', + u'PD-Soviet-revised', + u'PD-SRBGov', + u'PD-STFP', + u'PD-StVZVO', + u'PD-Sudan', + u'PD-Suomen', + u'PD-Sweden', + u'PD-Sweden-1969', + u'PD-Sweden-photo', + u'PD-Sweden-self', + u'PD-Switzerland-official', + u'PD-Switzerland-photo', + u'PD-Syria', + u'PD-Taiwan', + u'PD-text', + u'PD-textlogo', + u'PD-TH-exempt', + u'PD-Thailand', + u'PD-TJ-exempt', + u'PD-TK-exempt', + u'PD-TR-Gov', + u'PD-Traditional', + u'PD-Tunisia', + u'PD-UA-exempt', + u'PD-UEA', + u'PD-Uganda', + u'PD-Ugglan', + u'PD-UK-known', + u'PD-UK-unknown', + u'PD-UKGov', + u'PD-Ukraine', + u'PD-UN', + u'PD-United Arab Emirates', + u'PD-URAA', + u'PD-Uruguay', + u'PD-US', + u'PD-US-1978-89', + u'PD-US-flag', + u'PD-US-no notice', + u'PD-US-not renewed', + u'PD-US-patent', + u'PD-US-patent-no notice', + u'PD-US-record', + u'PD-user', + u'PD-User', + u'PD-user-als', + u'PD-user-ar', + u'PD-user-ca', + u'PD-user-cs', + u'PD-user-da', + u'PD-user-de', + u'PD-user-en', + u'PD-user-fa', + u'PD-user-fr', + u'PD-user-he', + u'PD-user-hi', + u'PD-user-hr', + u'PD-user-hu', + u'PD-user-it', + u'PD-user-ja', + u'PD-user-lt', + u'PD-user-nl', + u'PD-user-nn', + u'PD-user-no', + u'PD-user-pl', + u'PD-user-pt', + u'PD-user-ro', + u'PD-user-ru', + u'PD-user-sk', + u'PD-user-sl', + u'PD-user-th', + u'PD-user-uk', + u'PD-user-vls', + u'PD-user-w', + u'PD-user-zh', + u'PD-USGov', + u'PD-USGov-ARM', + u'PD-USGov-Atlas', + u'PD-USGov-Award', + u'PD-USGov-BLM', + u'PD-USGov-CIA', + u'PD-USGov-CIA-WF', + u'PD-USGov-Congress', + u'PD-USGov-Congress-AOC', + u'PD-USGov-Congress-Bio', + u'PD-USGov-DEA', + u'PD-USGov-DHS', + u'PD-USGov-DHS-CG', + u'PD-USGov-DHS-CGAUX', + u'PD-USGov-DOC', + u'PD-USGov-DOC-Census', + u'PD-USGov-DOE', + u'PD-USGov-DOJ', + u'PD-USGov-DOL', + u'PD-USGov-DOS', + u'PD-USGov-DOT', + u'PD-USGov-DVA', + u'PD-USGov-ED', + u'PD-USGov-EPA', + u'PD-USGov-FAA', + u'PD-USGov-FBI', + u'PD-USGov-FDA', + u'PD-USGov-Federal Reserve', + u'PD-USGov-FEMA', + u'PD-USGov-FSA', + u'PD-USGov-FWS', + u'PD-USGov-HHS', + u'PD-USGov-HHS-CDC', + u'PD-USGov-HHS-NIH', + u'PD-USGov-Interior', + u'PD-USGov-Interior-HABS', + u'PD-USGov-Interior-MMS', + u'PD-USGov-Interior-USBR', + u'PD-USGov-Interior-USGS-Minerals', + u'PD-USGov-Military', + u'PD-USGov-Military award', + u'PD-USGov-Military-Air Force', + u'PD-USGov-Military-Air Force Auxiliary', + u'PD-USGov-Military-Army', + u'PD-USGov-Military-Army-USACE', + u'PD-USGov-Military-Army-USACMH', + u'PD-USGov-Military-Army-USAIOH', + u'PD-USGov-Military-Badge', + u'PD-USGov-Military-Coast Guard', + u'PD-USGov-Military-DVIC', + u'PD-USGov-Military-Marines', + u'PD-USGov-Military-MDA', + u'PD-USGov-Military-National Guard', + u'PD-USGov-Military-Navy', + u'PD-USGov-Military-NGA', + u'PD-USGov-money', + u'PD-USGov-MUTCD', + u'PD-USGov-NASA', + u'PD-USGov-NASA/copyright', + u'PD-USGov-NCBI-scienceprimer', + u'PD-USGov-NIH', + u'PD-USGov-NIST', + u'PD-USGov-NOAA', + u'PD-USGov-NPS', + u'PD-USGov-NRO', + u'PD-USGov-NSA', + u'PD-USGov-NSF', + u'PD-USGov-NTSB', + u'PD-USGov-POTUS', + u'PD-USGov-State', + u'PD-USGov-Treasury', + u'PD-USGov-TVA', + u'PD-USGov-USAID', + u'PD-USGov-USDA', + u'PD-USGov-USDA-ARS', + u'PD-USGov-USDA-FS', + u'PD-USGov-USDA-NAL', + u'PD-USGov-USDA-NRCS', + u'PD-USGov-USGS', + u'PD-USGov-USIA', + u'PD-USGov-VOA', + u'PD-USGov-WPA', + u'PD-USNWR', + u'PD-UZ-exempt', + u'PD-Van Vechten', + u'PD-Vegagerdin', + u'PD-Venezuela', + u'PD-Vietnam', + u'PD-VL-shield', + u'PD-Vlaams-gemeentewapen', + u'PD-Vlaamse-gemeentevlag', + u'PD-VzKat', + u'PD-WorldWind', + u'PD-Yemen', + u'PD-Yugoslavia', + u'PD-Zimbabwe', + u'Pd', + u'Pdc', + u'Peregrine981', + u'PermissionOTRS', + u'PermissionOTRS-ID', + u'Personality rights', + u'Photo-by-Wojciechowscy-GFDL', + u'Photocity.ru', + u'PhotoManifs-PP', + u'Photos by Bagn Bygdesamling', + u'Photos by Kulturhistorisk museum', + u'Photos by Stortinget', + u'Photos by the Norwegian Museum of Cultural History', + u'Pi', + u'Picswiss', + u'Piratpartiet', + u'Pl', + u'Pl icon', + u'PLoS', + u'Pms', + u'PNG with JPEG version', + u'Pnt', + u'Polish coats of arms by Tadeusz Gajl', + u'PolishPresidentCopyright', + u'PolishSenateCopyright', + u'Polishsymbol', + u'Politas FZ30', + u'Portpictures.nl', + u'Pousbeeld', + u'Pressefotos Die Gruenen', + u'Ps', + u'Pt', + u'Pt icon', + u'Pt-br', + u'Qu', + u'QualityImage', + u'RadioSenadoBr', + u'RetouchedPicture', + u'Rm', + u'Rmy', + u'Rn', + u'Ro', + u'Roa-rup', + u'RomanianMCTICopyright', + u'RTCNCA License', + u'Rtl-lang', + u'Ru', + u'Rw', + u'Sa', + u'Sah', + u'Sc', + u'Scn', + u'Sco', + u'Sd', + u'Sdc', + u'Se', + u'Seattle Neighborhood Atlas disclaimer', + u'Second Life', + u'Sei', + u'SejmCopyright', + u'Self', + u'Self2', + u'Self2-name', + u'Self3', + u'Self4', + u'Self-GFDL-German', + u'SelfSA-GFDL-German', + u'SenadoMexico', + u'Sergeymila', + u'Sg', + u'SgiraldoaCredit', + u'Sh', + u'Shi', + u'Si', + u'SIB', + u'Simple', + u'Simple English', + u'Sk', + u'Sl', + u'Sm', + u'Sma', + u'Sn', + u'So', + u'Solkoll', + u'Solkoll 2D', + u'Solkoll 3D', + u'South Korean currency', + u'SpaceShuttle', + u'SPD-Parteivorstand', + u'Spui', + u'Spuiother', + u'Sq', + u'Sr', + u'Srn', + u'Ss', + u'St', + u'Stan Shebs photo', + u'Stationsweb', + u'Statistics Netherlands map', + u'Stielers Handatlas 1891', + u'Stortinget3', + u'Stq', + u'Stratosphere', + u'Su', + u'SupersededPNG', + u'SupersededSVG', + u'Supported by Wikimedia France', + u'Sv', + u'Svensk porträttgalleri', + u'Svg', + u'SVG', + u'SVG-Map Africa by Slomox', + u'Sw', + u'Swiss Government Portrait', + u'SygnaturaPixela', + u'Szl', + u'Ta', + u'Tango', + u'Taxonavigation', + u'Tcolphoto', + u'Te', + u'Texas State Highway', + u'Tet', + u'Tg', + u'Tgl', + u'Tintazul', + u'Th', + u'ThomasBredolCredit2', + u'ThomasBredolCredit3', + u'Ti', + u'Tk', + u'Tl', + u'Tlx', + u'Tn', + u'To', + u'TomCorserCredit', + u'Tpi', + u'Tr', + u'Trademark', + u'Trademarked', + u'Ts', + u'Tt', + u'Tum', + u'TVSenadoBr', + u'Tw', + u'Ty', + u'Tyv', + u'Udm', + u'Ug', + u'Uk', + u'UN map', + u'Ur', + u'User:FlickreviewR/reviewed-pass', + u'User:Fir0002/20D', + u'USDA', + u'UWiscCIMSS', + u'Uz', + u'Ve', + u'Vec', + u'Vector-Images.com', + u'Vector version available', + u'Vi', + u'Viollet-le-Duc', + u'Vl', + u'Vls', + u'Vo', + u'W', + u'Wa', + u'Walks.ru', + u'War', + u'WEF', + u'Wikimedia relicensing', + u'Wikipedia-screenshot', + u'Wikiportrait', + u'Wikispecies', + u'WLA', + u'Wo', + u'Wulfstan GFDL', + u'Wuu', + u'Www.bordeaux-port.fr', + u'Www.folketinget.dk', + u'Www.hotelviewarea.com', + u'Www.nordenskirker.dk', + u'Xal', + u'XGSC image', + u'Xh', + u'YAM', + u'Ydd', + u'Yi', + u'Yo', + u'Yue', + u'Za', + u'Zea', + u'Zh', + u'Zh-classical', + u'Zh-cn', + u'Zh-hans', + u'Zh-hant', + u'Zh-hk', + u'Zh-min-nan', + u'Zh-sg', + u'Zh-tw' + u'Zh-yue', + u'Zlib', + u'Zu', + u'Zxx', + ] puttext = u'\n{{Uncategorized|year={{subst:CURRENTYEAR}}|month={{subst:CURRENTMONTHNAME}}|day={{subst:CURRENTDAY}}}}' putcomment = u'Please add categories to this image' -def uploadedYesterday(site = None): + +def uploadedYesterday(site=None): ''' Return a pagegenerator containing all the pictures uploaded yesterday. Should probably copied to somewhere else ''' result = [] - dateformat ="%Y-%m-%dT00:00:00Z" + dateformat = "%Y-%m-%dT00:00:00Z" today = datetime.utcnow() yesterday = today + timedelta(days=-1) params = { - 'action' :'query', - 'list' :'logevents', - 'leprop' :'title', - 'letype' :'upload', - 'ledir' :'newer', - 'lelimit' :'5000', - 'lestart' :yesterday.strftime(dateformat), - 'leend' :today.strftime(dateformat) - } + 'action': 'query', + 'list': 'logevents', + 'leprop': 'title', + 'letype': 'upload', + 'ledir': 'newer', + 'lelimit': '5000', + 'lestart': yesterday.strftime(dateformat), + 'leend': today.strftime(dateformat) + } data = query.GetData(params, site) try: @@ -1267,13 +1272,14 @@ return pagegenerators.PagesFromTitlesGenerator(result, site) -def recentChanges(site = None, delay=0, block=70): + +def recentChanges(site=None, delay=0, block=70): ''' Return a pagegenerator containing all the images edited in a certain timespan. The delay is the amount of minutes to wait and the block is the timespan to return images in. Should probably be copied to somewhere else ''' - rcstart = site.getcurrenttime() + timedelta(minutes=-delay-block) + rcstart = site.getcurrenttime() + timedelta(minutes=-(delay + block)) rcend = site.getcurrenttime() + timedelta(minutes=-delay) gen = site.recentchanges(start=rcstart, end=rcend, reverse=True, @@ -1284,6 +1290,7 @@ for p in gen: yield pywikibot.Page(site, p['title'], p['ns']) + def isUncat(page): ''' Do we want to skip this page? @@ -1292,7 +1299,7 @@ that the page is categorized so skip the page. If we found a template which is in the ignore list, skip the page. ''' - pywikibot.output(u'Working on '+ page.title()) + pywikibot.output(u'Working on ' + page.title()) for category in page.categories(): if category not in ignoreCategories: @@ -1314,6 +1321,7 @@ return False return True + def addUncat(page): ''' Add the uncat template to the page @@ -1329,6 +1337,7 @@ # Skip this page pass return + def main(*args): ''' @@ -1351,13 +1360,13 @@ generator = genFactory.getCombinedGenerator() if not generator: pywikibot.output( - u'You have to specify the generator you want to use for the program!') + u'You have to specify the generator you want to use for the program!') else: pregenerator = site.preloadpages(generator) for page in pregenerator: pywikibot.output(page.title()) if page.exists() and (page.namespace() == 6) \ - and (not page.isRedirectPage()) : + and (not page.isRedirectPage()): if isUncat(page): addUncat(page) -- To view, visit https://gerrit.wikimedia.org/r/80850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64d0b4d4913d8650f1d2a43ce97440d5db7a56e9 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

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified generate_user_files.py ...................................................................... pep8-ified generate_user_files.py Change-Id: I8f1917d8cb6ad8b87fbf03a3dc238b196540c36c --- M generate_user_files.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 8f4f7dd..ef680df 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -52,7 +52,7 @@ elif _win_version == 6: base_dir = os.path.join(home, "AppData\\Roaming", NAME) else: - base_dir = os.path.join(home, "."+NAME) + base_dir = os.path.join(home, "." + NAME) if not os.path.isdir(base_dir): os.makedirs(base_dir, mode=0700) if not os.path.isabs(base_dir): -- To view, visit https://gerrit.wikimedia.org/r/80801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f1917d8cb6ad8b87fbf03a3dc238b196540c36c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] generate_user_files: sort language list - change (pywikibot/compat)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: generate_user_files: sort language list ...................................................................... generate_user_files: sort language list & use space a separator instead of , Change-Id: I6115f7da56f08a0b73094a3d6378f2cbf8ae214b --- M generate_user_files.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 13245f5..d709614 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -71,7 +71,7 @@ else: known_langs=eval(rre.findall(codesds)[0]+u"]") print "This is the list of known language(s):" - print ",".join(known_langs) + print " ".join(sorted(known_langs)) mylang = raw_input( "The language code of the site we're working on (default: 'en'): ") or 'en' username = raw_input("Username (%s %s): " -- To view, visit https://gerrit.wikimedia.org/r/81019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6115f7da56f08a0b73094a3d6378f2cbf8ae214b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(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] Revamp setup.py, bump version to 2.0b1 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Revamp setup.py, bump version to 2.0b1 ...................................................................... Revamp setup.py, bump version to 2.0b1 core is no longer an alpha level project, beta is more accurate. Added various classifiers for eventual pypi classification Users can now access the version with pywikibot.__version__, which is standard Python convention. For version.py, this is added as the "release version". Change-Id: I1a58a4eceb77215d4aadb16e0708da03013e7668 --- M pywikibot/__init__.py M pywikibot/version.py M scripts/version.py M setup.py 4 files changed, 38 insertions(+), 23 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 73947ec..27c9d52 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -3,11 +3,12 @@ The initialization file for the Pywikibot framework. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikipedia bot team, 2008-213 # # Distributed under the terms of the MIT license. # -__version__ = '$Id$' +__version__ = '2.0b1' +__initversion__ = '$Id$' import datetime import difflib diff --git a/pywikibot/version.py b/pywikibot/version.py index 8d6de3f..b302e97 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -168,7 +168,7 @@ fn = os.path.join(_program_dir, filename) if os.path.exists(fn): for line in open(fn, 'r').readlines(): - if line.find('__version__') == 0: + if line.find('__initversion__') == 0: exec(line) break stat = os.stat(fn) diff --git a/scripts/version.py b/scripts/version.py index cd7b831..32b06df 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -11,12 +11,14 @@ __version__ = '$Id$' import sys +import pywikibot from pywikibot.version import * from pywikibot import config2 as config if __name__ == '__main__': - print 'Pywikibot %s' % getversion() - print 'Python %s' % sys.version + print 'Pywikibot: %s' % getversion() + print 'Release version: %s' % pywikibot.__version__ + print 'Python: %s' % sys.version #print 'config-settings:' #print 'site_interface =', config.site_interface #print 'API_config_expiry =', config.API_config_expiry diff --git a/setup.py b/setup.py index 4273db2..a73bc36 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- -"""installer script for pywikibot 2.0 framework""" -# -# (C) Pywikipedia team, 2009-2012 -# +""" +Installer script for Pywikibot 2.0 framework + +(C) Pywikipedia team, 2009-2013 + +Distributed under the terms of the MIT license. + +""" __version__ = '$Id$' -# -# Distributed under the terms of the MIT license. -# + import sys from distribute_setup import use_setuptools @@ -16,19 +18,29 @@ if sys.version_info[0] != 2: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") -if sys.version_info[1] < 6: +elif sys.version_info[1] < 6: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") -else: - depend = ['httplib2>=0.6.0'] -setup(name='Pywikipediabot', - version='2.0alpha', - description='Python Wikipedia Bot Framework', - license='MIT', - packages=find_packages(), - install_requires=depend, - test_suite="tests", - ) +setup( + name='Pywikipediabot', + version='2.0b1', + description='Python Wikipedia Bot Framework', + license='MIT License', + packages=find_packages(), + install_requires=[ + 'httplib2>=0.6.0' + ], + test_suite="tests", + classifiers=[ + 'License :: OSI Approved :: MIT License', + 'Development Status :: 4 - Beta' + 'Operating System :: OS Independent', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7' + ] +) # automatically launch generate_user_files.py -- To view, visit https://gerrit.wikimedia.org/r/81000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a58a4eceb77215d4aadb16e0708da03013e7668 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Tests for ItemPage.iterlinks - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Tests for ItemPage.iterlinks ...................................................................... Tests for ItemPage.iterlinks These tests use a fabricated sitelinks file, which makes testing easier as we no longer depend on the actual WikiData data. ItemPage.get() was adapted: its parent already prevents getting data from WD if _content exists, and its parent needs to parse _content too. It's much easier to mock data when we can just set _content and call .get(). Per Legoktm's comments, WD functionality from page_tests has been moved into this file. For this, assertType(self, obj, cls) had to be moved from TestPageObject to the new superclass PywikibotTestCase. Change-Id: I5cd0e235db5bb0792d39178ee0c9e097fb053823 --- M pywikibot/page.py M tests/page_tests.py A tests/pages/Q60_only_sitelinks.wd A tests/utils.py A tests/wikibase_tests.py 5 files changed, 124 insertions(+), 39 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 63204e9..7956ae1 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2510,8 +2510,7 @@ force will override caching args are the values of props """ - if force or not hasattr(self, '_content'): - super(ItemPage, self).get(force=force, *args) + super(ItemPage, self).get(force=force, *args) #claims self.claims = {} diff --git a/tests/page_tests.py b/tests/page_tests.py index 337001a..13289d8 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -14,6 +14,8 @@ import pywikibot import pywikibot.page +from utils import PywikibotTestCase + site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) maintalk = pywikibot.Page(pywikibot.page.Link("Talk:Main Page", site)) @@ -109,11 +111,7 @@ self.assertNotEqual(hash(l1), hash(other)) -class TestPageObject(unittest.TestCase): - def assertType(self, obj, cls): - """Assert that obj is an instance of type cls""" - return self.assertTrue(isinstance(obj, cls)) - +class TestPageObject(PywikibotTestCase): def testGeneral(self): self.assertEqual(str(mainpage), "[[%s:%s]]" % (site.lang, mainpage.title())) @@ -290,38 +288,6 @@ self.assertType(p, pywikibot.Category) for p in mainpage.extlinks(): self.assertType(p, unicode) - - def testWikibase(self): - if not site.has_transcluded_data: - return - repo = site.data_repository() - item = pywikibot.ItemPage.fromPage(mainpage) - self.assertType(item, pywikibot.ItemPage) - self.assertEqual(item.getID(), 'q5296') - self.assertEqual(item.title(), 'Q5296') - self.assertTrue('en' in item.labels) - self.assertEqual(item.labels['en'], 'Main Page') - self.assertTrue('en' in item.aliases) - self.assertTrue('HomePage' in item.aliases['en']) - self.assertEqual(item.namespace(), 0) - item2 = pywikibot.ItemPage(repo, 'q5296') - self.assertEqual(item2.getID(), 'q5296') - self.assertEqual(item.labels['en'], 'Main Page') - prop = pywikibot.PropertyPage(repo, 'Property:P21') - self.assertEqual(prop.getType(), 'wikibase-item') - self.assertEqual(prop.namespace(), 120) - claim = pywikibot.Claim(repo, 'p21') - self.assertRaises(ValueError, claim.setTarget, value="test") - claim.setTarget(pywikibot.ItemPage(repo, 'q1')) - self.assertEqual(claim._formatDataValue(), {'entity-type': 'item', 'numeric-id': 1}) - - # test WikibasePage.__cmp__ - self.assertEqual(pywikibot.ItemPage.fromPage(mainpage), pywikibot.ItemPage(repo, 'q5296')) - - def testItemPageExtensionability(self): - class MyItemPage(pywikibot.ItemPage): - pass - self.assertIsInstance(MyItemPage.fromPage(mainpage), MyItemPage) # methods that still need tests implemented or expanded: diff --git a/tests/pages/Q60_only_sitelinks.wd b/tests/pages/Q60_only_sitelinks.wd new file mode 100644 index 0000000..03b15bc --- /dev/null +++ b/tests/pages/Q60_only_sitelinks.wd @@ -0,0 +1,30 @@ +{ + "lastrevid": 66097354, + "modified": "2013-08-17T17:17:36Z", + "ns": 0, + "pageid": 186, + "sitelinks": { + "afwiki": { + "site": "afwiki", + "title": "New York Stad" + }, + "enwiki": { + "site": "enwiki", + "title": "New York City" + }, + "enwikivoyage": { + "site": "enwikivoyage", + "title": "New York City" + }, + "eswiki": { + "site": "eswiki", + "title": "Nueva York" + }, + "eswikivoyage": { + "site": "eswikivoyage", + "title": "Ciudad de Nueva York" + } + }, + "title": "Q60", + "type": "item" +} diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 0000000..77f0d75 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,6 @@ +import unittest + +class PywikibotTestCase(unittest.TestCase): + def assertType(self, obj, cls): + """Assert that obj is an instance of type cls""" + return self.assertTrue(isinstance(obj, cls)) \ No newline at end of file diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py new file mode 100644 index 0000000..5caaabf --- /dev/null +++ b/tests/wikibase_tests.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +""" +Tests for the Wikidata parts of the page module. +""" +# +# (C) Pywikipedia bot team, 2008-2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + +import os +import unittest +import pywikibot +import json + +from utils import PywikibotTestCase + +site = pywikibot.Site('en', 'wikipedia') +mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) +wikidata = site.data_repository() + +class TestGeneral(PywikibotTestCase): + def testWikibase(self): + if not site.has_transcluded_data: + return + repo = site.data_repository() + item = pywikibot.ItemPage.fromPage(mainpage) + self.assertType(item, pywikibot.ItemPage) + self.assertEqual(item.getID(), 'q5296') + self.assertEqual(item.title(), 'Q5296') + self.assertTrue('en' in item.labels) + self.assertEqual(item.labels['en'], 'Main Page') + self.assertTrue('en' in item.aliases) + self.assertTrue('HomePage' in item.aliases['en']) + self.assertEqual(item.namespace(), 0) + item2 = pywikibot.ItemPage(repo, 'q5296') + self.assertEqual(item2.getID(), 'q5296') + self.assertEqual(item.labels['en'], 'Main Page') + prop = pywikibot.PropertyPage(repo, 'Property:P21') + self.assertEqual(prop.getType(), 'wikibase-item') + self.assertEqual(prop.namespace(), 120) + claim = pywikibot.Claim(repo, 'p21') + self.assertRaises(ValueError, claim.setTarget, value="test") + claim.setTarget(pywikibot.ItemPage(repo, 'q1')) + self.assertEqual(claim._formatDataValue(), {'entity-type': 'item', 'numeric-id': 1}) + + # test WikibasePage.__cmp__ + self.assertEqual(pywikibot.ItemPage.fromPage(mainpage), pywikibot.ItemPage(repo, 'q5296')) + + def testItemPageExtensionability(self): + class MyItemPage(pywikibot.ItemPage): + pass + self.assertIsInstance(MyItemPage.fromPage(mainpage), MyItemPage) + + +class TestLinks(PywikibotTestCase): + """Test cases to test links stored in wikidata""" + def setUp(self): + self.wdp = pywikibot.ItemPage(wikidata, 'Q60') + self.wdp.id = 'q60' + self.wdp._content = json.load(open(os.path.join(os.path.split(__file__)[0], 'pages', 'Q60_only_sitelinks.wd'))) + self.wdp.get() + + def test_iterlinks_page_object(self): + page = [pg for pg in self.wdp.iterlinks() if pg.site.language() == 'af'][0] + self.assertEquals(page, pywikibot.Page(pywikibot.getSite('af', 'wikipedia'), u'New York Stad')) + + def test_iterlinks_filtering(self): + wikilinks = list(self.wdp.iterlinks('wikipedia')) + wvlinks = list(self.wdp.iterlinks('wikivoyage')) + + self.assertEquals(len(wikilinks), 3) + self.assertEquals(len(wvlinks), 2) + + +if __name__ == '__main__': + try: + try: + unittest.main() + except SystemExit: + pass + finally: + pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/79561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cd0e235db5bb0792d39178ee0c9e097fb053823 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013