Changeset 7836 for django/branches/gis/django/utils/text.py

Timestamp:

07/04/08 15:16:22 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/utils/text.py (modified) (2 diffs)

django/branches/gis/django/utils/text.py

@@ -4 +4 @@
-from django.utils.functional import allow_lazy
-from django.utils.translation import ugettext_lazy
+from htmlentitydefs import name2codepoint
-
-# Capitalizes the first letter of a string.
@@ -223 +224 @@
-smart_split = allow_lazy(smart_split, unicode)
-
+def _replace_entity(match):
+     text = match.group(1)
+     if text[0] == u'#':
+         text = text[1:]
+         try:
+             if text[0] in u'xX':
+                 c = int(text[1:], 16)
+             else:
+                 c = int(text)
+             return unichr(c)
+         except ValueError:
+             return match.group(0)
+     else:
+         try:
+             return unichr(name2codepoint[text])
+         except (ValueError, KeyError):
+             return match.group(0)
+
+_entity_re = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));")
+
+def unescape_entities(text):
+     return _entity_re.sub(_replace_entity, text)
+unescape_entities = allow_lazy(unescape_entities, unicode)