fixed some str/unicode issues and a bug in edit user profile

4 files changed, 15 insertions, 15 deletions

diff --git a/askbot/views/commands.py b/askbot/views/commands.py
index ab49dd88..010e20f1 100644
--- a/askbot/views/commands.py
+++ b/askbot/views/commands.py
@@ -255,7 +255,7 @@ def vote(request, id):
         data = simplejson.dumps(response_data)
 
     except Exception, e:
-        response_data['message'] = str(e)
+        response_data['message'] = unicode(e)
         response_data['success'] = 0
         data = simplejson.dumps(response_data)
     return HttpResponse(data, mimetype="application/json")
@@ -329,7 +329,7 @@ def close(request, id):#close question
                         )
             return response
     except exceptions.PermissionDenied, e:
-        request.user.message_set.create(message = str(e))
+        request.user.message_set.create(message = unicode(e))
         return HttpResponseRedirect(question.get_absolute_url())
 
 @login_required
@@ -360,7 +360,7 @@ def reopen(request, id):#re-open question
                             context_instance=RequestContext(request)
                         )
     except exceptions.PermissionDenied, e:
-        request.user.message_set.create(message = str(e))
+        request.user.message_set.create(message = unicode(e))
         return HttpResponseRedirect(question.get_absolute_url())
 
 #askbot-user communication system
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 440b71f4..f903d3db 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -266,7 +266,7 @@ def question(request, id):#refactor - long subroutine. display question body, an
             view_id = "votes"
             orderby = "-score"
 
-    logging.debug('view_id=' + str(view_id))
+    logging.debug('view_id=' + unicode(view_id))
 
     question = get_object_or_404(Question, id=id)
     try:
@@ -294,7 +294,7 @@ def question(request, id):#refactor - long subroutine. display question body, an
                 raise django_exceptions.PermissionDenied(msg)
             request.user.assert_can_see_deleted_post(question)
         except django_exceptions.PermissionDenied, e:
-            request.user.message_set.create(message = str(e))
+            request.user.message_set.create(message = unicode(e))
             return HttpResponseRedirect(reverse('index'))
 
     answer_form = AnswerForm(question,request.user)
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 22688180..02d36514 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -208,7 +208,7 @@ def edit_user(request, id):
     This view is accessible to profile owners or site administrators
     """
     user = get_object_or_404(models.User, id=id)
-    if request.user != user or not request.user.is_superuser:
+    if not(request.user == user or request.user.is_superuser):
         raise Http404
     if request.method == "POST":
         form = forms.EditUserForm(user, request.POST)
diff --git a/askbot/views/writers.py b/askbot/views/writers.py
index 7de8ea35..fcadbe90 100644
--- a/askbot/views/writers.py
+++ b/askbot/views/writers.py
@@ -85,9 +85,9 @@ def upload(request):#ajax upload file to a question or answer
             raise exceptions.PermissionDenied(msg)
 
     except exceptions.PermissionDenied, e:
-        error = str(e)
+        error = unicode(e)
     except Exception, e:
-        logging.critical(str(e))
+        logging.critical(unicode(e))
         error = _('Error uploading file. Please contact the site administrator. Thank you.')
 
     if error == '':
@@ -136,7 +136,7 @@ def ask(request):#view used to ask a new question
                                                 )
                     return HttpResponseRedirect(question.get_absolute_url())
                 except exceptions.PermissionDenied, e:
-                    request.user.message_set.create(message = str(e))
+                    request.user.message_set.create(message = unicode(e))
                     return HttpResponseRedirect(reverse('index'))
 
             else:
@@ -203,7 +203,7 @@ def retag_question(request, id):
             'tags' : _get_tags_cache_json(),
         }, context_instance=RequestContext(request))
     except exceptions.PermissionDenied, e:
-        request.user.message_set.create(message = str(e))
+        request.user.message_set.create(message = unicode(e))
         return HttpResponseRedirect(question.get_absolute_url())
 
 @login_required
@@ -254,7 +254,7 @@ def edit_question(request, id):
         }, context_instance=RequestContext(request))
 
     except exceptions.PermissionDenied, e:
-        request.user.message_set.create(message = str(e))
+        request.user.message_set.create(message = unicode(e))
         return HttpResponseRedirect(question.get_absolute_url())
 
 @login_required
@@ -310,7 +310,7 @@ def edit_answer(request, id):
                             context_instance=RequestContext(request)
                         )
     except exceptions.PermissionDenied, e:
-        request.user.message_set.create(message = str(e))
+        request.user.message_set.create(message = unicode(e))
         return HttpResponseRedirect(answer.get_absolute_url())
 
 #todo: rename this function to post_new_answer
@@ -342,7 +342,7 @@ def answer(request, id):#process a new answer
                                     )
                     return HttpResponseRedirect(answer.get_absolute_url())
                 except exceptions.PermissionDenied, e:
-                    request.user.message_set.create(message = str(e))
+                    request.user.message_set.create(message = unicode(e))
             else:
                 request.session.flush()
                 anon = models.AnonymousAnswer(
@@ -431,7 +431,7 @@ def __comments(request, obj):#non-view generic ajax handler to load comments to
                 response = __generate_comments_json(obj, user)
             except exceptions.PermissionDenied, e:
                 response = HttpResponseForbidden(
-                                        str(e),
+                                        unicode(e),
                                         mimetype="application/json"
                                     )
         return response
@@ -478,6 +478,6 @@ def delete_comment(
                 )
     except exceptions.PermissionDenied, e:
         return HttpResponseForbidden(
-                    str(e),
+                    unicode(e),
                     mimetype = 'application/json'
                 )