fixed aes

2012-12-13 11:28:52 -06:00
parent d91f7381e1
commit f497aa7fcf
2 changed files with 2 additions and 5 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.3.0 (2012-12-13 11:10:15) rc1
+Version 2.3.0 (2012-12-13 11:28:10) rc1
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -35,10 +35,7 @@ else:
 try:
    from Crypto.Cipher import AES
 except ImportError:
-    try:
-        from .aes import AES
-    except (ImportError, ValueError):
-        from contrib.aes import AES
+    import contrib.aes as AES

 try:
    from contrib.pbkdf2 import pbkdf2_hex