aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools
diff options
context:
space:
mode:
authorDaniel Ingram <ingramds@appstate.edu>2018-12-09 15:49:34 -0500
committerDaniel Ingram <ingramds@appstate.edu>2018-12-09 15:49:34 -0500
commit16d293772365d57cc1a279d5ad0fa6f44b12ed54 (patch)
treeb61e0187813f5b919c829884304b0b4473a871b8 /contrib/devtools
parent0eb65aa90218d5b650cbe245de513edbc78e8042 (diff)
Handle exception as ImportError
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-xcontrib/devtools/github-merge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index 4e90f85f50..c7a64bd6f9 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)