[MediaWiki-commits] [Gerrit] Fix invalid raise syntax in askForCaptcha - change (pywikibot/core)

2015-12-23 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix invalid raise syntax in askForCaptcha
..


Fix invalid raise syntax in askForCaptcha

A base raise statement can only exist inside an `except:` clause.

Added in compat:
https://www.mediawiki.org/wiki/Special:Code/pywikipedia/7214

askForCaptcha is unused in core (T122194).

Change-Id: I308379e47a574dd62d1cddd73253fc3171f10dbf
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/pywikibot/userinterfaces/terminal_interface_base.py 
b/pywikibot/userinterfaces/terminal_interface_base.py
index 4540e2c..66aad34 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -443,8 +443,9 @@
 u'What is the solution of the CAPTCHA that is shown in '
 u'your web browser?')
 else:
-raise
-except:
+raise webbrowser.Error(
+'webbrowser.open failed to open a web browser')
+except Exception:
 pywikibot.output(u'Error in opening web browser: %s'
  % sys.exc_info()[0])
 pywikibot.output(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I308379e47a574dd62d1cddd73253fc3171f10dbf
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
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] Fix invalid raise syntax in askForCaptcha - change (pywikibot/core)

2015-12-22 Thread John Vandenberg (Code Review)
John Vandenberg has uploaded a new change for review.

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

Change subject: Fix invalid raise syntax in askForCaptcha
..

Fix invalid raise syntax in askForCaptcha

A base raise statement can only exist inside an `except:` clause.

Change-Id: I308379e47a574dd62d1cddd73253fc3171f10dbf
---
M pywikibot/userinterfaces/terminal_interface_base.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/57/260557/1

diff --git a/pywikibot/userinterfaces/terminal_interface_base.py 
b/pywikibot/userinterfaces/terminal_interface_base.py
index 4540e2c..66aad34 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -443,8 +443,9 @@
 u'What is the solution of the CAPTCHA that is shown in '
 u'your web browser?')
 else:
-raise
-except:
+raise webbrowser.Error(
+'webbrowser.open failed to open a web browser')
+except Exception:
 pywikibot.output(u'Error in opening web browser: %s'
  % sys.exc_info()[0])
 pywikibot.output(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I308379e47a574dd62d1cddd73253fc3171f10dbf
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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