diff options
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-x | contrib/devtools/github-merge.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index c7a64bd6f9..4f827401fb 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -14,7 +14,6 @@ # In case of a clean merge that is accepted by the user, the local branch with # name $BRANCH is overwritten with the merged result, and optionally pushed. -from __future__ import division,print_function,unicode_literals import os from sys import stdin,stdout,stderr import argparse @@ -23,10 +22,7 @@ import subprocess import sys import json import codecs -try: - from urllib.request import Request,urlopen -except ImportError: - from urllib2 import Request,urlopen +from urllib.request import Request, urlopen # External tools (can be overridden using environment) GIT = os.getenv('GIT','git') |