diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2011-12-28 12:44:40 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2011-12-28 12:44:40 -0500 |
| commit | 953dbc31272a75a564ce6a6747168a8e81856efa (patch) | |
| tree | bf893e1b566715967bcaac50d09e7adf73c2ddc7 /passlib/utils | |
| parent | d72e535b8b53fe5345d543b5be468787ea086cf0 (diff) | |
| download | passlib-953dbc31272a75a564ce6a6747168a8e81856efa.tar.gz | |
misc fixes for py3 compat
Diffstat (limited to 'passlib/utils')
| -rw-r--r-- | passlib/utils/__init__.py | 4 | ||||
| -rw-r--r-- | passlib/utils/compat.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/passlib/utils/__init__.py b/passlib/utils/__init__.py index ec3fe25..5e182f6 100644 --- a/passlib/utils/__init__.py +++ b/passlib/utils/__init__.py @@ -450,8 +450,8 @@ def is_ascii_safe(source): #================================================================================= #string helpers #================================================================================= -UEMPTY = u"" -USPACE = u" " +UEMPTY = u("") +USPACE = u(" ") ujoin = UEMPTY.join def consteq(left, right): diff --git a/passlib/utils/compat.py b/passlib/utils/compat.py index e661d13..eb4bf65 100644 --- a/passlib/utils/compat.py +++ b/passlib/utils/compat.py @@ -57,7 +57,7 @@ else: ) from types import ModuleType -class _AliasedModule(ModuleType): +class _AliasesModule(ModuleType): "fake module that does lazy importing of attributes" def __init__(self, name, **source): @@ -80,7 +80,7 @@ class _AliasedModule(ModuleType): attrs.update(self._source) return list(attrs) -aliases = _AliasedModule(__name__ + ".aliases", **_aliases) +aliases = _AliasesModule(__name__ + ".aliases", **_aliases) sys.modules[aliases.__name__] = aliases #============================================================================= @@ -101,8 +101,10 @@ else: if PY3: int_types = (int,) + num_types = (int, float) else: int_types = (int, long) + num_types = (int, long, float) #============================================================================= # unicode / bytes helpers |