Browse Source

Removed depreciation warnings on BaseException

Ralfp 12 years ago
parent
commit
299de846e5

+ 1 - 1
misago/apps/admin/settings/views.py

@@ -102,7 +102,7 @@ def settings_search(request):
         else:
         else:
             raise SearchException(_('Search query is invalid.'))
             raise SearchException(_('Search query is invalid.'))
     except SearchException as e:
     except SearchException as e:
-        message = Message(e.message, 'error')
+        message = Message(unicode(e), 'error')
     return request.theme.render_to_response('settings/search_results.html',
     return request.theme.render_to_response('settings/search_results.html',
                                     {
                                     {
                                     'message': message,
                                     'message': message,

+ 1 - 1
misago/apps/errors.py

@@ -17,7 +17,7 @@ def error_view(request, error, message):
         return json_response(request, status=error, message=message)
         return json_response(request, status=error, message=message)
     response = request.theme.render_to_response(('error%s.html' % error),
     response = request.theme.render_to_response(('error%s.html' % error),
                                                 {
                                                 {
-                                                 'message': message,
+                                                 'message': unicode(message),
                                                  'hide_signin': True,
                                                  'hide_signin': True,
                                                  'exception_response': True,
                                                  'exception_response': True,
                                                  },
                                                  },

+ 2 - 2
misago/apps/threadtype/changelog.py

@@ -44,9 +44,9 @@ class ChangelogBaseView(ViewBase):
         except (Forum.DoesNotExist, Thread.DoesNotExist, Post.DoesNotExist, Change.DoesNotExist):
         except (Forum.DoesNotExist, Thread.DoesNotExist, Post.DoesNotExist, Change.DoesNotExist):
             return error404(self.request)
             return error404(self.request)
         except ACLError403 as e:
         except ACLError403 as e:
-            return error403(request, e.message)
+            return error403(request, e)
         except ACLError404 as e:
         except ACLError404 as e:
-            return error404(request, e.message)
+            return error404(request, e)
         return self.dispatch(request)
         return self.dispatch(request)
 
 
 
 

+ 2 - 2
misago/apps/threadtype/details.py

@@ -32,9 +32,9 @@ class ExtraBaseView(ViewBase):
         except (Forum.DoesNotExist, Thread.DoesNotExist, Post.DoesNotExist):
         except (Forum.DoesNotExist, Thread.DoesNotExist, Post.DoesNotExist):
             return error404(self.request)
             return error404(self.request)
         except ACLError403 as e:
         except ACLError403 as e:
-            return error403(request, e.message)
+            return error403(request, e)
         except ACLError404 as e:
         except ACLError404 as e:
-            return error404(request, e.message)
+            return error404(request, e)
         return self.response()
         return self.response()
 
 
 
 

+ 2 - 2
misago/decorators.py

@@ -7,9 +7,9 @@ def acl_errors(f):
         try:
         try:
             return f(*args, **kwargs)
             return f(*args, **kwargs)
         except ACLError403 as e:
         except ACLError403 as e:
-            return error403(args[0], e.message)
+            return error403(args[0], e)
         except ACLError404 as e:
         except ACLError404 as e:
-            return error404(args[0], e.message)
+            return error404(args[0], e)
     return decorator
     return decorator