DrTrigon has uploaded a new change for review. https://gerrit.wikimedia.org/r/87681
Change subject: clean-up of version library and script ...................................................................... clean-up of version library and script Change-Id: I65f164e8d368a83b193f21094602d7d664163a50 --- M pywikibot/version.py M scripts/version.py 2 files changed, 28 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/81/87681/1 diff --git a/pywikibot/version.py b/pywikibot/version.py index 9555d71..f204d83 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -10,10 +10,15 @@ __version__ = '$Id$' import os -import time -import datetime +import time, datetime import urllib import subprocess + +import pywikibot +from pywikibot import config2 as config + +__version_file = 'pywikibot/__init__.py' +__version_url = 'https://git.wikimedia.org/feed/pywikibot/core' cache = None @@ -39,7 +44,7 @@ except Exception: data['cmp_ver'] = 'n/a' data['hsh'] = data['hsh'][:7] # make short hash from full hash - return '%(tag)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)' % data + return '%(rel)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)\n%(tag)s' % data def getversiondict(): @@ -53,14 +58,14 @@ (tag, rev, date, hsh) = getversion_nightly() except Exception: try: - version = getfileversion('pywikibot/__init__.py') + version = getfileversion(__version_file) if not version: # fall-back in case everything breaks (should not be used) import pywikibot version = getfileversion(pywikibot.__file__[:-1]) file, hsh_short, date, ts = version.split(' ') - tag = 'pywikibot/__init__.py' + tag = __version_file rev = '-1 (unknown)' ts = ts.split('.')[0] date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%S') @@ -73,8 +78,19 @@ hsh='(unknown)') datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) - cache = dict(tag=tag, rev=rev, date=datestring, hsh=hsh) + cache = dict(tag=tag, rev=rev, date=datestring, hsh=hsh, + rel=pywikibot.__release__) return cache + + +def getconfigdict(): + res = { 'site_interface': config.site_interface, + 'api_config_expiry': config.API_config_expiry, } + if not __import__('unicodedata').normalize('NFC', u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917') == u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917': + res['unicode_test'] = u'triggers problem #3081100' + else: + res['unicode_test'] = u'ok' + return res def getversion_svn(path=None): @@ -151,7 +167,7 @@ def getversion_onlinerepo(repo=None): """ Retrieve revision number of framework online repository's svnroot """ - url = repo or 'https://git.wikimedia.org/feed/pywikibot/core' + url = repo or __version_url hsh = None try: buf = urllib.urlopen(url).readlines() diff --git a/scripts/version.py b/scripts/version.py index 7cb2bc7..66d91fa 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -11,18 +11,12 @@ __version__ = '$Id$' import sys -import pywikibot from pywikibot.version import * -from pywikibot import config2 as config if __name__ == '__main__': - print 'Pywikibot: %s' % getversion() - print 'Release version: %s' % pywikibot.__release__ - print 'Python: %s' % sys.version + print 'Pywikibot: %s\n' % getversion() + print 'Python: %s\n' % sys.version #print 'config-settings:' - #print 'site_interface =', config.site_interface - #print 'API_config_expiry =', config.API_config_expiry - if not __import__('unicodedata').normalize('NFC', u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917') == u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917': - print u'unicode test: triggers problem #3081100' - else: - print u'unicode test: ok' + #config = getconfigdict() + #for item in sorted(config): + # print item, '=', config[item] -- To view, visit https://gerrit.wikimedia.org/r/87681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65f164e8d368a83b193f21094602d7d664163a50 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
