Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13410 discussions

[Gerrit] Don't use set literals in tests - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Sep '13

29 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Don't use set literals in tests ...................................................................... Don't use set literals in tests Set literals are not available in Python 2.6. This doesn't change the fact that the tests don't work on 2.6 but at least it stops the message about illegal syntax popping up every time one installs the module. Change-Id: I9b8674af99bc3acd418b2a378679e7254e1dee79 --- M tests/page_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index 48f40fe..5a60678 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -253,9 +253,9 @@ if not site.hasExtension('Disambiguator', False): raise unittest.SkipTest('Disambiguator extension not loaded on test site') pg = pywikibot.Page(site, 'Random') - pg._pageprops = {'disambiguation', ''} + pg._pageprops = set(['disambiguation', '']) self.assertTrue(pg.isDisambig()) - pg._pageprops = {} + pg._pageprops = set() self.assertFalse(pg.isDisambig()) def testReferences(self): -- To view, visit https://gerrit.wikimedia.org/r/86433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b8674af99bc3acd418b2a378679e7254e1dee79 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(a)gmail.com> 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

1 0

[Gerrit] setup.py: Only run generate_user_files.py after installing t... - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Sep '13

29 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: setup.py: Only run generate_user_files.py after installing the package ...................................................................... setup.py: Only run generate_user_files.py after installing the package Otherwise it will even be run after `python setup.py --help` and other commands where it doesn't make sense. Change-Id: Idd1794481b4b57c001fed8df0bf8178bb5eccc30 --- M setup.py 1 file changed, 18 insertions(+), 8 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 912c242..a38cfe8 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,25 @@ use_setuptools() from setuptools import setup, find_packages +from setuptools.command import install if sys.version_info[0] != 2: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") elif sys.version_info[1] < 6: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") + + +class pwb_install(install.install): + """ + Setuptools' install command subclassed to automatically call + `generate_user_files.py` after installing the package. + """ + def run(self): + install.install.run(self) + import subprocess + python = sys.executable + python = python.replace("pythonw.exe", "python.exe") # for Windows + subprocess.call([python, "generate_user_files.py"]) setup( name='Pywikipediabot', @@ -42,12 +56,8 @@ 'Environment :: Console', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7' - ] + ], + cmdclass={ + 'install': pwb_install + } ) - -# automatically launch generate_user_files.py - -import subprocess -python = sys.executable -python = python.replace("pythonw.exe", "python.exe") # for Windows -ignore = subprocess.call([python, "generate_user_files.py"]) -- To view, visit https://gerrit.wikimedia.org/r/86435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd1794481b4b57c001fed8df0bf8178bb5eccc30 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(a)gmail.com> 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

1 0

[Gerrit] Convert from Distribute to Setuptools - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Convert from Distribute to Setuptools ...................................................................... Convert from Distribute to Setuptools Change-Id: I9160393aec062981546f5a277dd9526a7a43ff5c --- D distribute_setup.py A ez_setup.py M setup.py 3 files changed, 371 insertions(+), 478 deletions(-) Approvals: Ladsgroup: Looks good to me, approved Hashar: Checked; Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/distribute_setup.py b/distribute_setup.py deleted file mode 100644 index 0021336..0000000 --- a/distribute_setup.py +++ /dev/null @@ -1,477 +0,0 @@ -#!python -"""Bootstrap distribute installation - -If you want to use setuptools in your package's setup.py, just include this -file in the same directory with it, and add this to the top of your setup.py:: - - from distribute_setup import use_setuptools - use_setuptools() - -If you want to require a specific version of setuptools, set a download -mirror, or use an alternate download directory, you can do so by supplying -the appropriate options to ``use_setuptools()``. - -This file can also be run as a script to install or upgrade setuptools. -""" -import os -import sys -import time -import fnmatch -import tempfile -import tarfile -from distutils import log - -try: - from site import USER_SITE -except ImportError: - USER_SITE = None - -try: - import subprocess - - def _python_cmd(*args): - args = (sys.executable,) + args - return subprocess.call(args) == 0 - -except ImportError: - # will be used for python 2.3 - def _python_cmd(*args): - args = (sys.executable,) + args - # quoting arguments if windows - if sys.platform == 'win32': - def quote(arg): - if ' ' in arg: - return '"%s"' % arg - return arg - args = [quote(arg) for arg in args] - return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 - -DEFAULT_VERSION = "0.6.10" -DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/" -SETUPTOOLS_FAKED_VERSION = "0.6c11" - -SETUPTOOLS_PKG_INFO = """\ -Metadata-Version: 1.0 -Name: setuptools -Version: %s -Summary: xxxx -Home-page: xxx -Author: xxx -Author-email: xxx -License: xxx -Description: xxx -""" % SETUPTOOLS_FAKED_VERSION - - -def _install(tarball): - # extracting the tarball - tmpdir = tempfile.mkdtemp() - log.warn('Extracting in %s', tmpdir) - old_wd = os.getcwd() - try: - os.chdir(tmpdir) - tar = tarfile.open(tarball) - _extractall(tar) - tar.close() - - # going in the directory - subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0]) - os.chdir(subdir) - log.warn('Now working in %s', subdir) - - # installing - log.warn('Installing Distribute') - if not _python_cmd('setup.py', 'install'): - log.warn('Something went wrong during the installation.') - log.warn('See the error message above.') - finally: - os.chdir(old_wd) - - -def _build_egg(egg, tarball, to_dir): - # extracting the tarball - tmpdir = tempfile.mkdtemp() - log.warn('Extracting in %s', tmpdir) - old_wd = os.getcwd() - try: - os.chdir(tmpdir) - tar = tarfile.open(tarball) - _extractall(tar) - tar.close() - - # going in the directory - subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0]) - os.chdir(subdir) - log.warn('Now working in %s', subdir) - - # building an egg - log.warn('Building a Distribute egg in %s', to_dir) - _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir) - - finally: - os.chdir(old_wd) - # returning the result - log.warn(egg) - if not os.path.exists(egg): - raise IOError('Could not build the egg.') - - -def _do_download(version, download_base, to_dir, download_delay): - egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg' - % (version, sys.version_info[0], sys.version_info[1])) - if not os.path.exists(egg): - tarball = download_setuptools(version, download_base, - to_dir, download_delay) - _build_egg(egg, tarball, to_dir) - sys.path.insert(0, egg) - import setuptools - setuptools.bootstrap_install_from = egg - - -def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, - to_dir=os.curdir, download_delay=15, no_fake=True): - # making sure we use the absolute path - to_dir = os.path.abspath(to_dir) - was_imported = 'pkg_resources' in sys.modules or \ - 'setuptools' in sys.modules - try: - try: - import pkg_resources - if not hasattr(pkg_resources, '_distribute'): - if not no_fake: - _fake_setuptools() - raise ImportError - except ImportError: - return _do_download(version, download_base, to_dir, download_delay) - try: - pkg_resources.require("distribute>="+version) - return - except pkg_resources.VersionConflict: - e = sys.exc_info()[1] - if was_imported: - sys.stderr.write( - "The required version of distribute (>=%s) is not available,\n" - "and can't be installed while this script is running. Please\n" - "install a more recent version first, using\n" - "'easy_install -U distribute'." - "\n\n(Currently using %r)\n" % (version, e.args[0])) - sys.exit(2) - else: - del pkg_resources, sys.modules['pkg_resources'] # reload ok - return _do_download(version, download_base, to_dir, - download_delay) - except pkg_resources.DistributionNotFound: - return _do_download(version, download_base, to_dir, - download_delay) - finally: - if not no_fake: - _create_fake_setuptools_pkg_info(to_dir) - -def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, - to_dir=os.curdir, delay=15): - """Download distribute from a specified location and return its filename - - `version` should be a valid distribute version number that is available - as an egg for download under the `download_base` URL (which should end - with a '/'). `to_dir` is the directory where the egg will be downloaded. - `delay` is the number of seconds to pause before an actual download - attempt. - """ - # making sure we use the absolute path - to_dir = os.path.abspath(to_dir) - try: - from urllib.request import urlopen - except ImportError: - from urllib2 import urlopen - tgz_name = "distribute-%s.tar.gz" % version - url = download_base + tgz_name - saveto = os.path.join(to_dir, tgz_name) - src = dst = None - if not os.path.exists(saveto): # Avoid repeated downloads - try: - log.warn("Downloading %s", url) - src = urlopen(url) - # Read/write all in one block, so we don't create a corrupt file - # if the download is interrupted. - data = src.read() - dst = open(saveto, "wb") - dst.write(data) - finally: - if src: - src.close() - if dst: - dst.close() - return os.path.realpath(saveto) - - -def _patch_file(path, content): - """Will backup the file then patch it""" - existing_content = open(path).read() - if existing_content == content: - # already patched - log.warn('Already patched.') - return False - log.warn('Patching...') - _rename_path(path) - f = open(path, 'w') - try: - f.write(content) - finally: - f.close() - return True - - -def _same_content(path, content): - return open(path).read() == content - -def _no_sandbox(function): - def __no_sandbox(*args, **kw): - try: - from setuptools.sandbox import DirectorySandbox - def violation(*args): - pass - DirectorySandbox._old = DirectorySandbox._violation - DirectorySandbox._violation = violation - patched = True - except ImportError: - patched = False - - try: - return function(*args, **kw) - finally: - if patched: - DirectorySandbox._violation = DirectorySandbox._old - del DirectorySandbox._old - - return __no_sandbox - -@_no_sandbox -def _rename_path(path): - new_name = path + '.OLD.%s' % time.time() - log.warn('Renaming %s into %s', path, new_name) - os.rename(path, new_name) - return new_name - -def _remove_flat_installation(placeholder): - if not os.path.isdir(placeholder): - log.warn('Unkown installation at %s', placeholder) - return False - found = False - for file in os.listdir(placeholder): - if fnmatch.fnmatch(file, 'setuptools*.egg-info'): - found = True - break - if not found: - log.warn('Could not locate setuptools*.egg-info') - return - - log.warn('Removing elements out of the way...') - pkg_info = os.path.join(placeholder, file) - if os.path.isdir(pkg_info): - patched = _patch_egg_dir(pkg_info) - else: - patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO) - - if not patched: - log.warn('%s already patched.', pkg_info) - return False - # now let's move the files out of the way - for element in ('setuptools', 'pkg_resources.py', 'site.py'): - element = os.path.join(placeholder, element) - if os.path.exists(element): - _rename_path(element) - else: - log.warn('Could not find the %s element of the ' - 'Setuptools distribution', element) - return True - - -def _after_install(dist): - log.warn('After install bootstrap.') - placeholder = dist.get_command_obj('install').install_purelib - _create_fake_setuptools_pkg_info(placeholder) - -@_no_sandbox -def _create_fake_setuptools_pkg_info(placeholder): - if not placeholder or not os.path.exists(placeholder): - log.warn('Could not find the install location') - return - pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1]) - setuptools_file = 'setuptools-%s-py%s.egg-info' % \ - (SETUPTOOLS_FAKED_VERSION, pyver) - pkg_info = os.path.join(placeholder, setuptools_file) - if os.path.exists(pkg_info): - log.warn('%s already exists', pkg_info) - return - - log.warn('Creating %s', pkg_info) - f = open(pkg_info, 'w') - try: - f.write(SETUPTOOLS_PKG_INFO) - finally: - f.close() - - pth_file = os.path.join(placeholder, 'setuptools.pth') - log.warn('Creating %s', pth_file) - f = open(pth_file, 'w') - try: - f.write(os.path.join(os.curdir, setuptools_file)) - finally: - f.close() - -def _patch_egg_dir(path): - # let's check if it's already patched - pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO') - if os.path.exists(pkg_info): - if _same_content(pkg_info, SETUPTOOLS_PKG_INFO): - log.warn('%s already patched.', pkg_info) - return False - _rename_path(path) - os.mkdir(path) - os.mkdir(os.path.join(path, 'EGG-INFO')) - pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO') - f = open(pkg_info, 'w') - try: - f.write(SETUPTOOLS_PKG_INFO) - finally: - f.close() - return True - - -def _before_install(): - log.warn('Before install bootstrap.') - _fake_setuptools() - - -def _under_prefix(location): - if 'install' not in sys.argv: - return True - args = sys.argv[sys.argv.index('install')+1:] - for index, arg in enumerate(args): - for option in ('--root', '--prefix'): - if arg.startswith('%s=' % option): - top_dir = arg.split('root=')[-1] - return location.startswith(top_dir) - elif arg == option: - if len(args) > index: - top_dir = args[index+1] - return location.startswith(top_dir) - elif option == '--user' and USER_SITE is not None: - return location.startswith(USER_SITE) - return True - - -def _fake_setuptools(): - log.warn('Scanning installed packages') - try: - import pkg_resources - except ImportError: - # we're cool - log.warn('Setuptools or Distribute does not seem to be installed.') - return - ws = pkg_resources.working_set - try: - setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools', - replacement=False)) - except TypeError: - # old distribute API - setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools')) - - if setuptools_dist is None: - log.warn('No setuptools distribution found') - return - # detecting if it was already faked - setuptools_location = setuptools_dist.location - log.warn('Setuptools installation detected at %s', setuptools_location) - - # if --root or --preix was provided, and if - # setuptools is not located in them, we don't patch it - if not _under_prefix(setuptools_location): - log.warn('Not patching, --root or --prefix is installing Distribute' - ' in another location') - return - - # let's see if its an egg - if not setuptools_location.endswith('.egg'): - log.warn('Non-egg installation') - res = _remove_flat_installation(setuptools_location) - if not res: - return - else: - log.warn('Egg installation') - pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO') - if (os.path.exists(pkg_info) and - _same_content(pkg_info, SETUPTOOLS_PKG_INFO)): - log.warn('Already patched.') - return - log.warn('Patching...') - # let's create a fake egg replacing setuptools one - res = _patch_egg_dir(setuptools_location) - if not res: - return - log.warn('Patched done.') - _relaunch() - - -def _relaunch(): - log.warn('Relaunching...') - # we have to relaunch the process - args = [sys.executable] + sys.argv - sys.exit(subprocess.call(args)) - - -def _extractall(self, path=".", members=None): - """Extract all members from the archive to the current working - directory and set owner, modification time and permissions on - directories afterwards. `path' specifies a different directory - to extract to. `members' is optional and must be a subset of the - list returned by getmembers(). - """ - import copy - import operator - from tarfile import ExtractError - directories = [] - - if members is None: - members = self - - for tarinfo in members: - if tarinfo.isdir(): - # Extract directories with a safe mode. - directories.append(tarinfo) - tarinfo = copy.copy(tarinfo) - tarinfo.mode = 448 # decimal for oct 0700 - self.extract(tarinfo, path) - - # Reverse sort directories. - if sys.version_info < (2, 4): - def sorter(dir1, dir2): - return cmp(dir1.name, dir2.name) - directories.sort(sorter) - directories.reverse() - else: - directories.sort(key=operator.attrgetter('name'), reverse=True) - - # Set correct owner, mtime and filemode on directories. - for tarinfo in directories: - dirpath = os.path.join(path, tarinfo.name) - try: - self.chown(tarinfo, dirpath) - self.utime(tarinfo, dirpath) - self.chmod(tarinfo, dirpath) - except ExtractError: - e = sys.exc_info()[1] - if self.errorlevel > 1: - raise - else: - self._dbg(1, "tarfile: %s" % e) - - -def main(argv, version=DEFAULT_VERSION): - """Install or upgrade setuptools and EasyInstall""" - tarball = download_setuptools() - _install(tarball) - - -if __name__ == '__main__': - main(sys.argv[1:]) diff --git a/ez_setup.py b/ez_setup.py new file mode 100644 index 0000000..b02f3f1 --- /dev/null +++ b/ez_setup.py @@ -0,0 +1,370 @@ +#!python +"""Bootstrap setuptools installation + +If you want to use setuptools in your package's setup.py, just include this +file in the same directory with it, and add this to the top of your setup.py:: + + from ez_setup import use_setuptools + use_setuptools() + +If you want to require a specific version of setuptools, set a download +mirror, or use an alternate download directory, you can do so by supplying +the appropriate options to ``use_setuptools()``. + +This file can also be run as a script to install or upgrade setuptools. +""" +import os +import shutil +import sys +import tempfile +import tarfile +import optparse +import subprocess +import platform + +from distutils import log + +try: + from site import USER_SITE +except ImportError: + USER_SITE = None + +DEFAULT_VERSION = "1.1.6" +DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" + +def _python_cmd(*args): + args = (sys.executable,) + args + return subprocess.call(args) == 0 + +def _check_call_py24(cmd, *args, **kwargs): + res = subprocess.call(cmd, *args, **kwargs) + class CalledProcessError(Exception): + pass + if not res == 0: + msg = "Command '%s' return non-zero exit status %d" % (cmd, res) + raise CalledProcessError(msg) +vars(subprocess).setdefault('check_call', _check_call_py24) + +def _install(tarball, install_args=()): + # extracting the tarball + tmpdir = tempfile.mkdtemp() + log.warn('Extracting in %s', tmpdir) + old_wd = os.getcwd() + try: + os.chdir(tmpdir) + tar = tarfile.open(tarball) + _extractall(tar) + tar.close() + + # going in the directory + subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0]) + os.chdir(subdir) + log.warn('Now working in %s', subdir) + + # installing + log.warn('Installing Setuptools') + if not _python_cmd('setup.py', 'install', *install_args): + log.warn('Something went wrong during the installation.') + log.warn('See the error message above.') + # exitcode will be 2 + return 2 + finally: + os.chdir(old_wd) + shutil.rmtree(tmpdir) + + +def _build_egg(egg, tarball, to_dir): + # extracting the tarball + tmpdir = tempfile.mkdtemp() + log.warn('Extracting in %s', tmpdir) + old_wd = os.getcwd() + try: + os.chdir(tmpdir) + tar = tarfile.open(tarball) + _extractall(tar) + tar.close() + + # going in the directory + subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0]) + os.chdir(subdir) + log.warn('Now working in %s', subdir) + + # building an egg + log.warn('Building a Setuptools egg in %s', to_dir) + _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir) + + finally: + os.chdir(old_wd) + shutil.rmtree(tmpdir) + # returning the result + log.warn(egg) + if not os.path.exists(egg): + raise IOError('Could not build the egg.') + + +def _do_download(version, download_base, to_dir, download_delay): + egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg' + % (version, sys.version_info[0], sys.version_info[1])) + if not os.path.exists(egg): + tarball = download_setuptools(version, download_base, + to_dir, download_delay) + _build_egg(egg, tarball, to_dir) + sys.path.insert(0, egg) + + # Remove previously-imported pkg_resources if present (see + # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details). + if 'pkg_resources' in sys.modules: + del sys.modules['pkg_resources'] + + import setuptools + setuptools.bootstrap_install_from = egg + + +def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, + to_dir=os.curdir, download_delay=15): + # making sure we use the absolute path + to_dir = os.path.abspath(to_dir) + was_imported = 'pkg_resources' in sys.modules or \ + 'setuptools' in sys.modules + try: + import pkg_resources + except ImportError: + return _do_download(version, download_base, to_dir, download_delay) + try: + pkg_resources.require("setuptools>=" + version) + return + except pkg_resources.VersionConflict: + e = sys.exc_info()[1] + if was_imported: + sys.stderr.write( + "The required version of setuptools (>=%s) is not available,\n" + "and can't be installed while this script is running. Please\n" + "install a more recent version first, using\n" + "'easy_install -U setuptools'." + "\n\n(Currently using %r)\n" % (version, e.args[0])) + sys.exit(2) + else: + del pkg_resources, sys.modules['pkg_resources'] # reload ok + return _do_download(version, download_base, to_dir, + download_delay) + except pkg_resources.DistributionNotFound: + return _do_download(version, download_base, to_dir, + download_delay) + +def download_file_powershell(url, target): + """ + Download the file at url to target using Powershell (which will validate + trust). Raise an exception if the command cannot complete. + """ + target = os.path.abspath(target) + cmd = [ + 'powershell', + '-Command', + "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(), + ] + subprocess.check_call(cmd) + +def has_powershell(): + if platform.system() != 'Windows': + return False + cmd = ['powershell', '-Command', 'echo test'] + devnull = open(os.path.devnull, 'wb') + try: + try: + subprocess.check_call(cmd, stdout=devnull, stderr=devnull) + except: + return False + finally: + devnull.close() + return True + +download_file_powershell.viable = has_powershell + +def download_file_curl(url, target): + cmd = ['curl', url, '--silent', '--output', target] + subprocess.check_call(cmd) + +def has_curl(): + cmd = ['curl', '--version'] + devnull = open(os.path.devnull, 'wb') + try: + try: + subprocess.check_call(cmd, stdout=devnull, stderr=devnull) + except: + return False + finally: + devnull.close() + return True + +download_file_curl.viable = has_curl + +def download_file_wget(url, target): + cmd = ['wget', url, '--quiet', '--output-document', target] + subprocess.check_call(cmd) + +def has_wget(): + cmd = ['wget', '--version'] + devnull = open(os.path.devnull, 'wb') + try: + try: + subprocess.check_call(cmd, stdout=devnull, stderr=devnull) + except: + return False + finally: + devnull.close() + return True + +download_file_wget.viable = has_wget + +def download_file_insecure(url, target): + """ + Use Python to download the file, even though it cannot authenticate the + connection. + """ + try: + from urllib.request import urlopen + except ImportError: + from urllib2 import urlopen + src = dst = None + try: + src = urlopen(url) + # Read/write all in one block, so we don't create a corrupt file + # if the download is interrupted. + data = src.read() + dst = open(target, "wb") + dst.write(data) + finally: + if src: + src.close() + if dst: + dst.close() + +download_file_insecure.viable = lambda: True + +def get_best_downloader(): + downloaders = [ + download_file_powershell, + download_file_curl, + download_file_wget, + download_file_insecure, + ] + + for dl in downloaders: + if dl.viable(): + return dl + +def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, + to_dir=os.curdir, delay=15, + downloader_factory=get_best_downloader): + """Download setuptools from a specified location and return its filename + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end + with a '/'). `to_dir` is the directory where the egg will be downloaded. + `delay` is the number of seconds to pause before an actual download + attempt. + + ``downloader_factory`` should be a function taking no arguments and + returning a function for downloading a URL to a target. + """ + # making sure we use the absolute path + to_dir = os.path.abspath(to_dir) + tgz_name = "setuptools-%s.tar.gz" % version + url = download_base + tgz_name + saveto = os.path.join(to_dir, tgz_name) + if not os.path.exists(saveto): # Avoid repeated downloads + log.warn("Downloading %s", url) + downloader = downloader_factory() + downloader(url, saveto) + return os.path.realpath(saveto) + + +def _extractall(self, path=".", members=None): + """Extract all members from the archive to the current working + directory and set owner, modification time and permissions on + directories afterwards. `path' specifies a different directory + to extract to. `members' is optional and must be a subset of the + list returned by getmembers(). + """ + import copy + import operator + from tarfile import ExtractError + directories = [] + + if members is None: + members = self + + for tarinfo in members: + if tarinfo.isdir(): + # Extract directories with a safe mode. + directories.append(tarinfo) + tarinfo = copy.copy(tarinfo) + tarinfo.mode = 448 # decimal for oct 0700 + self.extract(tarinfo, path) + + # Reverse sort directories. + if sys.version_info < (2, 4): + def sorter(dir1, dir2): + return cmp(dir1.name, dir2.name) + directories.sort(sorter) + directories.reverse() + else: + directories.sort(key=operator.attrgetter('name'), reverse=True) + + # Set correct owner, mtime and filemode on directories. + for tarinfo in directories: + dirpath = os.path.join(path, tarinfo.name) + try: + self.chown(tarinfo, dirpath) + self.utime(tarinfo, dirpath) + self.chmod(tarinfo, dirpath) + except ExtractError: + e = sys.exc_info()[1] + if self.errorlevel > 1: + raise + else: + self._dbg(1, "tarfile: %s" % e) + + +def _build_install_args(options): + """ + Build the arguments to 'python setup.py install' on the setuptools package + """ + install_args = [] + if options.user_install: + if sys.version_info < (2, 6): + log.warn("--user requires Python 2.6 or later") + raise SystemExit(1) + install_args.append('--user') + return install_args + +def _parse_args(): + """ + Parse the command line for options + """ + parser = optparse.OptionParser() + parser.add_option( + '--user', dest='user_install', action='store_true', default=False, + help='install in user site package (requires Python 2.6 or later)') + parser.add_option( + '--download-base', dest='download_base', metavar="URL", + default=DEFAULT_URL, + help='alternative URL from where to download the setuptools package') + parser.add_option( + '--insecure', dest='downloader_factory', action='store_const', + const=lambda: download_file_insecure, default=get_best_downloader, + help='Use internal, non-validating downloader' + ) + options, args = parser.parse_args() + # positional arguments are ignored + return options + +def main(version=DEFAULT_VERSION): + """Install or upgrade setuptools and EasyInstall""" + options = _parse_args() + tarball = download_setuptools(download_base=options.download_base, + downloader_factory=options.downloader_factory) + return _install(tarball, _build_install_args(options)) + +if __name__ == '__main__': + sys.exit(main()) diff --git a/setup.py b/setup.py index db0ea02..912c242 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ import sys -from distribute_setup import use_setuptools +from ez_setup import use_setuptools use_setuptools() from setuptools import setup, find_packages -- To view, visit https://gerrit.wikimedia.org/r/83839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9160393aec062981546f5a277dd9526a7a43ff5c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Hashar <hashar(a)free.fr> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add Wikidata as wikibase repo of Wikimedia Commons - change (pywikibot/compat)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Add Wikidata as wikibase repo of Wikimedia Commons ...................................................................... Add Wikidata as wikibase repo of Wikimedia Commons Change-Id: I6078b1784b5614676a12489b54da6342ae087003 --- M families/commons_family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/commons_family.py b/families/commons_family.py index 0730e7d..872611e 100644 --- a/families/commons_family.py +++ b/families/commons_family.py @@ -76,3 +76,6 @@ def dbName(self, code): return 'commonswiki_p' + + def shared_data_repository(self, code, transcluded=False): + return ('wikidata', 'wikidata') -- To view, visit https://gerrit.wikimedia.org/r/86396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6078b1784b5614676a12489b54da6342ae087003 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] some pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: some pep8 changes ...................................................................... some pep8 changes Change-Id: I4a33e5f47ee6999f32a5cda6780de6771f3f01bc --- M wiktionary/wiktionarypagetest.py 1 file changed, 47 insertions(+), 26 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/wiktionary/wiktionarypagetest.py b/wiktionary/wiktionarypagetest.py index b5aadd2..2e6566b 100644 --- a/wiktionary/wiktionarypagetest.py +++ b/wiktionary/wiktionarypagetest.py @@ -9,18 +9,27 @@ class SortEntriesCheckSortOrder(unittest.TestCase): - """Entries should be sorted as follows on a page: Translingual first, Wikilang next, then the others alphabetically on the language name in the Wiktionary's language """ + """Entries should be sorted as follows on a page: Translingual first, + Wikilang next, then the others alphabetically on the language name in the + Wiktionary's language + + """ + def testHeaderInitKnownValuesType(self): """Sorting order of Entries on a page""" - examples=((('en','C'),('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), - ['translingual', 'en', 'nl', 'eo', 'fr', 'de', 'es']), - (('nl','C'),('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), - ['translingual', 'nl', 'de', 'en', 'eo', 'fr', 'es']), - (('fr','C'),('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), - ['translingual', 'fr', 'de', 'en', 'es', 'eo', 'nl']), - (('de','C'),('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), - ['translingual', 'de', 'en', 'eo', 'fr', 'nl', 'es']), - ) + examples = ((('en', 'C'), + ('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), + ['translingual', 'en', 'nl', 'eo', 'fr', 'de', 'es']), + (('nl', 'C'), + ('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), + ['translingual', 'nl', 'de', 'en', 'eo', 'fr', 'es']), + (('fr', 'C'), + ('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), + ['translingual', 'fr', 'de', 'en', 'es', 'eo', 'nl']), + (('de', 'C'), + ('eo', 'en', 'de', 'nl', 'es', 'translingual', 'fr'), + ['translingual', 'de', 'en', 'eo', 'fr', 'nl', 'es']), + ) for example in examples: page = wiktionarypage.WiktionaryPage(example[0][0], example[0][1]) for lang in example[1]: @@ -29,9 +38,13 @@ page.sortEntries() self.assertEqual(page.sortedentries, example[2]) + class TestKnownValuesInParser(unittest.TestCase): - """This class will check various aspects of parsing Wiktionary entries into our object model""" - knownvalues=( + """This class will check various aspects of parsing Wiktionary entries into + our object model + + """ + knownvalues = ( {'wikilang': 'en', 'term': 'nut', 'wikiformat': u"""==English== @@ -168,11 +181,12 @@ """, 'internalrep': ( - [u'1000 English basic words',u'Colors',u'Browns',u'Trees',u'Foods'], - [u'io','la'], + [u'1000 English basic words', u'Colors', u'Browns', u'Trees', u'Foods'], + [u'io', 'la'], {u'en': [u'nut', None, u'nuts', - [{'definition': u'A hard-shelled seed.', 'concisedef': u'seed', + [{'definition': u'A hard-shelled seed.', + 'concisedef': u'seed', 'trans': {'remark': '', 'alltrans': { 'nl': {'remark': '', @@ -199,7 +213,8 @@ } } }, - {'definition': u"A piece of metal, often [[hexagonal]], with a hole through it with internal threading intended to fit on to a bolt.", 'concisedef': u'that fits on a bolt', + {'definition': u"A piece of metal, often [[hexagonal]], with a hole through it with internal threading intended to fit on to a bolt.", + 'concisedef': u'that fits on a bolt', 'trans': {'remark': '', 'alltrans': { 'nl': {'remark': '', @@ -225,7 +240,8 @@ } } }, - {'definition': u"(''informal'') An insane person.", 'concisedef': u"informal: insane person", + {'definition': u"(''informal'') An insane person.", + 'concisedef': u"informal: insane person", 'syns': {'remark': '', 'synonyms': [{'remark': '', 'synonym': u"loony"}, @@ -265,7 +281,8 @@ } } }, - {'definition': u"(''slang'') The head.", 'concisedef': u"slang: the head", + {'definition': u"(''slang'') The head.", + 'concisedef': u"slang: the head", 'syns': {'remark': '(See further synonyms under [[head]])', 'synonyms': [{'remark': '', 'synonym': u"bonce"}, @@ -285,7 +302,8 @@ } } }, - {'definition': u"(''slang; rarely used in the singular'') A testicle.", 'concisedef': u"slang: testicle", + {'definition': u"(''slang; rarely used in the singular'') A testicle.", + 'concisedef': u"slang: testicle", 'syns': {'remark': '', 'synonyms': [{'remark': '', 'synonym': u"ball"}, @@ -347,7 +365,8 @@ [u''], {u'nl': [u'dummy', 'm', u"dummy's", - [{'definition': u'', 'concisedef': u'', + [{'definition': u'', + 'concisedef': u'', 'trans': {'remark': '', 'alltrans': { 'nl': {'remark': '', @@ -451,26 +470,28 @@ def testWhetherTranslationsAreParsedProperly(self): """Test whether translations are parsed properly""" for value in self.knownvalues: - internalrepresentation=value['internalrep'][2] - apage = wiktionarypage.WiktionaryPage(value['wikilang'],value['term']) + internalrepresentation = value['internalrep'][2] + apage = wiktionarypage.WiktionaryPage(value['wikilang'], + value['term']) apage.parseWikiPage(value['wikiformat']) for entrylang in internalrepresentation.keys(): definitions=internalrepresentation[entrylang][3] reftrans={} for definition in definitions: - if 'trans' in definition and definition['trans']!='': + if 'trans' in definition and definition['trans']: reftrans[definition['concisedef']] = definition['trans'] - resulttrans={} + resulttrans = {} for key in apage.entries[entrylang].meanings.keys(): print key for resultmeaning in apage.entries[entrylang].meanings[key]: print resultmeaning.concisedef - print 'Translations: ',resultmeaning.getTranslations() + print 'Translations: ', resultmeaning.getTranslations() resulttrans[resultmeaning.concisedef] = resultmeaning.getTranslations() for concisedef in resulttrans.keys(): - if concisedef != '' and concisedef in reftrans and concisedef in resulttrans: + if concisedef != '' and concisedef in reftrans and \ + concisedef in resulttrans: print concisedef print resulttrans[concisedef] # raw_input() -- To view, visit https://gerrit.wikimedia.org/r/86231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a33e5f47ee6999f32a5cda6780de6771f3f01bc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] update licence file from compat - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: update licence file from compat ...................................................................... update licence file from compat Change-Id: Ie91ef0c01d4688a197df0652474a1b763cd9e4df --- M LICENSE 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/LICENSE b/LICENSE index 6011a07..976c237 100644 --- a/LICENSE +++ b/LICENSE @@ -21,3 +21,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Everything in the 'externals' directory is general released under seperate +licenses. Some parts may come from Pywikipedia bot team and share the same +permissions, but in general they have to be checked for any external package +seperately. -- To view, visit https://gerrit.wikimedia.org/r/86378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie91ef0c01d4688a197df0652474a1b763cd9e4df Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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

