From 7b7f258396432b6b4a0c111b06e34be03e42b000 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Thu, 21 May 2015 21:22:22 +0200 Subject: [PATCH] rpc-tests: remove python-bitcoinrpc directory place authproxy.py at same level as other utility classes --- qa/rpc-tests/keypool.py | 2 -- qa/rpc-tests/rpcbind_test.py | 1 - .../bitcoinrpc => }/authproxy.py | 0 .../python-bitcoinrpc/bitcoinrpc/.gitignore | 1 - .../python-bitcoinrpc/bitcoinrpc/__init__.py | 0 .../test_framework/python-bitcoinrpc/setup.py | 15 --------------- qa/rpc-tests/test_framework/test_framework.py | 3 +-- qa/rpc-tests/test_framework/util.py | 3 +-- 8 files changed, 2 insertions(+), 23 deletions(-) rename qa/rpc-tests/test_framework/{python-bitcoinrpc/bitcoinrpc => }/authproxy.py (100%) delete mode 100644 qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore delete mode 100644 qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/__init__.py delete mode 100644 qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py index 307919d720a..aee29a596ae 100755 --- a/qa/rpc-tests/keypool.py +++ b/qa/rpc-tests/keypool.py @@ -8,7 +8,6 @@ # Add python-bitcoinrpc to module search path: import os import sys -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_framework/python-bitcoinrpc")) import json import shutil @@ -16,7 +15,6 @@ import subprocess import tempfile import traceback -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException from test_framework.util import * diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py index 5ccc5734720..04110c28317 100755 --- a/qa/rpc-tests/rpcbind_test.py +++ b/qa/rpc-tests/rpcbind_test.py @@ -8,7 +8,6 @@ # Add python-bitcoinrpc to module search path: import os import sys -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc")) import json import shutil diff --git a/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py similarity index 100% rename from qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/authproxy.py rename to qa/rpc-tests/test_framework/authproxy.py diff --git a/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore b/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore deleted file mode 100644 index 0d20b6487c6..00000000000 --- a/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/__init__.py b/qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py b/qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py deleted file mode 100644 index 43cdb1c0384..00000000000 --- a/qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python2 - -from distutils.core import setup - -setup(name='python-bitcoinrpc', - version='0.1', - description='Enhanced version of python-jsonrpc for use with Bitcoin', - long_description=open('README').read(), - author='Jeff Garzik', - author_email='', - maintainer='Jeff Garzik', - maintainer_email='', - url='http://www.github.com/jgarzik/python-bitcoinrpc', - packages=['bitcoinrpc'], - classifiers=['License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'Operating System :: OS Independent']) diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 15a357a3407..5671431f6e2 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -8,13 +8,12 @@ # Add python-bitcoinrpc to module search path: import os import sys -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc")) import shutil import tempfile import traceback -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from authproxy import AuthServiceProxy, JSONRPCException from util import * diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 997bbcc3738..c236ec26025 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -8,7 +8,6 @@ # Add python-bitcoinrpc to module search path: import os import sys -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc")) from decimal import Decimal, ROUND_DOWN import json @@ -18,7 +17,7 @@ import subprocess import time import re -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from authproxy import AuthServiceProxy, JSONRPCException from util import * def p2p_port(n):