diff options
| author | Marko Kreen | 2012-12-20 14:59:05 +0000 |
|---|---|---|
| committer | Marko Kreen | 2012-12-20 14:59:05 +0000 |
| commit | 303b635f6753605a0d052537970468465feb897e (patch) | |
| tree | b5c20da2eb78209c80aa9e3ea0d7c29645fea4b4 /python/skytools | |
| parent | 1a87f1d7fac66082e7b8639cddf12f70dfa6916e (diff) | |
| parent | 272156f33b097ae883d3213b7d695524611100ee (diff) | |
Merge remote-tracking branch 'petr/master'
Diffstat (limited to 'python/skytools')
| -rw-r--r-- | python/skytools/__init__.py | 4 | ||||
| -rw-r--r-- | python/skytools/hashtext.py (renamed from python/skytools/pyhashtext.py) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/skytools/__init__.py b/python/skytools/__init__.py index c3b4f00a..dd9473b9 100644 --- a/python/skytools/__init__.py +++ b/python/skytools/__init__.py @@ -134,8 +134,8 @@ _symbols = { # skytools.utf8 'safe_utf8_decode': 'skytools.utf8:safe_utf8_decode', # hashing - 'hashtext_old': 'skytools.pyhashtext:hashtext_old', - 'hashtext_new': 'skytools.pyhashtext:hashtext_new', + 'hashtext_old': 'skytools.hashtext:hashtext_old', + 'hashtext_new': 'skytools.hashtext:hashtext_new', } __all__ = _symbols.keys() diff --git a/python/skytools/pyhashtext.py b/python/skytools/hashtext.py index 17795f3b..6a9cf11d 100644 --- a/python/skytools/pyhashtext.py +++ b/python/skytools/hashtext.py @@ -1,7 +1,7 @@ """ Pure python implementation of Postgres hashes ->>> import skytools.hashtext +>>> import skytools._chashtext >>> for i in range(3): ... print [hashtext_new_py('x' * (i*5 + j)) for j in range(5)] [-1477818771, 1074944137, -1086392228, -1992236649, -1379736791] @@ -150,7 +150,7 @@ def hashtext_new_py(k): try: - from skytools.hashtext import hashtext_old, hashtext_new + from skytools._chashtext import hashtext_old, hashtext_new except ImportError: hashtext_old = hashtext_old_py hashtext_new = hashtext_new_py |