Module: deluge Branch: 1.3-stable Commit: 0d431ae7dbdce5d6c90061ce1ba20ec35358c9af
Author: Andrew Resch <[email protected]> Date: Thu Jul 8 16:39:02 2010 -0700 Try to import system rencode before deluge.rencode to allow the use of the new rencode library at: http://code.google.com/p/rencode/ --- deluge/core/rpcserver.py | 6 +++++- deluge/ui/client.py | 6 +++++- deluge/ui/gtkui/ipcinterface.py | 10 +++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 336a8b9..5e78267 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -47,7 +47,11 @@ from twisted.internet import ssl, reactor, defer from OpenSSL import crypto, SSL from types import FunctionType -import deluge.rencode as rencode +try: + import rencode +except ImportError: + import deluge.rencode as rencode + from deluge.log import LOG as log import deluge.component as component diff --git a/deluge/ui/client.py b/deluge/ui/client.py index dfaf4ea..3fbae6e 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -35,7 +35,11 @@ from twisted.internet.protocol import Protocol, ClientFactory from twisted.internet import reactor, ssl, defer -import deluge.rencode as rencode +try: + import rencode +except ImportError: + import deluge.rencode as rencode + import zlib import deluge.common diff --git a/deluge/ui/gtkui/ipcinterface.py b/deluge/ui/gtkui/ipcinterface.py index b9a1b64..dc2f917 100644 --- a/deluge/ui/gtkui/ipcinterface.py +++ b/deluge/ui/gtkui/ipcinterface.py @@ -38,7 +38,11 @@ import sys import os import base64 -import deluge.rencode +try: + import rencode +except ImportError: + import deluge.rencode as rencode + import deluge.component as component from deluge.ui.client import client import deluge.common @@ -51,12 +55,12 @@ import twisted.internet.error class IPCProtocolServer(Protocol): def dataReceived(self, data): - data = deluge.rencode.loads(data) + data = rencode.loads(data) process_args(data) class IPCProtocolClient(Protocol): def connectionMade(self): - self.transport.write(deluge.rencode.dumps(self.factory.args)) + self.transport.write(rencode.dumps(self.factory.args)) self.transport.loseConnection() def connectionLost(self, reason): -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
