Permalink
Browse files

adjust to api changes in ws patch 4173-5.

  • Loading branch information...
1 parent 561f233 commit 227da556c9b8057738ee6443eacd63aeeb37d240 @plq committed Jun 9, 2013
Showing with 4 additions and 4 deletions.
  1. +3 −3 spyne/server/twisted.py
  2. +1 −1 spyne/util/_twisted_ws.py
View
6 spyne/server/twisted.py
@@ -60,11 +60,11 @@
# FIXME: Switch to:
# from twisted.web.websockets import WebSocketsProtocol
# from twisted.web.websockets import WebSocketsResource
-# from twisted.web.websockets import CONTROLS
+# from twisted.web.websockets import NORMAL
from spyne.util._twisted_ws import WebSocketsProtocol
from spyne.util._twisted_ws import WebSocketsResource
-from spyne.util._twisted_ws import CONTROLS
+from spyne.util._twisted_ws import NORMAL
from zope.interface import implements
@@ -468,4 +468,4 @@ def _propagate(self, obj, cls=None):
doc = ''.join(ctx.out_string)
for c in self._clients.itervalues():
- c.sendFrame(CONTROLS.TEXT, doc, True)
+ c.sendFrame(NORMAL, doc, True)
View
2 spyne/util/_twisted_ws.py
@@ -29,7 +29,7 @@
from twisted.protocols.policies import ProtocolWrapper, WrappingFactory
from twisted.python import log
-from twisted.web.error import NoResource
+from twisted.web.resource import NoResource
from twisted.web.resource import IResource
from twisted.web.server import NOT_DONE_YET
from zope.interface import implements

0 comments on commit 227da55

Please sign in to comment.