Changeset 184:a9ab7d3945e2 for wokkel/generic.py

Timestamp:

May 6, 2013, 9:15:41 PM (9 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Deprecate prepareIDNName.

C{unicode.encode('idna')} does exactly the same as the recently
introduced L{generic.prepareIDNName}.

File:

• wokkel/generic.py (modified) (3 diffs)

wokkel/generic.py

@@ -8 +8 @@
 """
 
-from encodings import idna
-
 from zope.interface import implements
 
 from twisted.internet import defer, protocol
 from twisted.python import reflect
+from twisted.python.deprecate import deprecated
+from twisted.python.versions import Version
 from twisted.words.protocols.jabber import error, jid, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
@@ -333 +333 @@
 
 
+@deprecated(Version("Wokkel", 0, 8, 0), "unicode.encode('idna')")
 def prepareIDNName(name):
     """
@@ -342 +343 @@
     standard full stop.
     """
-    result = []
-    labels = idna.dots.split(name)
-
-    if labels and len(labels[-1]) == 0:
-        trailing_dot = b'.'
-        del labels[-1]
-    else:
-        trailing_dot = b''
-
-    for label in labels:
-        result.append(idna.ToASCII(label))
-
-    return b'.'.join(result) + trailing_dot
+    return name.encode('idna')