jenkins-bot has submitted this change and it was merged.
Change subject: [FEAT] Hide "svnversion failed" warning
......................................................................
[FEAT] Hide "svnversion failed" warning
- set/reset warning level
- reorder getversion_xxx functions:
getversion_svn_setuptools doesn't work for py < 2.7.10, so
fallback to getversion_svn in next step
Bug: T120268
Change-Id: Ieea17e9d9c9dbc468eb3b47dab27f4d9a1fd542d
---
M pywikibot/version.py
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 66f5ff9..93b13af 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -2,8 +2,8 @@
"""Module to determine the pywikibot version (tag, revision and date)."""
#
# (C) Merlijn 'valhallasw' van Deen, 2007-2014
-# (C) xqt, 2010-2015
-# (C) Pywikibot team, 2007-2015
+# (C) xqt, 2010-2016
+# (C) Pywikibot team, 2007-2016
#
# Distributed under the terms of the MIT license.
#
@@ -20,6 +20,7 @@
import time
import xml.dom.minidom
+from distutils import log
from distutils.sysconfig import get_python_lib
from io import BytesIO
from warnings import warn
@@ -93,8 +94,8 @@
for vcs_func in (getversion_git,
getversion_svn_setuptools,
- getversion_nightly,
getversion_svn,
+ getversion_nightly,
getversion_package):
try:
(tag, rev, date, hsh) = vcs_func(_program_dir)
@@ -220,7 +221,10 @@
tag = 'pywikibot-core'
_program_dir = path or _get_program_dir()
svninfo = svn_utils.SvnInfo(_program_dir)
+ # suppress warning
+ old_level = log.set_threshold(log.ERROR)
rev = svninfo.get_revision()
+ log.set_threshold(old_level)
if not isinstance(rev, int):
raise TypeError('SvnInfo.get_revision() returned type %s' % type(rev))
if rev < 0:
--
To view, visit https://gerrit.wikimedia.org/r/273766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieea17e9d9c9dbc468eb3b47dab27f4d9a1fd542d
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
