From 16d293772365d57cc1a279d5ad0fa6f44b12ed54 Mon Sep 17 00:00:00 2001 From: Daniel Ingram Date: Sun, 9 Dec 2018 15:49:34 -0500 Subject: Handle exception as ImportError --- contrib/devtools/github-merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') 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) -- cgit v1.2.3