Changeset 76:2919e60d3588 for wokkel

Timestamp:

Dec 28, 2009, 12:13:34 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Sync with Twisted changes involving hashPassword.

See ​http://twistedmatrix.com/trac/ticket/3847.

Location:

wokkel

Files:

• component.py (modified) (2 diffs)
• test/test_component.py (modified) (2 diffs)

wokkel/component.py

@@ -158 +158 @@
 
     @ivar secret: The shared used to authorized incoming component connections.
-    @type secret: C{str}.
+    @type secret: C{unicode}.
     """
 
@@ -237 +237 @@
         be exchanged.
         """
-        calculatedHash = xmlstream.hashPassword(self.xmlstream.sid, self.secret)
+        calculatedHash = xmlstream.hashPassword(self.xmlstream.sid,
+                                                unicode(self.secret))
         if handshake != calculatedHash:
             exc = error.StreamError('not-authorized', text='Invalid hash')

wokkel/test/test_component.py

@@ -369 +369 @@
         xs = self.xmlstream
         xs.addOnetimeObserver(xmlstream.STREAM_AUTHD_EVENT, authenticated)
-        xs.sid = '1234'
+        xs.sid = u'1234'
         theHash = '32532c0f7dbf1253c095b18b18e36d38d94c1256'
         xs.authenticator.onHandshake(theHash)
@@ -390 +390 @@
         xs.sendStreamError = streamErrors.append
 
-        xs.sid = '1234'
+        xs.sid = u'1234'
         theHash = '1234'
         xs.authenticator.onHandshake(theHash)