aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools
diff options
context:
space:
mode:
authorpracticalswift <practicalswift@users.noreply.github.com>2018-12-13 14:53:30 +0100
committerpracticalswift <practicalswift@users.noreply.github.com>2018-12-13 16:46:31 +0100
commit4de11a3682cc46fa2f81af8961eef360bedfa3a6 (patch)
tree07c4e4ee9312ad92b854567422c7cc8638670dbb /contrib/devtools
parent20c54eef6e41216a99b16bab2b5a7c0fb701f46e (diff)
downloadbitcoin-4de11a3682cc46fa2f81af8961eef360bedfa3a6.tar.xz
Remove Python 2 import workarounds
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-xcontrib/devtools/github-merge.py6
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')