diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-06 11:23:48 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-06 11:24:14 +0200 |
| commit | 77b637f20e8cb91cf007bf416b603ca362385cdb (patch) | |
| tree | 9e912a7296f6bc2f06bbd6bc3e44737393de0dab /qa/rpc-tests/test_framework/socks5.py | |
| parent | 65aecda52d0d2179f77d675dc305225a1566c48f (diff) | |
| parent | fa389d4edc367073e2ccc6d1f0790c4b72ba17f2 (diff) | |
| download | bitcoin-77b637f20e8cb91cf007bf416b603ca362385cdb.tar.xz | |
Merge #7814: [qa] Switch to py3
fa389d4 [qa] Switch to py3 (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/test_framework/socks5.py')
| -rw-r--r-- | qa/rpc-tests/test_framework/socks5.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py index f725d97701..372f5ed605 100644 --- a/qa/rpc-tests/test_framework/socks5.py +++ b/qa/rpc-tests/test_framework/socks5.py @@ -1,11 +1,12 @@ -# Copyright (c) 2015 The Bitcoin Core developers +#!/usr/bin/env python3 +# Copyright (c) 2015-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' Dummy Socks5 server for testing. ''' -from __future__ import print_function, division, unicode_literals -import socket, threading, Queue + +import socket, threading, queue import traceback, sys ### Protocol constants @@ -132,7 +133,7 @@ class Socks5Server(object): self.s.listen(5) self.running = False self.thread = None - self.queue = Queue.Queue() # report connections and exceptions to client + self.queue = queue.Queue() # report connections and exceptions to client def run(self): while self.running: |