Browse Source

rpc-tests: remove python-bitcoinrpc directory

place authproxy.py at same level as other utility classes
0.13
Jonas Schnelli 10 years ago
parent
commit
7b7f258396
  1. 2
      qa/rpc-tests/keypool.py
  2. 1
      qa/rpc-tests/rpcbind_test.py
  3. 0
      qa/rpc-tests/test_framework/authproxy.py
  4. 1
      qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore
  5. 0
      qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/__init__.py
  6. 15
      qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py
  7. 3
      qa/rpc-tests/test_framework/test_framework.py
  8. 3
      qa/rpc-tests/test_framework/util.py

2
qa/rpc-tests/keypool.py

@ -8,7 +8,6 @@ @@ -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 @@ -16,7 +15,6 @@ import subprocess
import tempfile
import traceback
from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
from test_framework.util import *

1
qa/rpc-tests/rpcbind_test.py

@ -8,7 +8,6 @@ @@ -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

0
qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/authproxy.py → qa/rpc-tests/test_framework/authproxy.py

1
qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/.gitignore vendored

@ -1 +0,0 @@ @@ -1 +0,0 @@
*.pyc

0
qa/rpc-tests/test_framework/python-bitcoinrpc/bitcoinrpc/__init__.py

15
qa/rpc-tests/test_framework/python-bitcoinrpc/setup.py

@ -1,15 +0,0 @@ @@ -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='<jgarzik@exmulti.com>',
maintainer='Jeff Garzik',
maintainer_email='<jgarzik@exmulti.com>',
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'])

3
qa/rpc-tests/test_framework/test_framework.py

@ -8,13 +8,12 @@ @@ -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 *

3
qa/rpc-tests/test_framework/util.py

@ -8,7 +8,6 @@ @@ -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 @@ -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):

Loading…
Cancel
Save