summaryrefslogtreecommitdiff
path: root/passlib/utils
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2012-01-05 21:42:45 -0500
committerEli Collins <elic@assurancetechnologies.com>2012-01-05 21:42:45 -0500
commite6f618be80f36b9a7b1d4eed97e39c927120ea2e (patch)
tree47442f253f4cfb26e1676b35b49556fe79f59492 /passlib/utils
parentf7a33447fec5219842c15eef560ca067f4ec06c3 (diff)
downloadpasslib-e6f618be80f36b9a7b1d4eed97e39c927120ea2e.tar.gz
renamed utils.timer -> utils.tick
Diffstat (limited to 'passlib/utils')
-rw-r--r--passlib/utils/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/passlib/utils/__init__.py b/passlib/utils/__init__.py
index 1782759..d0dfc5f 100644
--- a/passlib/utils/__init__.py
+++ b/passlib/utils/__init__.py
@@ -51,7 +51,7 @@ __all__ = [
"xor_bytes",
#random
- 'timer',
+ 'tick',
'rng',
'getrandbytes',
'getrandstr',
@@ -803,13 +803,13 @@ def adapted_b64_decode(data, sixthree="."):
#randomness
#=================================================================================
-# pick best timer function to expose as "timer" - lifted from timeit module.
+# pick best timer function to expose as "tick" - lifted from timeit module.
if sys.platform == "win32":
# On Windows, the best timer is time.clock()
- from time import clock as timer
+ from time import clock as tick
else:
# On most other platforms the best timer is time.time()
- from time import time as timer
+ from time import time as tick
# works but not used
##def _get_timer_resolution(timer=timer, repeat=3):