diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-31 21:33:19 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-31 21:33:19 -0700 |
| commit | 06a9d9fc3075df8e07960716c25d1eca2eb47f05 (patch) | |
| tree | 94adfe3467fb50e3710548d6c97f1a6b36ed57a8 /sleekxmpp/util/__init__.py | |
| parent | 44ce01a70b7926a1e1f4af6692be3bdc671f7318 (diff) | |
| parent | 1383ca19b50ae7463a1f310f007ed120f811b574 (diff) | |
| download | slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.gz slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.bz2 slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.xz slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.zip | |
Merge branch 'master' into develop
Conflicts:
sleekxmpp/thirdparty/__init__.py
Diffstat (limited to 'sleekxmpp/util/__init__.py')
| -rw-r--r-- | sleekxmpp/util/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sleekxmpp/util/__init__.py b/sleekxmpp/util/__init__.py index 86a87222..7637dda0 100644 --- a/sleekxmpp/util/__init__.py +++ b/sleekxmpp/util/__init__.py @@ -10,6 +10,10 @@ """ +from sleekxmpp.util.misc_ops import bytes, unicode, hashes, hash, \ + num_to_bytes, bytes_to_num, quote, XOR + + # ===================================================================== # Standardize import of Queue class: |