Remove old workarounds for Python 2.3.
This commit is contained in:
parent
2654ee9d56
commit
3fc9c10caa
1 changed files with 24 additions and 63 deletions
|
@ -21,35 +21,10 @@
|
||||||
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
||||||
##
|
##
|
||||||
|
|
||||||
import sys, warnings
|
|
||||||
|
|
||||||
if sys.version_info < (2,3,2):
|
|
||||||
import re
|
|
||||||
|
|
||||||
class IDNA:
|
|
||||||
dots = re.compile(u"[\u002E\u3002\uFF0E\uFF61]")
|
|
||||||
def nameprep(self, label):
|
|
||||||
return label.lower()
|
|
||||||
|
|
||||||
idna = IDNA()
|
|
||||||
|
|
||||||
crippled = True
|
|
||||||
|
|
||||||
warnings.warn("Accented and non-Western Jabber IDs will not be properly "
|
|
||||||
"case-folded with this version of Python, resulting in "
|
|
||||||
"incorrect protocol-level behavior. It is strongly "
|
|
||||||
"recommended you upgrade to Python 2.3.2 or newer if you "
|
|
||||||
"intend to use Twisted's Jabber support.")
|
|
||||||
|
|
||||||
else:
|
|
||||||
import stringprep
|
import stringprep
|
||||||
import unicodedata
|
import unicodedata
|
||||||
from encodings import idna
|
from encodings import idna
|
||||||
|
|
||||||
crippled = False
|
|
||||||
|
|
||||||
del sys, warnings
|
|
||||||
|
|
||||||
class ILookupTable:
|
class ILookupTable:
|
||||||
""" Interface for character lookup classes. """
|
""" Interface for character lookup classes. """
|
||||||
|
|
||||||
|
@ -222,20 +197,6 @@ class NamePrep:
|
||||||
raise UnicodeError, "Invalid trailing hyphen-minus"
|
raise UnicodeError, "Invalid trailing hyphen-minus"
|
||||||
return label
|
return label
|
||||||
|
|
||||||
if crippled:
|
|
||||||
case_map = MappingTableFromFunction(lambda c: c.lower())
|
|
||||||
nodeprep = Profile(mappings=[case_map],
|
|
||||||
normalize=False,
|
|
||||||
prohibiteds=[LookupTable([u' ', u'"', u'&', u"'", u'/',
|
|
||||||
u':', u'<', u'>', u'@'])],
|
|
||||||
check_unassigneds=False,
|
|
||||||
check_bidi=False)
|
|
||||||
|
|
||||||
resourceprep = Profile(normalize=False,
|
|
||||||
check_unassigneds=False,
|
|
||||||
check_bidi=False)
|
|
||||||
|
|
||||||
else:
|
|
||||||
C_11 = LookupTableFromFunction(stringprep.in_table_c11)
|
C_11 = LookupTableFromFunction(stringprep.in_table_c11)
|
||||||
C_12 = LookupTableFromFunction(stringprep.in_table_c12)
|
C_12 = LookupTableFromFunction(stringprep.in_table_c12)
|
||||||
C_21 = LookupTableFromFunction(stringprep.in_table_c21)
|
C_21 = LookupTableFromFunction(stringprep.in_table_c21)
|
||||||
|
|
Loading…
Add table
Reference in a new issue