Mercurial > moin > 1.9
changeset 5904:3a1b92276377
reorder imports, so that MoinMoin.support is already in sys.path
| author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
|---|---|
| date | Wed, 12 Dec 2012 12:27:37 +0100 |
| parents | e55effb840da |
| children | 9c7968c832a4 |
| files | MoinMoin/security/textcha.py MoinMoin/user.py MoinMoin/wikiutil.py |
| diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/security/textcha.py Wed Dec 12 12:04:34 2012 +0100 +++ b/MoinMoin/security/textcha.py Wed Dec 12 12:27:37 2012 +0100 @@ -28,9 +28,8 @@ from MoinMoin import log logging = log.getLogger(__name__) +from MoinMoin import wikiutil from werkzeug.security import safe_str_cmp as safe_str_equal - -from MoinMoin import wikiutil from MoinMoin.support.python_compatibility import hmac_new SHA1_LEN = 40 # length of hexdigest
--- a/MoinMoin/user.py Wed Dec 12 12:04:34 2012 +0100 +++ b/MoinMoin/user.py Wed Dec 12 12:27:37 2012 +0100 @@ -28,11 +28,10 @@ except ImportError: crypt = None -from werkzeug.security import safe_str_cmp as safe_str_equal - from MoinMoin.support.python_compatibility import hash_new, hmac_new from MoinMoin import config, caching, wikiutil, i18n, events +from werkzeug.security import safe_str_cmp as safe_str_equal from MoinMoin.util import timefuncs, random_string from MoinMoin.wikiutil import url_quote_plus
--- a/MoinMoin/wikiutil.py Wed Dec 12 12:04:34 2012 +0100 +++ b/MoinMoin/wikiutil.py Wed Dec 12 12:27:37 2012 +0100 @@ -20,14 +20,13 @@ from MoinMoin import log logging = log.getLogger(__name__) -from werkzeug.security import safe_str_cmp as safe_str_equal - from MoinMoin import config from MoinMoin.support.python_compatibility import rsplit from inspect import getargspec, isfunction, isclass, ismethod from MoinMoin import web # needed so that next lines work: import werkzeug +from werkzeug.security import safe_str_cmp as safe_str_equal from MoinMoin.util import pysupport, lock # Exceptions