Merge ba69608 into 2d29af4

achilles/actions.py

@@ -5,6 +5,7 @@
 
 import django.dispatch
 import logging
+import sys
 import traceback
 
 
@@ -49,7 +50,10 @@ def get(name):
         try:
             import_module(app + '.actions')
         except ImportError:
-            pass
+            tb = sys.exc_info()[2]
+            stack = traceback.extract_tb(tb, 3)
+            if len(stack) > 2:
+                raise
 
     return Library.get_global(name)
 

achilles/blocks.py

@@ -5,6 +5,8 @@
 
 from inspect import isclass
 from importlib import import_module
+import sys
+import traceback
 
 from achilles.common import BaseLibrary, achilles_data
 from achilles.actions import Library as ActionsLibrary
@@ -103,7 +105,10 @@ def get(name, context=None):
         try:
             import_module(app + '.blocks')
         except ImportError:
-            pass
+            tb = sys.exc_info()[2]
+            stack = traceback.extract_tb(tb, 3)
+            if len(stack) > 2:
+                raise
 
     return Library.get_global(name)(context)
 

achilles/forms.py

@@ -1,5 +1,8 @@
 from django.template import Context
-from django.http.request import QueryDict
+try:
+    from django.http.request import QueryDict
+except ImportError:
+    from django.http import QueryDict
 
 from achilles import blocks, actions
 
@@ -26,6 +29,9 @@ def get_initial(self):
 
     def get_form(self, form_data=None, *args, **kwargs):
         if not self._form:
+            if self.form_class is None:
+                raise ValueError("form_class is undefined %s" %
+                                 type(self).__name__)
             self._form = self.form_class(data=form_data,
                                          **self.get_form_kwargs())
         return self._form