1 0

[Gerrit] Cleanup cfd.py - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Cleanup cfd.py ...................................................................... Cleanup cfd.py Removed unneeded escapes from some regexes Removed unused variables Change-Id: I2e0b9356d4433b2c0c7ba6dcaf6273d04fba9daf --- M scripts/cfd.py 1 file changed, 12 insertions(+), 13 deletions(-) Approvals: Adamw: Looks good to me, but someone else must approve Xqt: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/cfd.py b/scripts/cfd.py index a830298..9116660 100644 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -18,7 +18,7 @@ import category # The location of the CFD working page. -cfdPage = 'Wikipedia:Categories for discussion/Working' +cfdPage = u'Wikipedia:Categories for discussion/Working' # A list of templates that are used on category pages as part of the CFD # process that contain information such as the link to the per-day discussion page. @@ -29,17 +29,17 @@ # to see how these work in context. To get this bot working on other wikis you will # need to adjust these regular expressions at the very least. nobots = re.compile(r"NO\s*BOTS", re.IGNORECASE) -example = re.compile(r"\[\[\:Category\:(.)\1\1\1\1\]\]", re.IGNORECASE) +example = re.compile(r"\[\[:Category:(.)\1\1\1\1\]\]", re.IGNORECASE) speedymode = re.compile(r"^===*\s*Speedy Moves\s*===*\s*$", re.IGNORECASE) -movemode = re.compile(r"^===*\s*Move\/Merge then delete\s*===*\s*$", re.IGNORECASE) +movemode = re.compile(r"^===*\s*Move/Merge then delete\s*===*\s*$", re.IGNORECASE) emptymode = re.compile(r"^===*\s*Empty then delete\s*===*\s*$", re.IGNORECASE) deletemode = re.compile(r"^===*\s*Ready for deletion\s*===*\s*$", re.IGNORECASE) maintenance = re.compile(r"^===*\s*Old by month categories with entries\s*===*\s*$", re.IGNORECASE) -dateheader = re.compile(r"(\[\[Wikipedia\:Categories[_ ]for[_ ](?:discussion|deletion)\/Log\/([^\]]*?)\]\])", +dateheader = re.compile(r"(\[\[Wikipedia:Categories[_ ]for[_ ](?:discussion|deletion)/Log/([^\]]*?)\]\])", re.IGNORECASE) -movecat = re.compile(r"\[\[\:Category\:([^\]]*?)\]\][^\]]*?\[\[\:Category\:([^\]]*?)\]\]", re.IGNORECASE) -deletecat = re.compile(r"\[\[\:Category\:([^\]]*?)\]\]", re.IGNORECASE) -findday = re.compile(r"\[\[(Wikipedia\:Categories for (?:discussion|deletion)\/Log\/\d{4} \w+ \d+)#", re.IGNORECASE) +movecat = re.compile(r"\[\[:Category:([^\]]*?)\]\][^\]]*?\[\[:Category:([^\]]*?)\]\]", re.IGNORECASE) +deletecat = re.compile(r"\[\[:Category:([^\]]*?)\]\]", re.IGNORECASE) +findday = re.compile(r"\[\[(Wikipedia:Categories for (?:discussion|deletion)/Log/\d{4} \w+ \d+)#", re.IGNORECASE) class ReCheck: @@ -59,9 +59,6 @@ # Variable declarations day = "None" mode = "None" - src = "None" - dest = "None" - line = "" summary = "" robot = None @@ -97,9 +94,11 @@ dest = m.result.group(2) thisDay = findDay(src, day) if mode == "Move" and thisDay != "None": - summary = "Robot - Moving category " + src + " to [[:Category:" + dest + "]] per [[WP:CFD|CFD]] at " + thisDay + "." + summary = "Robot - Moving category " + src + " to [[:Category:" + dest + "]] per [[WP:CFD|CFD]] at " + \ + thisDay + "." elif mode == "Speedy": - summary = "Robot - Speedily moving category " + src + " to [[:Category:" + dest + "]] per [[WP:CFDS|CFDS]]." + summary = "Robot - Speedily moving category " + src + " to [[:Category:" + dest + \ + "]] per [[WP:CFDS|CFDS]]." else: continue # If the category is redirect, we do NOT want to move articles to @@ -144,7 +143,7 @@ # parameter, which is essentially a fallback that is extracted from the # per-day subheadings on the working page. def findDay(pageTitle, oldDay): - page = pywikibot.Page(pywikibot.Site(), "Category:" + pageTitle) + page = pywikibot.Page(pywikibot.Site(), u"Category:" + pageTitle) try: pageSrc = page.get() m = findday.search(pageSrc) -- To view, visit https://gerrit.wikimedia.org/r/86345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e0b9356d4433b2c0c7ba6dcaf6273d04fba9daf Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Adamw <awight(a)wikimedia.org> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> 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

