diff --git a/conftest.py b/conftest.py index 011115e..94c57b7 100644 --- a/conftest.py +++ b/conftest.py @@ -17,7 +17,7 @@ def get_bitcoind_version(version_string): # this utility function returns the version number # as a tuple in the form (major, minor, patch) version_tuple = re.match( - b'.*v(?P\d+)\.(?P\d+)\.(?P\d+)', + br'.*v(?P\d+)\.(?P\d+)\.(?P\d+)', version_string).groups() return tuple(map(lambda x: int(x), version_tuple)) diff --git a/jmbase/jmbase/twisted_utils.py b/jmbase/jmbase/twisted_utils.py index fc6798c..f85a1ad 100644 --- a/jmbase/jmbase/twisted_utils.py +++ b/jmbase/jmbase/twisted_utils.py @@ -2,7 +2,7 @@ from zope.interface import implementer from twisted.internet.error import ReactorNotRunning from twisted.internet import reactor, defer -from twisted.internet.endpoints import TCP4ClientEndpoint +from twisted.internet.endpoints import TCP4ClientEndpoint, UNIXClientEndpoint from twisted.web.client import Agent, BrowserLikePolicyForHTTPS import txtorcon from txtorcon.web import tor_agent diff --git a/jmdaemon/jmdaemon/daemon_protocol.py b/jmdaemon/jmdaemon/daemon_protocol.py index 2694e0b..954293c 100644 --- a/jmdaemon/jmdaemon/daemon_protocol.py +++ b/jmdaemon/jmdaemon/daemon_protocol.py @@ -415,8 +415,8 @@ class SNICKERDaemonServerProtocol(HTTPPassThrough): @SNICKERReceiverGetProposals.responder def on_SNICKER_RECEIVER_GET_PROPOSALS(self): - for server in self.servers: - self.getRequest(server, self.receive_proposals_from_server) + for srv in self.servers: + self.getRequest(srv, self.receive_proposals_from_server) return {'accepted': True} def receive_proposals_from_server(self, response, server): diff --git a/scripts/snicker/snicker-finder.py b/scripts/snicker/snicker-finder.py index e49e31c..470a54f 100644 --- a/scripts/snicker/snicker-finder.py +++ b/scripts/snicker/snicker-finder.py @@ -24,6 +24,7 @@ in Bitcoin Core in order to get full transactions, since it parses the raw blocks. """ +import sys from optparse import OptionParser from jmbase import bintohex, EXIT_ARGERROR, jmprint import jmbitcoin as btc diff --git a/scripts/snicker/snicker-recovery.py b/scripts/snicker/snicker-recovery.py index 1fa6b85..c72739c 100644 --- a/scripts/snicker/snicker-recovery.py +++ b/scripts/snicker/snicker-recovery.py @@ -24,6 +24,7 @@ keys, so as a reminder, *always* back up either jmdat wallet files, or at least, the imported keys themselves.) """ +import sys from optparse import OptionParser from jmbase import bintohex, EXIT_ARGERROR, jmprint import jmbitcoin as btc