Pywikipedia-svn April 2010

pywikipedia-svn@lists.wikimedia.org

8 participants
96 discussions

SVN: [8120]
by xqt＠svn.wikimedia.org 21 Apr '10

21 Apr '10

Revision: 8120 Author: xqt Date: 2010-04-21 17:28:26 +0000 (Wed, 21 Apr 2010) Log Message: ----------- update family file for cs-wiki, update sort order Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py trunk/pywikipedia/families/wikipedia_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-21 16:44:45 UTC (rev 8119) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-21 17:28:26 UTC (rev 8120) @@ -14,9 +14,9 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'eu', - 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', - 'lb', 'bs', 'war', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', + 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'nn', 'eu', + 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'war', + 'sh', 'lb', 'bs', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'lmo', 'cv', 'ksh', 'ga', 'tg', @@ -24,19 +24,19 @@ 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'nah', 'li', 'tt', 'glk', 'hsb', 'co', 'arz', 'roa-rup', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', 'nds-nl', 'pnb', 'vls', 'fo', 'tk', 'sa', 'am', 'ne', 'dv', 'nrm', - 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'pag', 'bar', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', 'frp', 'ang', + 'ilo', 'zh-classical', 'pi', 'km', 'lad', 'sc', 'mg', 'frp', 'ang', 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'ace', 'mhr', 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', 'ty', 'eml', - 'tpi', 'kab', 'krc', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', 'ig', + 'tpi', 'kab', 'krc', 'xal', 'so', 'zea', 'pap', 'srn', 'ay', 'ig', 'ba', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'lbe', - 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', 'tum', 'rn', + 'rw', 'tw', 'st', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] for lang in self.languages_by_size: Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-04-21 16:44:45 UTC (rev 8119) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-04-21 17:28:26 UTC (rev 8120) @@ -14,9 +14,9 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'eu', - 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', - 'lb', 'bs', 'war', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', + 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'nn', 'eu', + 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'war', + 'sh', 'lb', 'bs', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'lmo', 'cv', 'ksh', 'ga', 'tg', @@ -24,19 +24,19 @@ 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'nah', 'li', 'tt', 'glk', 'hsb', 'co', 'arz', 'roa-rup', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', 'nds-nl', 'pnb', 'vls', 'fo', 'tk', 'sa', 'am', 'ne', 'dv', 'nrm', - 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'pag', 'bar', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', 'frp', 'ang', + 'ilo', 'zh-classical', 'pi', 'km', 'lad', 'sc', 'mg', 'frp', 'ang', 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'ace', 'mhr', 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', 'ty', 'eml', - 'tpi', 'kab', 'krc', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', 'ig', + 'tpi', 'kab', 'krc', 'xal', 'so', 'zea', 'pap', 'srn', 'ay', 'ig', 'ba', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'lbe', - 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', 'tum', 'rn', + 'rw', 'tw', 'st', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] if family.config.SSL_connection: @@ -46,7 +46,6 @@ # Override defaults self.namespaces[2]['cs'] = u'Wikipedista' - self.namespaces[3]['cs'] = u'Wikipedista diskuse' self.namespaces[2]['pl'] = u'Wikipedysta' self.namespaces[3]['pl'] = u'Dyskusja wikipedysty'

1 0

SVN: [8119] trunk/pywikipedia/interwiki.py
by xqt＠svn.wikimedia.org 21 Apr '10

21 Apr '10

Revision: 8119 Author: xqt Date: 2010-04-21 16:44:45 +0000 (Wed, 21 Apr 2010) Log Message: ----------- -async option: put page on queue to be saved to wiki asynchronously. This enables loading pages during saving throtteling and gives a better performance Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2010-04-21 15:52:09 UTC (rev 8118) +++ trunk/pywikipedia/interwiki.py 2010-04-21 16:44:45 UTC (rev 8119) @@ -62,6 +62,12 @@ -quiet: Use this option to get less output + -async: Put page on queue to be saved to wiki asynchronously. This + enables loading pages during saving throtteling and gives a + better performance. + NOTE: For post-processing it always assumes that saving the + the pages was sucessful. + Additionaly, these arguments can be used to restrict the bot to certain pages: -namespace:n Number or name of namespace to process. The parameter can be @@ -329,7 +335,8 @@ return seq2 import wikipedia as pywikibot -import config, pagegenerators, catlib +import config, catlib +import pagegenerators import titletranslate, interwiki_graph import webbrowser @@ -584,6 +591,7 @@ minlinks = 0 quiet = False restoreAll = False + async = False def readOptions(self, arg): """ Read all commandline parameters for the global container """ @@ -678,6 +686,8 @@ self.nobackonly = True elif arg == '-quiet': self.quiet = True + elif arg == '-async': + self.async = True elif arg.startswith('-lack:'): remainder = arg[6:].split(':') self.lacklanguage = remainder[0] @@ -1817,9 +1827,13 @@ if not globalvar.quiet or pywikibot.verbose: pywikibot.output(u"NOTE: Updating live wiki...") timeout=60 - while 1: + while True: try: - status, reason, data = page.put(newtext, comment = mcomment) + if globalvar.async: + page.put_async(newtext, comment = mcomment) + status = 302 + else: + status, reason, data = page.put(newtext, comment = mcomment) except pywikibot.LockedPage: pywikibot.output(u'Page %s is locked. Skipping.' % (page.title(),)) raise SaveError

1 0

SVN: [8118] branches/rewrite
by russblau＠svn.wikimedia.org 21 Apr '10

21 Apr '10

