diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2017-02-17 11:21:50 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2017-02-17 11:21:50 -0500 |
| commit | 5b529f14d35c657c6d67a8fc5ee5dfaf89d5c6e3 (patch) | |
| tree | cbba1a0ce1111317c8647a0396804db24b4f45f6 /passlib/handlers/misc.py | |
| parent | d9ebfa4a70506d47dae94c1ab1a3c40f854428d7 (diff) | |
| download | passlib-5b529f14d35c657c6d67a8fc5ee5dfaf89d5c6e3.tar.gz | |
compat cleanup: replaced all u("") instances with u""
realized can do this now that we're requiring python3 >= 3.3.
had to keep u() helper around for u(r"") instances, since py3 doesn't have ur"".
but switched it to use ascii decoding for py2, to make sure things are clean.
Diffstat (limited to 'passlib/handlers/misc.py')
| -rw-r--r-- | passlib/handlers/misc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/passlib/handlers/misc.py b/passlib/handlers/misc.py index ecd2e78..8644fee 100644 --- a/passlib/handlers/misc.py +++ b/passlib/handlers/misc.py @@ -10,7 +10,7 @@ from warnings import warn # site # pkg from passlib.utils import to_native_str, str_consteq -from passlib.utils.compat import unicode, u, unicode_or_bytes_types +from passlib.utils.compat import unicode, unicode_or_bytes_types import passlib.utils.handlers as uh # local __all__ = [ @@ -22,7 +22,7 @@ __all__ = [ # handler #============================================================================= -_MARKER_CHARS = u("*!") +_MARKER_CHARS = u"*!" _MARKER_BYTES = b"*!" class unix_disabled(uh.ifc.DisabledHash, uh.MinimalHandler): @@ -56,12 +56,12 @@ class unix_disabled(uh.ifc.DisabledHash, uh.MinimalHandler): # TODO: rename attr to 'marker'... if 'bsd' in sys.platform: # pragma: no cover -- runtime detection - default_marker = u("*") + default_marker = u"*" else: # use the linux default for other systems # (glibc also supports adding old hash after the marker # so it can be restored later). - default_marker = u("!") + default_marker = u"!" @classmethod def using(cls, marker=None, **kwds): |