DrTrigon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87678
Change subject: clean-up of version library and script
......................................................................
clean-up of version library and script
Change-Id: Id466d0462cdd9b92ad7913c541c27c94d9de2666
---
M pywikibot/version.py
M version.py
2 files changed, 21 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/78/87678/1
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 115b1a9..5be2b02 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -15,6 +15,9 @@
import urllib
import subprocess
+import pywikibot
+import config
+
cache = None
@@ -39,7 +42,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():
@@ -73,10 +76,21 @@
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 = { 'use_api': config.use_api,
+ 'use_api_login': config.use_api_login, }
+ 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):
_program_dir = path or _get_program_dir()
entries = open(os.path.join(_program_dir, '.svn/entries'))
diff --git a/version.py b/version.py
index f3fc3a1..faf0ce9 100644
--- a/version.py
+++ b/version.py
@@ -11,18 +11,12 @@
__version__ = '$Id$'
import sys
-import pywikibot
from pywikibot.version import *
-import 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 'use_api =', config.use_api
- print 'use_api_login =', config.use_api_login
- 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/87678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id466d0462cdd9b92ad7913c541c27c94d9de2666
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