Revision: 8118 Author: russblau Date: 2010-04-21 15:52:09 +0000 (Wed, 21 Apr 2010) Log Message: ----------- Upgrading from setuptools to Distribute; see http://packages.python.org/distribute/ for info. Modified Paths: -------------- branches/rewrite/setup.py Added Paths: ----------- branches/rewrite/distribute_setup.py Removed Paths: ------------- branches/rewrite/ez_setup.py Added: branches/rewrite/distribute_setup.py =================================================================== --- branches/rewrite/distribute_setup.py (rev 0) +++ branches/rewrite/distribute_setup.py 2010-04-21 15:52:09 UTC (rev 8118) @@ -0,0 +1,477 @@ +#!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:]) Deleted: branches/rewrite/ez_setup.py =================================================================== --- branches/rewrite/ez_setup.py 2010-04-20 15:27:59 UTC (rev 8117) +++ branches/rewrite/ez_setup.py 2010-04-21 15:52:09 UTC (rev 8118) @@ -1,276 +0,0 @@ -#!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 sys -DEFAULT_VERSION = "0.6c9" -DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] - -md5_data = { - 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', - 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', - 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', - 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', - 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', - 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', - 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', - 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', - 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', - 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', - 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', - 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', - 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', - 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', - 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', - 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', - 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', - 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', - 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', - 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', - 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', - 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', - 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', - 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', - 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', - 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', - 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', - 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', - 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', - 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', - 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', - 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', - 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', - 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a', -} - -import sys, os -try: from hashlib import md5 -except ImportError: from md5 import md5 - -def _validate_md5(egg_name, data): - if egg_name in md5_data: - digest = md5(data).hexdigest() - if digest != md5_data[egg_name]: - print >>sys.stderr, ( - "md5 validation of %s failed! (Possible download problem?)" - % egg_name - ) - sys.exit(2) - return data - -def use_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - download_delay=15 -): - """Automatically find/download setuptools and make it available on sys.path - - `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 setuptools will be downloaded, if - it is not already available. If `download_delay` is specified, it should - be the number of seconds that will be paused before initiating a download, - should one be required. If an older version of setuptools is installed, - this routine will print a message to ``sys.stderr`` and raise SystemExit in - an attempt to abort the calling script. - """ - was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules - def do_download(): - egg = download_setuptools(version, download_base, to_dir, download_delay) - sys.path.insert(0, egg) - import setuptools; setuptools.bootstrap_install_from = egg - try: - import pkg_resources - except ImportError: - return do_download() - try: - pkg_resources.require("setuptools>="+version); return - except pkg_resources.VersionConflict, e: - if was_imported: - print >>sys.stderr, ( - "The required version of setuptools (>=%s) is not available, and\n" - "can't be installed while this script is running. Please install\n" - " a more recent version first, using 'easy_install -U setuptools'." - "\n\n(Currently using %r)" - ) % (version, e.args[0]) - sys.exit(2) - else: - del pkg_resources, sys.modules['pkg_resources'] # reload ok - return do_download() - except pkg_resources.DistributionNotFound: - return do_download() - -def download_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - delay = 15 -): - """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. - """ - import urllib2, shutil - egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) - url = download_base + egg_name - saveto = os.path.join(to_dir, egg_name) - src = dst = None - if not os.path.exists(saveto): # Avoid repeated downloads - try: - from distutils import log - if delay: - log.warn(""" ---------------------------------------------------------------------------- -This script requires setuptools version %s to run (even to display -help). I will attempt to download it for you (from -%s), but -you may need to enable firewall access for this script first. -I will start the download in %d seconds. - -(Note: if this machine does not have network access, please obtain the file - - %s - -and place it in this directory before rerunning this script.) ----------------------------------------------------------------------------""", - version, download_base, delay, url - ); from time import sleep; sleep(delay) - log.warn("Downloading %s", url) - src = urllib2.urlopen(url) - # Read/write all in one block, so we don't create a corrupt file - # if the download is interrupted. - data = _validate_md5(egg_name, src.read()) - dst = open(saveto,"wb"); dst.write(data) - finally: - if src: src.close() - if dst: dst.close() - return os.path.realpath(saveto) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -def main(argv, version=DEFAULT_VERSION): - """Install or upgrade setuptools and EasyInstall""" - try: - import setuptools - except ImportError: - egg = None - try: - egg = download_setuptools(version, delay=0) - sys.path.insert(0,egg) - from setuptools.command.easy_install import main - return main(list(argv)+[egg]) # we're done here - finally: - if egg and os.path.exists(egg): - os.unlink(egg) - else: - if setuptools.__version__ == '0.0.1': - print >>sys.stderr, ( - "You have an obsolete version of setuptools installed. Please\n" - "remove it from your system entirely before rerunning this script." - ) - sys.exit(2) - - req = "setuptools>="+version - import pkg_resources - try: - pkg_resources.require(req) - except pkg_resources.VersionConflict: - try: - from setuptools.command.easy_install import main - except ImportError: - from easy_install import main - main(list(argv)+[download_setuptools(delay=0)]) - sys.exit(0) # try to force an exit - else: - if argv: - from setuptools.command.easy_install import main - main(argv) - else: - print "Setuptools version",version,"or greater has been installed." - print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' - -def update_md5(filenames): - """Update our built-in md5 registry""" - - import re - - for name in filenames: - base = os.path.basename(name) - f = open(name,'rb') - md5_data[base] = md5(f.read()).hexdigest() - f.close() - - data = [" %r: %r,\n" % it for it in md5_data.items()] - data.sort() - repl = "".join(data) - - import inspect - srcfile = inspect.getsourcefile(sys.modules[__name__]) - f = open(srcfile, 'rb'); src = f.read(); f.close() - - match = re.search("\nmd5_data = {\n([^}]+)}", src) - if not match: - print >>sys.stderr, "Internal error!" - sys.exit(2) - - src = src[:match.start(1)] + repl + src[match.end(1):] - f = open(srcfile,'w') - f.write(src) - f.close() - - -if __name__=='__main__': - if len(sys.argv)>2 and sys.argv[1]=='--md5update': - update_md5(sys.argv[2:]) - else: - main(sys.argv[1:]) - - - - - - Modified: branches/rewrite/setup.py =================================================================== --- branches/rewrite/setup.py 2010-04-20 15:27:59 UTC (rev 8117) +++ branches/rewrite/setup.py 2010-04-21 15:52:09 UTC (rev 8118) @@ -1,7 +1,7 @@ import sys -import ez_setup -ez_setup.use_setuptools() +from distribute_setup import use_setuptools +use_setuptools() from setuptools import setup, find_packages @@ -27,4 +27,4 @@ import subprocess python = sys.executable python = python.replace("pythonw.exe", "python.exe") # for Windows -ignore = subprocess.call([python, "generate_user_files.py"]) \ No newline at end of file +ignore = subprocess.call([python, "generate_user_files.py"])

