From a2b248b327ffade7990e408f82ecea74bf53e0af Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Fri, 3 Jan 2014 20:12:54 +0100 Subject: [PATCH 1/9] Fixed AutoBahn Error --- stratum/websocket_transport.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stratum/websocket_transport.py b/stratum/websocket_transport.py index 2f26e2f..13f8336 100644 --- a/stratum/websocket_transport.py +++ b/stratum/websocket_transport.py @@ -1,4 +1,4 @@ -from autobahn.websocket import WebSocketServerProtocol, WebSocketServerFactory +from autobahn.twisted.websocket import WebSocketServerProtocol, WebSocketServerFactory from protocol import Protocol from event_handler import GenericEventHandler @@ -34,4 +34,4 @@ def __init__(self, port, is_secure=False, debug=False, signing_key=None, signing WebSocketServerFactory.__init__(self, uri) # P.S. There's not Websocket client implementation yet -# P.P.S. And it probably won't be for long time...' \ No newline at end of file +# P.P.S. And it probably won't be for long time...' From bd965bb65b85899ce1508fe9f8fc3373aa193823 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Mon, 6 Jan 2014 11:38:25 +0100 Subject: [PATCH 2/9] Fixed AutoBahn Error --- stratum/websocket_transport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stratum/websocket_transport.py b/stratum/websocket_transport.py index 13f8336..23db69c 100644 --- a/stratum/websocket_transport.py +++ b/stratum/websocket_transport.py @@ -1,4 +1,4 @@ -from autobahn.twisted.websocket import WebSocketServerProtocol, WebSocketServerFactory +from autobahn.twisted.websocket import WebSocketServerFactory from protocol import Protocol from event_handler import GenericEventHandler From 05ac481d21a23bf66fe4c93c321e9135e6a50ae1 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Mon, 6 Jan 2014 14:11:22 +0000 Subject: [PATCH 3/9] Update version.py --- stratum/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stratum/version.py b/stratum/version.py index e2f81b8..56a7353 100644 --- a/stratum/version.py +++ b/stratum/version.py @@ -1 +1 @@ -VERSION='0.2.13' +VERSION='0.2.14' From 318d447b22dac18052a35e08b12b135ab47afc6b Mon Sep 17 00:00:00 2001 From: blianw Date: Tue, 7 Jan 2014 00:18:21 +0800 Subject: [PATCH 4/9] Update websocket_transport.py Add WebSocketServerProtocol --- stratum/websocket_transport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stratum/websocket_transport.py b/stratum/websocket_transport.py index 23db69c..13f8336 100644 --- a/stratum/websocket_transport.py +++ b/stratum/websocket_transport.py @@ -1,4 +1,4 @@ -from autobahn.twisted.websocket import WebSocketServerFactory +from autobahn.twisted.websocket import WebSocketServerProtocol, WebSocketServerFactory from protocol import Protocol from event_handler import GenericEventHandler From 8088e6c65642c61e1b8afc17fa47d7eb972fffc3 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Wed, 8 Jan 2014 09:53:39 +0000 Subject: [PATCH 5/9] Skip WS Setup --- stratum/server.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/stratum/server.py b/stratum/server.py index 9db4c70..beb4862 100644 --- a/stratum/server.py +++ b/stratum/server.py @@ -43,7 +43,7 @@ def setup_finalize(event, application): import socket_transport import http_transport - import websocket_transport + #import websocket_transport import irc from stratum import settings @@ -90,25 +90,25 @@ def setup_finalize(event, application): https = internet.SSLServer(settings.LISTEN_HTTPS_TRANSPORT, httpsite, contextFactory = sslContext) https.setServiceParent(application) - if settings.LISTEN_WS_TRANSPORT: - from autobahn.websocket import listenWS - log.msg("Starting WS transport on %d" % settings.LISTEN_WS_TRANSPORT) - ws = websocket_transport.WebsocketTransportFactory(settings.LISTEN_WS_TRANSPORT, - debug=settings.DEBUG, - signing_key=signing_key, - signing_id=settings.SIGNING_ID, - event_handler=ServiceEventHandler) - listenWS(ws) + #if settings.LISTEN_WS_TRANSPORT: + # from autobahn.websocket import listenWS + # log.msg("Starting WS transport on %d" % settings.LISTEN_WS_TRANSPORT) + # ws = websocket_transport.WebsocketTransportFactory(settings.LISTEN_WS_TRANSPORT, + # debug=settings.DEBUG, + # signing_key=signing_key, + # signing_id=settings.SIGNING_ID, + # event_handler=ServiceEventHandler) + # listenWS(ws) - if settings.LISTEN_WSS_TRANSPORT and sslContext: - from autobahn.websocket import listenWS - log.msg("Starting WSS transport on %d" % settings.LISTEN_WSS_TRANSPORT) - wss = websocket_transport.WebsocketTransportFactory(settings.LISTEN_WSS_TRANSPORT, is_secure=True, - debug=settings.DEBUG, - signing_key=signing_key, - signing_id=settings.SIGNING_ID, - event_handler=ServiceEventHandler) - listenWS(wss, contextFactory=sslContext) + #if settings.LISTEN_WSS_TRANSPORT and sslContext: + # from autobahn.websocket import listenWS + # log.msg("Starting WSS transport on %d" % settings.LISTEN_WSS_TRANSPORT) + # wss = websocket_transport.WebsocketTransportFactory(settings.LISTEN_WSS_TRANSPORT, is_secure=True, + # debug=settings.DEBUG, + # signing_key=signing_key, + # signing_id=settings.SIGNING_ID, + # event_handler=ServiceEventHandler) + # listenWS(wss, contextFactory=sslContext) if settings.IRC_NICK: reactor.connectTCP(settings.IRC_SERVER, settings.IRC_PORT, irc.IrcLurkerFactory(settings.IRC_ROOM, settings.IRC_NICK, settings.IRC_HOSTNAME)) From a9dd8716b8967361f2c7cb66b4baec058179a07c Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Wed, 8 Jan 2014 09:56:44 +0000 Subject: [PATCH 6/9] Bump Version --- stratum/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stratum/version.py b/stratum/version.py index 56a7353..16bcfb7 100644 --- a/stratum/version.py +++ b/stratum/version.py @@ -1 +1 @@ -VERSION='0.2.14' +VERSION='0.3.14' From 4279f5525c2fd5150afeef45adfcb8a8ddc7ead6 Mon Sep 17 00:00:00 2001 From: Ahmed Bodiwala Date: Tue, 26 Jun 2018 01:31:20 +0000 Subject: [PATCH 7/9] Update Distribute URL --- distribute_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribute_setup.py b/distribute_setup.py index 8f5b063..9a05f8c 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -47,7 +47,7 @@ def quote(arg): return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 DEFAULT_VERSION = "0.6.28" -DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/" +DEFAULT_URL = "https://pypi.python.org/packages/source/d/distribute/" SETUPTOOLS_FAKED_VERSION = "0.6c11" SETUPTOOLS_PKG_INFO = """\ From 05c51902bd9353220148241ee8a1fcf79ab91c5c Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Sun, 12 Jul 2020 03:05:27 +0100 Subject: [PATCH 8/9] Update setup.py --- setup.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.py b/setup.py index 5437b19..2a957e8 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,4 @@ #!/usr/bin/env python -from distribute_setup import use_setuptools -use_setuptools() - -#python setup.py sdist upload - from setuptools import setup from stratum import version From b85c23e243a1335de239260725a1554fad3d0aca Mon Sep 17 00:00:00 2001 From: Ahmed Bodiwala Date: Sat, 10 Jun 2023 01:42:57 +0100 Subject: [PATCH 9/9] chore: Update Stratum Module --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2a957e8..aa2ec49 100644 --- a/setup.py +++ b/setup.py @@ -11,5 +11,5 @@ packages=['stratum',], py_modules=['distribute_setup',], zip_safe=False, - install_requires=['twisted', 'ecdsa', 'pyopenssl', 'autobahn',] + install_requires=['twisted', 'ecdsa', 'autobahn',] )