Author: duncan
Date: Wed Oct 18 09:13:00 2006
New Revision: 8411

Modified:
   branches/rel-1/freevo/src/helpers/encodingserver.py

Log:
Updated to remove DeprecationWarning


Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Wed Oct 18 09:13:00 2006
@@ -31,9 +31,9 @@
 from twisted.web import xmlrpc, server
 from twisted.internet.app import Application
 from twisted.internet import reactor
-from twisted.persisted import marmalade
+from twisted.python import log
+from util.marmalade import jellyToXML, unjellyFromXML
 import logging
-
 import time, random, sys, os
 
 from encodingcore import EncodingJob, EncodingQueue
@@ -48,8 +48,8 @@
 
 DEBUG=False
 
-jam = marmalade.jellyToXML
-unjam = marmalade.unjellyFromXML
+jam = jellyToXML
+unjam = unjellyFromXML
 
 class EncodingServer(xmlrpc.XMLRPC):
 

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to