Ralfp 12 лет назад
Родитель
Сommit
ca2a8d55cd

+ 0 - 3
misago/banning/views.py

@@ -1,11 +1,8 @@
-from misago.admin import site
-print site.get_action('bans')
 from django.core.urlresolvers import reverse as django_reverse
 from django.db.models import Q
 from django.template import RequestContext
 from django.utils.translation import ugettext as _
 from misago.admin import site
-print site.get_action('bans')
 from misago.admin.widgets import *
 from misago.banning.forms import BanForm, SearchBansForm
 from misago.banning.models import Ban

+ 0 - 2
misago/markdown/extensions/quotes.py

@@ -42,8 +42,6 @@ class QuoteTitlesPreprocessor(markdown.preprocessors.Preprocessor):
                     clean.append(line)
             except IndexError:
                 clean.append(line)
-            except Exception as e:
-                print e
         return clean
 
 

+ 5 - 13
misago/markdown/factory.py

@@ -43,22 +43,14 @@ def post_markdown(request, text):
         ext = attr()
         ext.extendMarkdown(md)
     text = md.convert(text)
+    
     # Final cleanups
-    print 'PRE-FINALISE'
-    print '------------------------------------------------'
-    print text
     text = text.replace('<p><h3><quotetitle>', '<h3><quotetitle>')
     text = text.replace('</quotetitle></h3></p>', '</quotetitle></h3>')
     text = text.replace('</quotetitle></h3><br>\n', '</quotetitle></h3>\n<p>')
     text = text.replace('\n<p></p>', '')
-    try:
-        def trans_quotetitle(match):
-            return _("Posted by %(user)s") % {'user': match.group('content')} 
-        text = re.sub(r'<quotetitle>(?P<content>.+)</quotetitle>', trans_quotetitle, text)
-        print 'REPLACED!'
-    except Exception as e:
-        print 'Kaput: %s' % e
-    print 'POST-FINALISE'
-    print '------------------------------------------------'
-    print text
+    def trans_quotetitle(match):
+        return _("Posted by %(user)s") % {'user': match.group('content')} 
+    text = re.sub(r'<quotetitle>(?P<content>.+)</quotetitle>', trans_quotetitle, text)
+    
     return text

+ 10 - 13
misago/sessions/middleware.py

@@ -3,19 +3,16 @@ from sessions import SessionCrawler, SessionHuman
 class SessionMiddleware(object):
     def process_request(self, request):
         try:
-            try:
-                if request.user.is_crawler():
-                    # Crawler Session
-                    request.session = SessionCrawler(request)
-            except AttributeError:
-                # Human Session
-                request.session = SessionHuman(request)
-                request.user = request.session.get_user()
-                
-                if request.user.is_authenticated():
-                    request.session.set_hidden(request.user.hide_activity > 0)
-        except Exception as e:
-            print e
+            if request.user.is_crawler():
+                # Crawler Session
+                request.session = SessionCrawler(request)
+        except AttributeError:
+            # Human Session
+            request.session = SessionHuman(request)
+            request.user = request.session.get_user()
+            
+            if request.user.is_authenticated():
+                request.session.set_hidden(request.user.hide_activity > 0)
         
     def process_response(self, request, response):
         try:

+ 2 - 2
misago/users/models.py

@@ -281,8 +281,8 @@ class User(models.Model):
                     av_file = path(settings.MEDIA_ROOT + 'avatars/' + str(size) + '_' + self.avatar_image)
                     if not av_file.isdir():
                         av_file.remove()
-                except Exception as e:
-                    print e
+                except Exception:
+                    pass
             try:
                 av_file = path(settings.MEDIA_ROOT + 'avatars/' + self.avatar_image)
                 if not av_file.isdir():