diff options
| author | Daniel Ingram <[email protected]> | 2018-12-09 15:49:34 -0500 |
|---|---|---|
| committer | Daniel Ingram <[email protected]> | 2018-12-09 15:49:34 -0500 |
| commit | 16d293772365d57cc1a279d5ad0fa6f44b12ed54 (patch) | |
| tree | b61e0187813f5b919c829884304b0b4473a871b8 /contrib/devtools/github-merge.py | |
| parent | Merge #14801: qt: Use window() instead of obsolete topLevelWidget() (diff) | |
| download | discoin-16d293772365d57cc1a279d5ad0fa6f44b12ed54.tar.xz discoin-16d293772365d57cc1a279d5ad0fa6f44b12ed54.zip | |
Handle exception as ImportError
Diffstat (limited to 'contrib/devtools/github-merge.py')
| -rwxr-xr-x | contrib/devtools/github-merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index 4e90f85f5..c7a64bd6f 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -25,7 +25,7 @@ import json import codecs try: from urllib.request import Request,urlopen -except: +except ImportError: from urllib2 import Request,urlopen # External tools (can be overridden using environment) |