Author: duncan
Date: Sun Nov 4 06:58:26 2007
New Revision: 10072
Log:
Fixes for Twisted-2.5.0 broke Twisted-2.4.0, hopefully this is now fixed
Modified:
branches/rel-1-7/freevo/src/helpers/commdetectserver.py
branches/rel-1-7/freevo/src/helpers/encodingserver.py
branches/rel-1-7/freevo/src/helpers/recordserver.py
Modified: branches/rel-1-7/freevo/src/helpers/commdetectserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/commdetectserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/commdetectserver.py Sun Nov 4
06:58:26 2007
@@ -64,7 +64,10 @@
def __init__(self, debug=False, allowNone=False):
""" Initialise the Commercial Detection Server class """
_debug_('CommDetectServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 1)
- xmlrpc.XMLRPC.__init__(self, allowNone)
+ try:
+ xmlrpc.XMLRPC.__init__(self, allowNone)
+ except TypeError:
+ xmlrpc.XMLRPC.__init__(self)
self.debug = debug
self.jobs = {}
self.queue = CommDetectQueue()
Modified: branches/rel-1-7/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/encodingserver.py Sun Nov 4
06:58:26 2007
@@ -72,7 +72,10 @@
def __init__(self, debug=False, allowNone=False):
""" Initialise the EncodingServer class """
_debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 1)
- xmlrpc.XMLRPC.__init__(self, allowNone)
+ try:
+ xmlrpc.XMLRPC.__init__(self, allowNone)
+ except TypeError:
+ xmlrpc.XMLRPC.__init__(self)
self.debug = debug
self.jobs = {}
self.queue = EncodingQueue()
Modified: branches/rel-1-7/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/recordserver.py Sun Nov 4 06:58:26 2007
@@ -120,7 +120,10 @@
def __init__(self, debug=False, allowNone=False):
""" Initialise the Record Server class """
_debug_('RecordServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 1)
- xmlrpc.XMLRPC.__init__(self, allowNone)
+ try:
+ xmlrpc.XMLRPC.__init__(self, allowNone)
+ except TypeError:
+ xmlrpc.XMLRPC.__init__(self)
self.debug = debug
self.lock = threading.Lock()
self.fc = FreevoChannels()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
