Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use the codecs module in src/registry.py.

This commit is contained in:
Valentin Lorentz 2012-08-04 15:48:30 +02:00
parent 69c18aed08
commit 4bf39f773f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/registry.py
View File

@ -30,7 +30,9 @@
import re import re
import os import os
import sys
import time import time
import codecs
import string import string
import textwrap import textwrap
@ -63,6 +65,10 @@ class NonExistentRegistryEntry(RegistryException, AttributeError):
# raise an AttributeError if a registry entry does not exist. # raise an AttributeError if a registry entry does not exist.
pass pass
ENCODING = 'string_escape' if sys.version_info[0] < 3 else 'unicode_escape'
decoder = codecs.getdecoder(ENCODING)
encoder = codecs.getencoder(ENCODING)
_cache = utils.InsensitivePreservingDict() _cache = utils.InsensitivePreservingDict()
_lastModified = 0 _lastModified = 0
def open_registry(filename, clear=False): def open_registry(filename, clear=False):
@ -92,7 +98,8 @@ def open_registry(filename, clear=False):
try: try:
(key, value) = re.split(r'(?<!\\):', acc, 1) (key, value) = re.split(r'(?<!\\):', acc, 1)
key = key.strip() key = key.strip()
value = value.strip().decode('string_escape') value = value.strip()
value = decoder(value)[0]
acc = '' acc = ''
except ValueError: except ValueError:
raise InvalidRegistryFile, 'Error unpacking line %r' % acc raise InvalidRegistryFile, 'Error unpacking line %r' % acc
@ -106,7 +113,7 @@ def close(registry, filename, private=True):
for (name, value) in registry.getValues(getChildren=True): for (name, value) in registry.getValues(getChildren=True):
help = value.help() help = value.help()
if help: if help:
lines = textwrap.wrap(value._help) lines = textwrap.wrap(value._help.encode('utf8', errors='replace'))
for (i, line) in enumerate(lines): for (i, line) in enumerate(lines):
lines[i] = '# %s\n' % line lines[i] = '# %s\n' % line
lines.insert(0, '###\n') lines.insert(0, '###\n')
@ -148,7 +155,7 @@ def isValidRegistryName(name):
return len(name.split()) == 1 and not name.startswith('_') return len(name.split()) == 1 and not name.startswith('_')
def escape(name): def escape(name):
name = name.encode('string_escape') name = encoder(name)[0]
name = name.replace(':', '\\:') name = name.replace(':', '\\:')
name = name.replace('.', '\\.') name = name.replace('.', '\\.')
return name return name
@ -156,7 +163,7 @@ def escape(name):
def unescape(name): def unescape(name):
name = name.replace('\\.', '.') name = name.replace('\\.', '.')
name = name.replace('\\:', ':') name = name.replace('\\:', ':')
name = name.decode('string_escape') name = decoder(name)[0]
return name return name
_splitRe = re.compile(r'(?<!\\)\.') _splitRe = re.compile(r'(?<!\\)\.')
@ -367,7 +374,7 @@ class Value(Group):
return repr(self()) return repr(self())
def serialize(self): def serialize(self):
return str(self).encode('string_escape') return encoder(str(self))[0]
# We tried many, *many* different syntactic methods here, and this one was # We tried many, *many* different syntactic methods here, and this one was
# simply the best -- not very intrusive, easily overridden by subclasses, # simply the best -- not very intrusive, easily overridden by subclasses,