Changeset 188:b39caf780587
- Timestamp:
- May 6, 2013, 9:15:41 PM (8 years ago)
- Branch:
- default
- hg-git-rename-source:
- git
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
NEWS
r179 r184 1 0.8.0 (xxxx-xx-xx) 2 ================== 3 4 Deprecations 5 -------- 6 7 - wokkel.generic.prepareIDNName is deprecated in favor of 8 unicode.encode('idna'). 9 10 1 11 0.7.1 (2013-01-12) 2 12 ================== -
wokkel/client.py
r178 r184 88 88 def __init__(self, jid, password, host=None, port=5222): 89 89 self.jid = jid 90 self.domain = generic.prepareIDNName(jid.host)90 self.domain = jid.host.encode('idna') 91 91 self.host = host 92 92 self.port = port … … 183 183 184 184 def clientCreator(factory): 185 domain = generic.prepareIDNName(factory.authenticator.jid.host)185 domain = factory.authenticator.jid.host.encode('idna') 186 186 c = XMPPClientConnector(reactor, domain, factory) 187 187 c.connect() -
wokkel/generic.py
r178 r184 8 8 """ 9 9 10 from encodings import idna11 12 10 from zope.interface import implements 13 11 14 12 from twisted.internet import defer, protocol 15 13 from twisted.python import reflect 14 from twisted.python.deprecate import deprecated 15 from twisted.python.versions import Version 16 16 from twisted.words.protocols.jabber import error, jid, xmlstream 17 17 from twisted.words.protocols.jabber.xmlstream import toResponse … … 333 333 334 334 335 @deprecated(Version("Wokkel", 0, 8, 0), "unicode.encode('idna')") 335 336 def prepareIDNName(name): 336 337 """ … … 342 343 standard full stop. 343 344 """ 344 result = [] 345 labels = idna.dots.split(name) 346 347 if labels and len(labels[-1]) == 0: 348 trailing_dot = b'.' 349 del labels[-1] 350 else: 351 trailing_dot = b'' 352 353 for label in labels: 354 result.append(idna.ToASCII(label)) 355 356 return b'.'.join(result) + trailing_dot 345 return name.encode('idna') -
wokkel/server.py
r178 r184 30 30 from twisted.words.xish import domish 31 31 32 from wokkel.generic import DeferredXmlStreamFactory, XmlPipe , prepareIDNName32 from wokkel.generic import DeferredXmlStreamFactory, XmlPipe 33 33 34 34 NS_DIALBACK = 'jabber:server:dialback' … … 469 469 470 470 def initiateS2S(factory): 471 domain = prepareIDNName(factory.authenticator.otherHost)471 domain = factory.authenticator.otherHost.encode('idna') 472 472 c = XMPPServerConnector(reactor, domain, factory) 473 473 c.connect() -
wokkel/test/test_generic.py
r178 r184 6 6 """ 7 7 8 import re 9 10 from twisted.python import deprecate 11 from twisted.python.versions import Version 8 12 from twisted.trial import unittest 13 from twisted.trial.util import suppress as SUPPRESS 9 14 from twisted.words.xish import domish 10 15 from twisted.words.protocols.jabber.jid import JID … … 277 282 """ 278 283 284 suppress = [SUPPRESS(category=DeprecationWarning, 285 message=re.escape( 286 deprecate.getDeprecationWarningString( 287 generic.prepareIDNName, 288 Version("Wokkel", 0, 8, 0), 289 replacement="unicode.encode('idna')")))] 290 291 292 def test_deprecated(self): 293 """ 294 prepareIDNName is deprecated. 295 """ 296 self.callDeprecated((Version("Wokkel", 0, 8, 0), 297 "unicode.encode('idna')"), 298 generic.prepareIDNName, (b"example.com")) 299 test_deprecated.suppress = [] 300 301 279 302 def test_bytestring(self): 280 303 """
Note: See TracChangeset
for help on using the changeset viewer.