1 0

SVN: [8117] branches/rewrite/generate_user_files.py
by russblau＠svn.wikimedia.org 20 Apr '10

20 Apr '10

Revision: 8117 Author: russblau Date: 2010-04-20 15:27:59 +0000 (Tue, 20 Apr 2010) Log Message: ----------- Fix "Yy" bug Modified Paths: -------------- branches/rewrite/generate_user_files.py Modified: branches/rewrite/generate_user_files.py =================================================================== --- branches/rewrite/generate_user_files.py 2010-04-20 14:09:05 UTC (rev 8116) +++ branches/rewrite/generate_user_files.py 2010-04-20 15:27:59 UTC (rev 8117) @@ -112,7 +112,7 @@ for line in msg: print line ok = raw_input("Is this OK? [y/N] ") - if ok in ["Yy"]: + if ok in ["Y", "y"]: base_dir = new_base return True print "Aborting changes."

1 0

SVN: [8116] branches/rewrite
by russblau＠svn.wikimedia.org 20 Apr '10

20 Apr '10

Revision: 8116 Author: russblau Date: 2010-04-20 14:09:05 +0000 (Tue, 20 Apr 2010) Log Message: ----------- Add installation instructions and update setup.py script Modified Paths: -------------- branches/rewrite/setup.py Added Paths: ----------- branches/rewrite/INSTALL Added: branches/rewrite/INSTALL =================================================================== --- branches/rewrite/INSTALL (rev 0) +++ branches/rewrite/INSTALL 2010-04-20 14:09:05 UTC (rev 8116) @@ -0,0 +1,21 @@ +To install the Pywikipediabot framework: + +1) Extract/unzip this package to a directory on your computer. +2) Open a command prompt in that directory, and run the command: + + python setup.py install + +This will install the package to the "site-packages" directory of your Python +installation. Linux/Unix users may need to add "sudo" at the beginning of the +command line to get access to the site-packages directory; or, they can +install the package to a different location by running: + + python setup.py install --home=/path/to/location + +where "/path/to/location" is the directory that you want the Pywikipediabot +files installed to. + +Note: You will need to have an active Internet connection when you run the +setup script, in case the installer needs to download other modules required +by the framework. + Modified: branches/rewrite/setup.py =================================================================== --- branches/rewrite/setup.py 2010-04-19 21:03:51 UTC (rev 8115) +++ branches/rewrite/setup.py 2010-04-20 14:09:05 UTC (rev 8116) @@ -1,3 +1,5 @@ +import sys + import ez_setup ez_setup.use_setuptools() @@ -3,10 +5,25 @@ from setuptools import setup, find_packages -setup(name='pywikibot', - version ='0.1.0dev', +if sys.version_info[0] != 2: + raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") +if sys.version_info[1] < 5: + raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.5 or higher") +elif sys.version_info[1] == 5: + depend = ['simplejson', 'httplib2>=0.6.0'] +else: + depend = ['httplib2>=0.6.0'] + +setup(name='Pywikipediabot', + version ='2.0alpha', description ='Python Wikipedia Bot Framework', + license = 'MIT', packages = find_packages(), - license = 'MIT', - install_requites = ['simplejson', 'httplib2>=0.4.0'] + install_requires = depend ) +# 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"]) \ No newline at end of file

1 0

SVN: [8115]
by xqt＠svn.wikimedia.org 19 Apr '10

19 Apr '10

