From f497aa7fcf5e633d92bd9ef7fcac5ed2e2c0ee2d Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 13 Dec 2012 11:28:52 -0600
Subject: [PATCH] fixed aes

---
 VERSION        | 2 +-
 gluon/utils.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 121dfa00..ba0aa062 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.3.0 (2012-12-13 11:10:15) rc1
+Version 2.3.0 (2012-12-13 11:28:10) rc1
diff --git a/gluon/utils.py b/gluon/utils.py
index c78fa80c..5ec2482f 100644
--- 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