[MediaWiki-commits] [Gerrit] [IMPR] Some compat2core and other code cleanups - change (pywikibot...xqbot)

2016-04-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: [IMPR] Some compat2core and other code cleanups
..


[IMPR] Some compat2core and other code cleanups

- Page.usingPages is not a generator but an api.PageGenerator.
  It must be iterated.
- Don't use general exception; use StopIteration exception type
- extract_templates_and_params already strips named parameters
- don't check known templates for Information template
- expectedFailer is solved with iterating usingPages()
- uns next() for py3 compatibility

Change-Id: Ie0d4ec9b980bbf2d773c6a8aa213c180e11db109
---
M imagereview.py
M tests/imagereview_tests.py
2 files changed, 7 insertions(+), 10 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/imagereview.py b/imagereview.py
index 1459112..f51a2d9 100644
--- a/imagereview.py
+++ b/imagereview.py
@@ -237,7 +237,7 @@
 for r in param:
 if r.strip():
 self.reasons.add(r.strip())
-if tpl.title(withNamespace=False) == 'Information':
+elif tpl.title(withNamespace=False) == 'Information':
 self.info = True
 
 @property
@@ -248,9 +248,8 @@
 if r.startswith('Hinweis'):
 self.reasons.remove(r)
 self.reasons.add('Hinweis')
-note = r.split('=', 1)
-r = note[0].strip()
-self.remark = note[1].strip()
+# r is already stripped by extract_templates_and_params
+r, sep, self.remark = r.partition('=')
 if r not in DUP_REASONS:
 valid = False
 pywikibot.output(u'\nIgnoriere %s: '
@@ -264,13 +263,12 @@
 
 @property
 def hasRefs(self):
-refs = self.usingPages()
+refs = iter(self.usingPages())
 try:
-refs.next()
-except:
+next(refs)
+except StopIteration:
 return False
-else:
-return True
+return True
 
 
 class CheckImageBot(object):
diff --git a/tests/imagereview_tests.py b/tests/imagereview_tests.py
index b2710d3..3834117 100644
--- a/tests/imagereview_tests.py
+++ b/tests/imagereview_tests.py
@@ -101,7 +101,6 @@
 self.assertEqual(self.image.remark, self.REMARK)
 self.assertLessEqual(self.image.reasons, set(imagereview.DUP_REASONS))
 
-@unittest.expectedFailure
 def test_hasRefs(self):
 """Test hasRefs method."""
 self.init_content()

-- 
To view, visit https://gerrit.wikimedia.org/r/282459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0d4ec9b980bbf2d773c6a8aa213c180e11db109
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [IMPR] Some compat2core and other code cleanups - change (pywikibot...xqbot)

2016-04-09 Thread Xqt (Code Review) 
Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/282459

Change subject: [IMPR] Some compat2core and other code cleanups
..

[IMPR] Some compat2core and other code cleanups

- Page.usingPages is not a generator but an api.PageGenerator.
  It must be iterated.
- Don't use general exception; use StopIteration exception type
- extract_templates_and_params already strips named parameters
- don't check known templates for Information template
- expectedFailer is solved with iterating usingPages()

Change-Id: Ie0d4ec9b980bbf2d773c6a8aa213c180e11db109
---
M imagereview.py
M tests/imagereview_tests.py
2 files changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot 
refs/changes/59/282459/1

diff --git a/imagereview.py b/imagereview.py
index 1459112..73a615c 100644
--- a/imagereview.py
+++ b/imagereview.py
@@ -237,7 +237,7 @@
 for r in param:
 if r.strip():
 self.reasons.add(r.strip())
-if tpl.title(withNamespace=False) == 'Information':
+elif tpl.title(withNamespace=False) == 'Information':
 self.info = True
 
 @property
@@ -248,9 +248,8 @@
 if r.startswith('Hinweis'):
 self.reasons.remove(r)
 self.reasons.add('Hinweis')
-note = r.split('=', 1)
-r = note[0].strip()
-self.remark = note[1].strip()
+# r is already stripped by extract_templates_and_params
+r, sep, self.remark = r.partition('=')
 if r not in DUP_REASONS:
 valid = False
 pywikibot.output(u'\nIgnoriere %s: '
@@ -264,13 +263,12 @@
 
 @property
 def hasRefs(self):
-refs = self.usingPages()
+refs = iter(self.usingPages())
 try:
 refs.next()
-except:
+except StopIteration:
 return False
-else:
-return True
+return True
 
 
 class CheckImageBot(object):
diff --git a/tests/imagereview_tests.py b/tests/imagereview_tests.py
index b2710d3..3834117 100644
--- a/tests/imagereview_tests.py
+++ b/tests/imagereview_tests.py
@@ -101,7 +101,6 @@
 self.assertEqual(self.image.remark, self.REMARK)
 self.assertLessEqual(self.image.reasons, set(imagereview.DUP_REASONS))
 
-@unittest.expectedFailure
 def test_hasRefs(self):
 """Test hasRefs method."""
 self.init_content()

-- 
To view, visit https://gerrit.wikimedia.org/r/282459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0d4ec9b980bbf2d773c6a8aa213c180e11db109
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits