jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify pywikibot/version.py ...................................................................... pep8-ify pywikibot/version.py Change-Id: Ia4d7e7009ebbf2416cc1487d9e079d2d8f06f1f9 --- M pywikibot/version.py 1 file changed, 18 insertions(+), 10 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 431fe2e..9d23b12 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -15,8 +15,10 @@ cache = None + class ParseError(Exception): """ Parsing went wrong """ + def _get_program_dir(): _program_dir = os.path.normpath(os.path.split(os.path.dirname(__file__))[0]) @@ -24,6 +26,7 @@ ## if not os.path.isabs(_program_dir): ## _program_dir = os.path.normpath(os.path.join(os.getcwd(), _program_dir)) return _program_dir + def getversion(): data = getversiondict() @@ -35,10 +38,11 @@ data['cmp_ver'] = 'n/a' return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data + def getversiondict(): global cache if cache: - return cache + return cache try: (tag, rev, date) = getversion_svn() except Exception: @@ -55,7 +59,8 @@ id, file, rev, date, ts, author, dollar = version.split(' ') tag = 'pywikibot/__init__.py' date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%SZ') - except: # nothing worked; version unknown (but suppress exceptions) + except: + # nothing worked; version unknown (but suppress exceptions) # the value is most likely '$Id' + '$', it means that # wikipedia.py got imported without using svn at all return dict(tag='', rev='-1 (unknown)', date='0 (unknown)') @@ -63,6 +68,7 @@ datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) cache = dict(tag=tag, rev=rev, date=datestring) return cache + def getversion_svn(path=None): _program_dir = path or _get_program_dir() @@ -74,7 +80,7 @@ from sqlite3 import dbapi2 as sqlite con = sqlite.connect(os.path.join(_program_dir, ".svn/wc.db")) cur = con.cursor() - cur.execute( '''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') + cur.execute('''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') name, tag, rev, date = cur.fetchone() con.close() tag = tag[:-len(name)] @@ -88,25 +94,26 @@ tag = '[%s] %s' % (t[0], t[1]) for i in xrange(4): entries.readline() - date = time.strptime(entries.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = entries.readline()[:-1] entries.close() if (not date or not tag or not rev) and not path: raise ParseError return (tag, rev, date) + def getversion_nightly(): data = open(os.path.join(wikipediatools.get_base_dir(), 'version')) tag = data.readline().strip() - date = time.strptime(data.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(data.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = data.readline().strip() if not date or not tag or not rev: raise ParseError return (tag, rev, date) -## Retrieve revision number of framework online repository's svnroot -# + def getversion_onlinerepo(repo=None): + """ Retrieve revision number of framework online repository's svnroot """ url = repo or 'http://svn.wikimedia.org/svnroot/pywikipedia/trunk/pywikipedia/' rev = None try: @@ -120,10 +127,11 @@ # cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a-b)//tol, 0)] -## Retrieve revision number of file (__version__ variable containing Id tag) -# without importing it (thus can be done for any file) -# + def getfileversion(filename): + """ Retrieve revision number of file (__version__ variable containing Id tag) + without importing it (thus can be done for any file) + """ _program_dir = _get_program_dir() __version__ = None fn = os.path.join(_program_dir, filename) -- To view, visit https://gerrit.wikimedia.org/r/76529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4d7e7009ebbf2416cc1487d9e079d2d8f06f1f9 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Legoktm &lt;legoktm.wikipedia(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot