Fixed #10655 -- Who uses 5-space indentation anyways? Thanks to Andrew Badr for the ticket & patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-03-30 03:03:37 +00:00
parent 39ff4c9e4e
commit 9b00b87cf2
1 changed files with 17 additions and 18 deletions

View File

@ -219,27 +219,27 @@ def smart_split(text):
smart_split = allow_lazy(smart_split, unicode) smart_split = allow_lazy(smart_split, unicode)
def _replace_entity(match): def _replace_entity(match):
text = match.group(1) text = match.group(1)
if text[0] == u'#': if text[0] == u'#':
text = text[1:] text = text[1:]
try: try:
if text[0] in u'xX': if text[0] in u'xX':
c = int(text[1:], 16) c = int(text[1:], 16)
else: else:
c = int(text) c = int(text)
return unichr(c) return unichr(c)
except ValueError: except ValueError:
return match.group(0) return match.group(0)
else: else:
try: try:
return unichr(name2codepoint[text]) return unichr(name2codepoint[text])
except (ValueError, KeyError): except (ValueError, KeyError):
return match.group(0) return match.group(0)
_entity_re = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));") _entity_re = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));")
def unescape_entities(text): def unescape_entities(text):
return _entity_re.sub(_replace_entity, text) return _entity_re.sub(_replace_entity, text)
unescape_entities = allow_lazy(unescape_entities, unicode) unescape_entities = allow_lazy(unescape_entities, unicode)
def unescape_string_literal(s): def unescape_string_literal(s):
@ -261,4 +261,3 @@ def unescape_string_literal(s):
quote = s[0] quote = s[0]
return s[1:-1].replace(r'\%s' % quote, quote).replace(r'\\', '\\') return s[1:-1].replace(r'\%s' % quote, quote).replace(r'\\', '\\')
unescape_string_literal = allow_lazy(unescape_string_literal) unescape_string_literal = allow_lazy(unescape_string_literal)