1 0

[Gerrit] calculating crossnamespace from authornamespaces, update fro... - change (pywikibot/compat)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: calculating crossnamespace from authornamespaces, update from core 86085 ...................................................................... calculating crossnamespace from authornamespaces, update from core 86085 Change-Id: I25b4aaf659c2c7f442bfafb6904761897397f3ee --- M families/wikisource_family.py M family.py 2 files changed, 5 insertions(+), 46 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikisource_family.py b/families/wikisource_family.py index c7bd9ed..1fa8ec5 100644 --- a/families/wikisource_family.py +++ b/families/wikisource_family.py @@ -717,48 +717,6 @@ 'zh': [102], } - self.crossnamespace[0] = { - '_default': self.authornamespaces, - } - self.crossnamespace[100] = { - 'bg': self.authornamespaces, - 'cs': self.authornamespaces, - 'hr': self.authornamespaces, - 'hu': self.authornamespaces, - 'hy': self.authornamespaces, - 'ko': self.authornamespaces, - 'tr': self.authornamespaces, - } - - self.crossnamespace[102] = { - 'ar': self.authornamespaces, - 'be': self.authornamespaces, - 'da': self.authornamespaces, - 'en': self.authornamespaces, - 'eo': self.authornamespaces, - 'fa': self.authornamespaces, - 'fr': self.authornamespaces, - 'it': self.authornamespaces, - 'la': self.authornamespaces, - 'nl': self.authornamespaces, - 'no': self.authornamespaces, - 'pt': self.authornamespaces, - 'ro': self.authornamespaces, - 'vi': self.authornamespaces, - 'zh': self.authornamespaces, - } - - self.crossnamespace[104] = { - 'pl': self.authornamespaces, - } - - self.crossnamespace[106] = { - 'ca': self.authornamespaces, - 'et': self.authornamespaces, - 'sv': self.authornamespaces, - } - - self.crossnamespace[108] = { - 'he': self.authornamespaces, - } - + for key, values in self.authornamespaces.iteritems(): + for item in values: + self.crossnamespace[item].update({key: self.authornamespaces}) diff --git a/family.py b/family.py index ac4ba46..77151b5 100644 --- a/family.py +++ b/family.py @@ -10,6 +10,7 @@ import re import urllib from datetime import timedelta, datetime +import collections import config import wikipedia as pywikibot @@ -3881,7 +3882,7 @@ # values are dicts where: # keys are the languages that can be linked to from the lang+ns, or # '_default'; values are a list of namespace numbers - self.crossnamespace = {} + self.crossnamespace = collections.defaultdict(dict) ## ## Examples : ## Allowing linking to pt' 102 NS from any other lang' 0 NS is -- To view, visit https://gerrit.wikimedia.org/r/86087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25b4aaf659c2c7f442bfafb6904761897397f3ee Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] calculating crossnamespace from authornamespaces; use collec... - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: calculating crossnamespace from authornamespaces; use collections.defaultdict for crossnamespace ...................................................................... calculating crossnamespace from authornamespaces; use collections.defaultdict for crossnamespace Change-Id: I19405fbaa7fa1d8d6d7077629762cbd0629adfa1 --- M pywikibot/families/wikisource_family.py M pywikibot/family.py 2 files changed, 6 insertions(+), 47 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/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index cb06da6..9660bcc 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -87,48 +87,6 @@ 'zh': [102], } - self.crossnamespace[0] = { - '_default': self.authornamespaces, - } - self.crossnamespace[100] = { - 'bg': self.authornamespaces, - 'cs': self.authornamespaces, - 'hr': self.authornamespaces, - 'hu': self.authornamespaces, - 'hy': self.authornamespaces, - 'ko': self.authornamespaces, - 'tr': self.authornamespaces, - } - - self.crossnamespace[102] = { - 'ar': self.authornamespaces, - 'be': self.authornamespaces, - 'da': self.authornamespaces, - 'en': self.authornamespaces, - 'eo': self.authornamespaces, - 'fa': self.authornamespaces, - 'fr': self.authornamespaces, - 'it': self.authornamespaces, - 'la': self.authornamespaces, - 'nl': self.authornamespaces, - 'no': self.authornamespaces, - 'pt': self.authornamespaces, - 'ro': self.authornamespaces, - 'vi': self.authornamespaces, - 'zh': self.authornamespaces, - } - - self.crossnamespace[104] = { - 'pl': self.authornamespaces, - } - - self.crossnamespace[106] = { - 'ca': self.authornamespaces, - 'et': self.authornamespaces, - 'sv': self.authornamespaces, - } - - self.crossnamespace[108] = { - 'he': self.authornamespaces, - } - + for key, values in self.authornamespaces.iteritems(): + for item in values: + self.crossnamespace[item].update({key: self.authornamespaces}) diff --git a/pywikibot/family.py b/pywikibot/family.py index fb4511c..abd304d 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -10,8 +10,9 @@ import logging import re import urllib -import config2 as config +import collections +import config2 as config import pywikibot logger = logging.getLogger("pywiki.wiki.family") @@ -709,7 +710,7 @@ # values are dicts where: # keys are the languages that can be linked to from the lang+ns, or # '_default'; values are a list of namespace numbers - self.crossnamespace = {} + self.crossnamespace = collections.defaultdict(dict) ## ## Examples : ## Allowing linking to pt' 102 NS from any other lang' 0 NS is -- To view, visit https://gerrit.wikimedia.org/r/86085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19405fbaa7fa1d8d6d7077629762cbd0629adfa1 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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

1 0

[Gerrit] remove default settings from family file - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Sep '13

28 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: remove default settings from family file ...................................................................... remove default settings from family file Change-Id: I0fed01a1c34d2acb1905c4193a7b70fd0b75df96 --- M pywikibot/families/wikiquote_family.py 1 file changed, 0 insertions(+), 14 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 9326056..736e50b 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -23,20 +23,6 @@ self.langs = dict([(lang, '%s.wikiquote.org' % lang) for lang in self.languages_by_size]) - # attop is a list of languages that prefer to have the interwiki - # links at the top of the page. - self.interwiki_attop = [] - - # on_one_line is a list of languages that want the interwiki links - # one-after-another on a single line - self.interwiki_on_one_line = [] - - # Similar for category - self.category_attop = [] - - # List of languages that want the category on_one_line. - self.category_on_one_line = [] - # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = [ 'af', 'am', 'ar', 'az', 'be', 'bg', 'br', 'bs', 'ca', 'cs', 'da', -- To view, visit https://gerrit.wikimedia.org/r/86369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0fed01a1c34d2acb1905c4193a7b70fd0b75df96 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits