dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed aes

Browse Source
This commit is contained in:
mdipierro
2012-12-13 11:28:52 -06:00
parent d91f7381e1
commit f497aa7fcf
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.3.0 (2012-12-13 11:10:15) rc1 Version 2.3.0 (2012-12-13 11:28:10) rc1
gluon/utils.py
+1 -4
View File
@@ -35,10 +35,7 @@ else:
try: try:
from Crypto.Cipher import AES from Crypto.Cipher import AES
except ImportError: except ImportError:
try: import contrib.aes as AES
from .aes import AES
except (ImportError, ValueError):
from contrib.aes import AES
try: try:
from contrib.pbkdf2 import pbkdf2_hex from contrib.pbkdf2 import pbkdf2_hex