Revision: 8115 Author: xqt Date: 2010-04-19 21:03:51 +0000 (Mon, 19 Apr 2010) Log Message: ----------- category_redirect: localisation for es-wiki by manuelt15 Modified Paths: -------------- branches/rewrite/scripts/category_redirect.py trunk/pywikipedia/category_redirect.py Modified: branches/rewrite/scripts/category_redirect.py =================================================================== --- branches/rewrite/scripts/category_redirect.py 2010-04-19 20:52:19 UTC (rev 8114) +++ branches/rewrite/scripts/category_redirect.py 2010-04-19 21:03:51 UTC (rev 8115) @@ -51,6 +51,7 @@ 'cs': u"Kategorie:Zastaralé kategorie", 'da': "Kategori:Omdirigeringskategorier", 'en': "Category:Wikipedia soft redirected categories", + 'es': "Categoría:Wikipedia:Categorías redirigidas", 'hu': "Kategória:Kategóriaátirányítások", 'ja': "Category:移行中のカテゴリ", 'no': "Kategori:Wikipedia omdirigertekategorier", @@ -71,6 +72,7 @@ 'en': u"Robot: change redirected category [[:%(oldCatLink)s|%(oldCatTitle)s]]" u" to [[:%(newCatLink)s|%(newCatTitle)s]]", + 'es': u"Bot: moviendo páginas de categoría redirigida", 'hu': u"Bot: Lapok automatikus áthelyezése átirányított kategóriából", 'ja': u"ロボットによる: 移行中のカテゴリからのカテゴリ変更", 'ksh': u"Bot: Sigk uß en ömjeleidt Saachjropp eruß jesammdt.", @@ -86,6 +88,7 @@ 'cs':u'Robot označil kategorii jako zastaralou', 'da':u"Robot: tilføjer omdirigeringsskabelon for vedligeholdelse", 'en':u"Robot: adding category redirect template for maintenance", + 'es':u"Bot: añadiendo plantilla de categoría redirigida para mantenimiento", 'hu':u"Bot: kategóriaátirányítás sablon hozzáadása", 'ja':u"ロボットによる: 移行中のカテゴリとしてタグ付け", 'ksh':u"Bot: Ömleidungsschalbon dobeijedonn.", @@ -100,6 +103,7 @@ 'cs': u'Robot opravil dvojité přesměrování', 'da': u"Robot: retter dobbelt omdirigering", 'en': u"Robot: fixing double-redirect", + 'es': u"Bot: reparando redirección doble", 'fr': u"Robot : Correction des redirections doubles", 'hu': u"Bot: Kettős átirányítás javítása", 'ja': u"ロボットによる: 二重リダイレクト修正", @@ -115,6 +119,7 @@ 'cs': u'Údržba přesměrované kategorie', 'da': u"Bot til vedligeholdelse af kategoromdirigeringer", 'en': u"Category redirect maintenance bot", + 'es': u"Bot de mantenimento de categorías redirigidas", 'fr': u"Robot de maintenance des redirection de catégorie", 'hu': u"Kategóriaátirányítás-karbantartó bot", 'ja': u"移行中のカテゴリのメンテナンス・ボット", @@ -132,6 +137,12 @@ %s ~~~~ """, + 'es': u"""\ +Se han detectado las siguientes páginas protegidas y se requieren actualizaciones de \ +enlaces de categorías: +%s +~~~~ +""", 'ksh': u"""\ Hee di Sigge sin jeschötz un möße ier Saachjroppe odder Lingks op Saachjroppe \ aanjepaß krijje: @@ -144,7 +155,7 @@ %s ~~~~ """, - 'vi': u"""\ + 'vi': u"""\ Các trang đã khóa sau cần phải cập nhật \ liên kết thể loại: %s @@ -160,7 +171,9 @@ self.edit_request_item = pywikibot.translate(self.site.lang, { + 'ar': u"* %s موجودة في %s, وهي تحويلة إلى %s", 'en': u"* %s is in %s, which is a redirect to %s", + 'es': u"* %s está en %s, el cual redirecciona a %s", 'fr': u"* %s est dans %s, qui est une redirection vers %s", 'ksh': u"* %s es en %s, un dat es en Ömleidung op %s", 'pl': u"* %s jest w %s, która jest przekierowaniem do %s", @@ -558,7 +571,6 @@ % u"\n".join((self.edit_request_item % item) for item in self.edit_requests)) - def main(*args): global bot try: @@ -573,6 +585,5 @@ finally: pywikibot.stopme() - if __name__ == "__main__": main() Modified: trunk/pywikipedia/category_redirect.py =================================================================== --- trunk/pywikipedia/category_redirect.py 2010-04-19 20:52:19 UTC (rev 8114) +++ trunk/pywikipedia/category_redirect.py 2010-04-19 21:03:51 UTC (rev 8115) @@ -62,6 +62,7 @@ 'cs': u"Kategorie:Zastaralé kategorie", 'da': "Kategori:Omdirigeringskategorier", 'en': "Category:Wikipedia soft redirected categories", + 'es': "Categoría:Wikipedia:Categorías redirigidas", 'hu': "Kategória:Kategóriaátirányítások", 'ja': "Category:移行中のカテゴリ", 'no': "Kategori:Wikipedia omdirigertekategorier", @@ -80,6 +81,7 @@ 'cs': u'Robot přesunul stránku ze zastaralé kategorie', 'da': u"Robot: flytter sider ud af omdirigeringskategorien", 'en': u"Robot: moving pages out of redirected category", + 'es': u"Bot: moviendo páginas de categoría redirigida", 'hu': u"Bot: Lapok automatikus áthelyezése átirányított kategóriából", 'ja': u"ロボットによる: 移行中のカテゴリからのカテゴリ変更", 'ksh': u"Bot: Sigk uß en ömjeleidt Saachjropp eruß jesammdt.", @@ -95,6 +97,7 @@ 'cs':u'Robot označil kategorii jako zastaralou', 'da':u"Robot: tilføjer omdirigeringsskabelon for vedligeholdelse", 'en':u"Robot: adding category redirect template for maintenance", + 'es':u"Bot: añadiendo plantilla de categoría redirigida para mantenimiento", 'hu':u"Bot: kategóriaátirányítás sablon hozzáadása", 'ja':u"ロボットによる: 移行中のカテゴリとしてタグ付け", 'ksh':u"Bot: Ömleidungsschalbon dobeijedonn.", @@ -109,6 +112,7 @@ 'cs': u'Robot opravil dvojité přesměrování', 'da': u"Robot: retter dobbelt omdirigering", 'en': u"Robot: fixing double-redirect", + 'es': u"Bot: reparando redirección doble", 'fr': u"Robot : Correction des redirections doubles", 'hu': u"Bot: Kettős átirányítás javítása", 'ja': u"ロボットによる: 二重リダイレクト修正", @@ -124,6 +128,7 @@ 'cs': u'Údržba přesměrované kategorie', 'da': u"Bot til vedligeholdelse af kategoromdirigeringer", 'en': u"Category redirect maintenance bot", + 'es': u"Bot de mantenimento de categorías redirigidas", 'fr': u"Robot de maintenance des redirection de catégorie", 'hu': u"Kategóriaátirányítás-karbantartó bot", 'ja': u"移行中のカテゴリのメンテナンス・ボット", @@ -141,6 +146,12 @@ %s ~~~~ """, + 'es': u"""\ +Se han detectado las siguientes páginas protegidas y se requieren actualizaciones de \ +enlaces de categorías: +%s +~~~~ +""", 'ksh': u"""\ Hee di Sigge sin jeschötz un möße ier Saachjroppe odder Lingks op Saachjroppe \ aanjepaß krijje: @@ -153,7 +164,7 @@ %s ~~~~ """, - 'vi': u"""\ + 'vi': u"""\ Các trang đã khóa sau cần phải cập nhật \ liên kết thể loại: %s @@ -171,6 +182,7 @@ { 'ar': u"* %s موجودة في %s, وهي تحويلة إلى %s", 'en': u"* %s is in %s, which is a redirect to %s", + 'es': u"* %s está en %s, el cual redirecciona a %s", 'fr': u"* %s est dans %s, qui est une redirection vers %s", 'ksh': u"* %s es en %s, un dat es en Ömleidung op %s", 'pl': u"* %s jest w %s, która jest przekierowaniem do %s",

1 0

SVN: [8114] trunk/pywikipedia/login.py
by xqt＠svn.wikimedia.org 19 Apr '10

19 Apr '10

Revision: 8114 Author: xqt Date: 2010-04-19 20:52:19 +0000 (Mon, 19 Apr 2010) Log Message: ----------- build the cookie first before first login part Modified Paths: -------------- trunk/pywikipedia/login.py Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2010-04-19 17:41:00 UTC (rev 8113) +++ trunk/pywikipedia/login.py 2010-04-19 20:52:19 UTC (rev 8114) @@ -168,32 +168,23 @@ if api: while True: + # build the cookie + L = {} + L["cookieprefix"] = None + index = self.site._userIndex(self.sysop) + if self.site._cookies[index]: + #if user is trying re-login, update the new information + self.site.updateCookies(L, self.sysop) + else: + # clean type login, setup the new cookies files. + self.site._setupCookies(L, self.sysop) response, data = query.GetData(predata, self.site, sysop=self.sysop, back_response = True) result = data['login']['result'] if result == "NeedToken": predata["lgtoken"] = data["login"]["token"] - # build the cookie (q&d-fix) - #### - Reat=re.compile(': (.*?)=(.*?);') - L = {} - L["cookieprefix"] = "pdcwiki" - #print '---------# data #---------' - #print data - #if got_token and got_user: - #process the basic information to Site() - index = self.site._userIndex(self.sysop) - #print index - #API result came back username, token and sessions. if ['lgtoken'] in data['login'].keys(): self.site._userName[index] = data['login']['lgusername'] self.site._token[index] = data['login']['lgtoken'] + "+\\" - if self.site._cookies[index]: - #if user is trying re-login, update the new information - self.site.updateCookies(L, self.sysop) - else: - # clean type login, setup the new cookies files. - self.site._setupCookies(L, self.sysop) - #### continue break if result != "Success":

1 0

SVN: [8113] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 19 Apr '10

19 Apr '10

Revision: 8113 Author: xqt Date: 2010-04-19 17:41:00 +0000 (Mon, 19 Apr 2010) Log Message: ----------- new cs namespace alias, update family files Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wiktionary_family.py trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikinews_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wikiversity_family.py trunk/pywikipedia/families/wiktionary_family.py trunk/pywikipedia/family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -13,9 +13,9 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'zh', 'sv', 'ca', 'da', 'th', - 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'is', 'gl', 'no', 'ta', - 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', - 'si', 'cv', 'uk', 'sl', 'et', 'mr', 'ur', 'ml', 'az', 'oc', 'ms', + 'tr', 'mk', 'sr', 'fa', 'tl', 'ar', 'id', 'is', 'gl', 'no', 'ta', + 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', + 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', 'sa', 'ky', 'be', 'ast', 'tt', 'zh-min-nan', 'cy', 'mg', 'ne', 'ku', 'co', 'sw', 'tk', 'su', 'als', 'vo', 'uz', 'na', 'mn', 'kk', 'nds', Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -14,30 +14,29 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'ms', 'new', 'th', 'simple', 'gl', 'nn', 'eu', + 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'eu', 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', - 'lb', 'bs', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'war', 'bpy', - 'pms', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', + 'lb', 'bs', 'war', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', + 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'lmo', 'cv', 'ksh', 'ga', 'tg', - 'roa-tara', 'hy', 'vec', 'kn', 'gd', 'yi', 'uz', 'pam', 'yo', + 'roa-tara', 'hy', 'vec', 'kn', 'gd', 'yi', 'uz', 'pam', 'yo', 'os', 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'nah', 'li', 'tt', 'glk', - 'hsb', 'co', 'roa-rup', 'arz', 'os', 'gan', 'ia', 'bcl', 'mn', - 'fiu-vro', 'nds-nl', 'vls', 'pnb', 'fo', 'tk', 'sa', 'am', 'ne', - 'dv', 'nrm', 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', - 'diq', 'wuu', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', - 'mzn', 'csb', 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', - 'frp', 'ang', 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', - 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', - 'ace', 'mhr', 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', - 'ty', 'eml', 'tpi', 'kab', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', - 'krc', 'ba', 'ig', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', - 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', - 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', - 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', - 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', - 'bxr', 'lbe', 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', - 'tum', 'rn', + 'hsb', 'co', 'arz', 'roa-rup', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', + 'nds-nl', 'pnb', 'vls', 'fo', 'tk', 'sa', 'am', 'ne', 'dv', 'nrm', + 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', + 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', 'frp', 'ang', + 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', 'ps', 'ie', + 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'ace', 'mhr', + 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', 'ty', 'eml', + 'tpi', 'kab', 'krc', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', 'ig', + 'ba', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', 'cu', 'kaa', + 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', + 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'chr', 'bug', + 'ee', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', + 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'lbe', + 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', 'tum', 'rn', ] for lang in self.languages_by_size: Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -13,17 +13,17 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'pt', 'fi', 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'lo', 'kn', - 'ja', 'ml', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', + 'ml', 'ja', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'li', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', 'sw', 'simple', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', - 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'tk', 'ast', 'ur', 'hsb', - 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'gn', 'az', - 'ia', 'co', 'my', 'eu', 'sk', 'ne', 'csb', 'ms', 'st', 'tl', 'mr', + 'tt', 'la', 'zh-min-nan', 'da', 'ne', 'wa', 'tk', 'ast', 'ur', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'gn', + 'az', 'ia', 'co', 'my', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', 'mr', 'cy', 'mg', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', - 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'be', + 'bn', 'gu', 'km', 'ss', 'be', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'iu', 'yi', 'gd', 'kw', 'tg', 'si', 'nn', 'gv', 'zu', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'mi', 'uz', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', + 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -13,9 +13,9 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'zh', 'sv', 'ca', 'da', 'th', - 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'is', 'gl', 'no', 'ta', - 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', - 'si', 'cv', 'uk', 'sl', 'et', 'mr', 'ur', 'ml', 'az', 'oc', 'ms', + 'tr', 'mk', 'sr', 'fa', 'tl', 'ar', 'id', 'is', 'gl', 'no', 'ta', + 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', + 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', 'sa', 'ky', 'be', 'ast', 'tt', 'zh-min-nan', 'cy', 'mg', 'ne', 'ku', 'co', 'sw', 'tk', 'su', 'als', 'vo', 'uz', 'na', 'mn', 'kk', 'nds', @@ -93,7 +93,7 @@ 'bn': u'উইকিবই আলোচনা', 'bs': u'Razgovor s Wikiknjigama', 'ca': u'Viquillibres Discussió', - 'cs': u'Wikiknihy diskuse', + 'cs': u'Diskuse k Wikiknihám', 'cv': u'Wikibooks сӳтсе явмалли', 'cy': u'Sgwrs Wicillyfrau', 'da': u'Wikibooks-diskussion', Modified: trunk/pywikipedia/families/wikinews_family.py =================================================================== --- trunk/pywikipedia/families/wikinews_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikinews_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -61,7 +61,7 @@ 'bg': u'Уикиновини беседа', 'bs': u'Razgovor s Wikivijestima', 'ca': u'Viquinotícies Discussió', - 'cs': u'Wikizprávy diskuse', + 'cs': u'Diskuse k Wikizprávám', 'de': u'Wikinews Diskussion', 'es': u'Wikinoticias Discusión', 'fi': u'Keskustelu Wikiuutisista', @@ -122,7 +122,7 @@ self.namespaces[101] = { 'ar': u'نقاش البوابة', - 'cs': u'Portál diskuse', + 'cs': u'Diskuse k portálu', 'de': u'Portal Diskussion', 'en': u'Portal talk', 'es': u'Comentarios Discusión', Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -14,30 +14,29 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'ms', 'new', 'th', 'simple', 'gl', 'nn', 'eu', + 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'eu', 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', - 'lb', 'bs', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'war', 'bpy', - 'pms', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', + 'lb', 'bs', 'war', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'pms', + 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'lmo', 'cv', 'ksh', 'ga', 'tg', - 'roa-tara', 'hy', 'vec', 'kn', 'gd', 'yi', 'uz', 'pam', 'yo', + 'roa-tara', 'hy', 'vec', 'kn', 'gd', 'yi', 'uz', 'pam', 'yo', 'os', 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'nah', 'li', 'tt', 'glk', - 'hsb', 'co', 'roa-rup', 'arz', 'os', 'gan', 'ia', 'bcl', 'mn', - 'fiu-vro', 'nds-nl', 'vls', 'pnb', 'fo', 'tk', 'sa', 'am', 'ne', - 'dv', 'nrm', 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', - 'diq', 'wuu', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', - 'mzn', 'csb', 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', - 'frp', 'ang', 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', - 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', - 'ace', 'mhr', 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', - 'ty', 'eml', 'tpi', 'kab', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', - 'krc', 'ba', 'ig', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', - 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', - 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', - 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', - 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', - 'bxr', 'lbe', 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', - 'tum', 'rn', + 'hsb', 'co', 'arz', 'roa-rup', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', + 'nds-nl', 'pnb', 'vls', 'fo', 'tk', 'sa', 'am', 'ne', 'dv', 'nrm', + 'pag', 'rm', 'bar', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', + 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', 'frp', 'ang', + 'kw', 'hif', 'ckb', 'haw', 'pdc', 'szl', 'bo', 'pa', 'ps', 'ie', + 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'ace', 'mhr', + 'nv', 'ky', 'ext', 'cbk-zam', 'arc', 'jbo', 'wo', 'ty', 'eml', + 'tpi', 'kab', 'krc', 'so', 'xal', 'zea', 'pap', 'srn', 'ay', 'ig', + 'ba', 'or', 'dsb', 'kg', 'lo', 'udm', 'rmy', 'kl', 'cu', 'kaa', + 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', + 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'chr', 'bug', + 'ee', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', + 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'lbe', + 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'chy', 'lg', 'tum', 'rn', ] if family.config.SSL_connection: @@ -188,7 +187,7 @@ 'ch': u'Kombetsasion nu Wikipedia', 'ckb': [u'لێدوانی ویکیپیدیا', u'لێدوانی Wikipedia'], 'crh': [u'Vikipediya muzakeresi', u'Vikipediya музакереси'], - 'cs': u'Wikipedie diskuse', + 'cs': u'Diskuse k Wikipedii', 'csb': u'Diskùsëjô Wiki', 'cu': [u'Википє́дїѩ бєсѣ́да', u'Википедїѩ бєсѣ́да'], 'cv': u'Википеди сӳтсе явмалли', @@ -440,7 +439,7 @@ 'bpy': u'হমিলদুৱার য়্যারী', 'ca': u'Portal Discussió', 'ckb': u'لێدوانی دەروازە', - 'cs': u'Portál diskuse', + 'cs': u'Diskuse k portálu', 'da': [u'Portaldiskussion', u'Portal diskussion'], 'de': u'Portal Diskussion', 'dv': u'ނެރު ޚ ޔާލު', @@ -496,7 +495,7 @@ 'su': u'Obrolan portal', 'sv': u'Portaldiskussion', 'sw': u'Majadiliano ya lango', - 'ta': u'வலைவாசல் பேச்ச', + 'ta': u'வலைவாசல் பேச்சு', 'te': u'వేదిక చర్చ', 'tg': u'Баҳси портал', 'th': u'คุยเรื่องสถานีย่อย', @@ -540,7 +539,7 @@ self.namespaces[103] = { 'als': u'Buech Diskussion', 'ca': u'Viquiprojecte Discussió', - 'cs': u'Rejstřík diskuse', + 'cs': u'Diskuse k rejstříku', 'da': u'Artikeldatadiskussion', 'eo': u'Projekta diskuto', 'es': u'Wikiproyecto Discusión', Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -79,7 +79,7 @@ 'br': u'Kaozeadenn Wikiarroud', 'bs': u'Razgovor s Wikicitatima', 'ca': u'Viquidites Discussió', - 'cs': u'Wikicitáty diskuse', + 'cs': u'Diskuse k Wikicitátům', 'cy': u'Sgwrs Wikiquote', 'da': u'Wikiquote-diskussion', 'de': u'Wikiquote Diskussion', Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikisource_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -82,7 +82,7 @@ 'bn': u'উইকিসংকলন আলোচনা', 'bs': u'Razgovor s Wikizvor', 'ca': u'Viquitexts Discussió', - 'cs': u'Wikizdroje diskuse', + 'cs': u'Diskuse k Wikizdrojům', 'cy': u'Sgwrs Wicitestun', 'da': u'Wikisource-diskussion', 'de': u'Wikisource Diskussion', @@ -155,7 +155,7 @@ 'ar': u'نقاش البوابة', 'bg': u'Автор беседа', 'bn': u'লেখক আলাপ', - 'cs': u'Autor diskuse', + 'cs': u'Diskuse k autorovi', 'el': u'Συζήτηση σελίδας', 'en': u'Portal talk', 'fa': [u'بحث درگاه', u'Portal talk'], @@ -236,6 +236,7 @@ 'it': u'Progetto', 'la': u'Pagina', 'no': u'Side', + 'pl': u'Autor', 'pt': u'Galeria', 'ru': u'Страница', 'sl': u'Kazalo', @@ -262,6 +263,7 @@ 'it': u'Discussioni progetto', 'la': u'Disputatio Paginae', 'no': u'Sidediskusjon', + 'pl': u'Dyskusja autora', 'pt': u'Galeria Discussão', 'ru': u'Обсуждение страницы', 'sl': u'Pogovor o kazalu', Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wikiversity_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -38,7 +38,7 @@ } self.namespaces[5] = { '_default': [u'Wikiversity talk', self.namespaces[5]['_default']], - 'cs': u'Wikiverzita diskuse', + 'cs': u'Diskuse k Wikiverzitě', 'de': u'Wikiversity Diskussion', 'el': u'Συζήτηση Βικιεπιστημίου', 'es': u'Wikiversidad Discusión', @@ -58,7 +58,7 @@ 'ja': u'School', } self.namespaces[101] = { - 'cs': u'Fórum diskuse', + 'cs': u'Diskuse k fóru', 'el': u'Συζήτηση Σχολής', 'en': u'School talk', 'it': u'Discussioni facoltà', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -13,17 +13,17 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'pt', 'fi', 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'lo', 'kn', - 'ja', 'ml', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', + 'ml', 'ja', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'li', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', 'sw', 'simple', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', - 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'tk', 'ast', 'ur', 'hsb', - 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'gn', 'az', - 'ia', 'co', 'my', 'eu', 'sk', 'ne', 'csb', 'ms', 'st', 'tl', 'mr', + 'tt', 'la', 'zh-min-nan', 'da', 'ne', 'wa', 'tk', 'ast', 'ur', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'gn', + 'az', 'ia', 'co', 'my', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', 'mr', 'cy', 'mg', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', - 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'be', + 'bn', 'gu', 'km', 'ss', 'be', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'iu', 'yi', 'gd', 'kw', 'tg', 'si', 'nn', 'gv', 'zu', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'mi', 'uz', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', + 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] @@ -119,7 +119,7 @@ 'br': u'Kaozeadenn Wikeriadur', 'bs': u'Razgovor s Vikirječnikom', 'ca': u'Viccionari Discussió', - 'cs': u'Wikislovník diskuse', + 'cs': u'Diskuse k Wikislovníku', 'csb': u'Diskùsëjô Wiktionary', 'cy': u'Sgwrs Wiciadur', 'da': u'Wiktionary-diskussion', @@ -223,6 +223,7 @@ self.namespaces[100] = { 'bg': u'Словоформи', + 'bn': u'উইকিসরাস', 'bs': u'Portal', 'cy': u'Atodiad', 'el': u'Παράρτημα', @@ -248,6 +249,7 @@ } self.namespaces[101] = { 'bg': u'Словоформи беседа', + 'bn': u'উইকিসরাস আলোচনা', 'bs': u'Razgovor o Portalu', 'cy': u'Sgwrs Atodiad', 'el': u'Συζήτηση παραρτήματος', Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2010-04-18 20:05:45 UTC (rev 8112) +++ trunk/pywikipedia/family.py 2010-04-19 17:41:00 UTC (rev 8113) @@ -17,7 +17,8 @@ class Family: def __init__(self): self.name = None - # Updated from http://meta.wikimedia.org/wiki/Interwiki_sorting_order + + # Updated from http://meta.wikimedia.org/wiki/Interwiki_sorting_order self.alphabetic = [ 'ace', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm', 'bn', @@ -781,7 +782,7 @@ 'ch': u'Kombetsasion ni muna\'sesetbi', 'ckb': u'لێدوانی بەکارھێنەر', 'crh': [u'Qullanıcı muzakeresi', u'Къулланыджы музакереси'], - 'cs': u'Uživatel diskuse', + 'cs': u'Diskuse s wikipedistou', 'csb': u'Diskùsëjô brëkòwnika', 'cu': u'По́льꙃєватєлꙗ бєсѣ́да', 'cv': u'Хутшăнаканăн канашлу страници', @@ -948,6 +949,7 @@ 'arc': [u'ܡܡܠܠܐ ܕ ܘܝܩܝܦܕܝܐ', u'ܘܝܩܝܦܕܝܐ talk'], 'bn': u'উইকিপিডিয়া আলোচনা', 'ckb': u'لێدوانی Wikipedia', + 'cs': u'Diskuse k Wikipedii', 'kl': u'Wikipedia-p oqalliffia', 'krc': u'Википедия сюзюу', 'kw': [u'Kescows Wikipedia', u'Cows Wikipedia'], @@ -1189,7 +1191,7 @@ 'ch': u'Kombetsasion ni litratu', 'ckb': u'لێدوانی پەڕگە', 'crh': [u'Fayl muzakeresi', u'Resim muzakeresi', u'Ресим музакереси'], - 'cs': u'Soubor diskuse', + 'cs': u'Diskuse k souboru', 'csb': u'Diskùsëjô òbrôzków', 'cu': [u'Дѣ́ла бєсѣ́да', u'Ви́да бєсѣ́да'], 'cv': u'Ӳкерчĕке сӳтсе явмалли', @@ -1437,7 +1439,7 @@ 'ceb': u'Hisgot sa MediaWiki', 'ckb': u'لێدوانی میدیاویکی', 'crh': [u'MediaViki muzakeresi', u'МедиаВики музакереси'], - 'cs': u'MediaWiki diskuse', + 'cs': u'Diskuse k MediaWiki', 'csb': u'Diskùsëjô MediaWiki', 'cu': u'MediaWiki бєсѣ́да', 'cv': u'MediaWiki сӳтсе явмалли', @@ -1806,7 +1808,7 @@ 'ceb': u'Hisgot sa Plantilya', 'ckb': u'لێدوانی داڕێژە', 'crh': [u'Şablon muzakeresi', u'Шаблон музакереси'], - 'cs': u'Šablona diskuse', + 'cs': u'Diskuse k šabloně', 'csb': u'Diskùsëjô Szablónë', 'cu': u'Обраꙁьца́ бєсѣ́да', 'cv': u'Шаблона сӳтсе явмалли', @@ -2181,7 +2183,7 @@ 'ch': u'Kombetsasion ni ayudo', 'ckb': u'لێدوانی یارمەتی', 'crh': [u'Yardım muzakeresi', u'Разговор о помоћи'], - 'cs': u'Nápověda diskuse', + 'cs': u'Diskuse k nápovědě', 'csb': u'Diskùsëjô Pòmòcë', 'cu': u'По́мощи бєсѣ́да', 'cv': u'Пулăшăва сӳтсе явмалли', @@ -2559,7 +2561,7 @@ 'ch': u'Kombetsasion ni katigoria', 'ckb': u'لێدوانی پۆل', 'crh': [u'Kategoriya muzakeresi', u'Категория музакереси'], - 'cs': u'Kategorie diskuse', + 'cs': u'Diskuse ke kategorii', 'csb': u'Diskùsëjô Kategòrëji', 'cu': [u'Катигорі́ѩ бєсѣ́да', u'Катигорїѩ бесѣда' ], 'cv': u'Категорине сӳтсе явмалли',

1 0

SVN: [8112] trunk/pywikipedia
by alexsh＠svn.wikimedia.org 18 Apr '10

18 Apr '10

Revision: 8112 Author: alexsh Date: 2010-04-18 20:05:45 +0000 (Sun, 18 Apr 2010) Log Message: ----------- fix data dump loop" Modified Paths: -------------- trunk/pywikipedia/welcome.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2010-04-18 19:48:48 UTC (rev 8111) +++ trunk/pywikipedia/welcome.py 2010-04-18 20:05:45 UTC (rev 8112) @@ -689,22 +689,21 @@ count_auto = 0 wikipedia.output("Querying new user log from API....") - while True: - for x in self.site.logpages(number = int(globalvar.queryLimit), mode = 'newusers',start = starttime, dump = True): - someone_found = True - if 'user' not in x: - continue - #created twice? - if not globalvar.welcomeAuto and x['action'] == 'create2': - continue - if not globalvar.welcomeAuto and x['action'] == 'autocreate': - if not globalvar.quick: - showStatus(3) - wikipedia.output(u'%s has been created automatically.' % x['user']) - count_auto += 1 - continue + for x in self.site.logpages(number = globalvar.queryLimit, mode = 'newusers',start = starttime, dump = True): + someone_found = True + if 'user' not in x: + continue + #created twice? + if not globalvar.welcomeAuto and x['action'] == 'create2': + continue + if not globalvar.welcomeAuto and x['action'] == 'autocreate': + if not globalvar.quick: + showStatus(3) + wikipedia.output(u'%s has been created automatically.' % x['user']) + count_auto += 1 + continue - yield userlib.User(self.site, x['user']) + yield userlib.User(self.site, x['user']) if someone_found: if globalvar.quick and count_auto > 0: Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-04-18 19:48:48 UTC (rev 8111) +++ trunk/pywikipedia/wikipedia.py 2010-04-18 20:05:45 UTC (rev 8112) @@ -5732,16 +5732,15 @@ if dump: # dump result only. yield c - continue - - if c['ns'] == 6: - p_ret = ImagePage(self, c['title']) else: - p_ret = Page(self, c['title'], defaultNamespace=c['ns']) - - yield (p_ret, c['user'], - parsetime2stamp(c['timestamp']), - c['comment'], ) + if c['ns'] == 6: + p_ret = ImagePage(self, c['title']) + else: + p_ret = Page(self, c['title'], defaultNamespace=c['ns']) + + yield (p_ret, c['user'], + parsetime2stamp(c['timestamp']), + c['comment'], ) nbresults += 1 if nbresults >= number:

1 0

SVN: [8111] trunk/pywikipedia
by alexsh＠svn.wikimedia.org 18 Apr '10

18 Apr '10

Revision: 8111 Author: alexsh Date: 2010-04-18 19:48:48 +0000 (Sun, 18 Apr 2010) Log Message: ----------- typo Modified Paths: -------------- trunk/pywikipedia/userlib.py trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2010-04-18 19:42:57 UTC (rev 8110) +++ trunk/pywikipedia/userlib.py 2010-04-18 19:48:48 UTC (rev 8111) @@ -285,7 +285,7 @@ yield p,t,c,a return - for s in self.site().logpages(number, mode = 'upload', user = self.name(), dump = True) + for s in self.site().logpages(number, mode = 'upload', user = self.name(), dump = True): yield wikipedia.ImagePage(self.site(), s['title']), s['timestamp'], s['comment'], s['pageid'] > 0 return Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2010-04-18 19:42:57 UTC (rev 8110) +++ trunk/pywikipedia/welcome.py 2010-04-18 19:48:48 UTC (rev 8111) @@ -690,7 +690,7 @@ count_auto = 0 wikipedia.output("Querying new user log from API....") while True: - for x in self.site.logpages(number = int(globalvar.queryLimit), mode = 'newusers',start = starttime, dump = True) + for x in self.site.logpages(number = int(globalvar.queryLimit), mode = 'newusers',start = starttime, dump = True): someone_found = True if 'user' not in x: continue

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn April 2010