highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 14:08:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove Python 2 import workarounds

Browse Source
This commit is contained in:
practicalswift
2018-12-13 14:53:30 +01:00
parent 20c54eef6e
commit 4de11a3682
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/devtools/github-merge.py
View File

@@ -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')