Synced with default branch changes

boards/__init__.py

@@ -1,1 +0,0 b''
-import settings
  No newline at end of file

boards/forms.py

@@ -2,7 +2,6 b' import re'
 import time
 import hashlib
 
-from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
@@ -32,18 +31,18 b" LABEL_SEARCH = _('Search')"
 
 TAG_MAX_LENGTH = 20
 
-REGEX_TAG = ur'^[\w\d]+$'
+REGEX_TAG = r'^[\w\d]+$'
 
 
 class FormatPanel(forms.Textarea):
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
-            output += u'<span class="mark_btn"' + \
-                      u' onClick="addMarkToMsg(\'' + formatter.format_left + \
+            output += '<span class="mark_btn"' + \
+                      ' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
-                      formatter.preview_right + u'</span>'
+                      formatter.preview_right + '</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
@@ -56,7 +55,7 b' class PlainErrorList(ErrorList):'
         return self.as_text()
 
     def as_text(self):
-        return ''.join([u'(!) %s ' % e for e in self])
+        return ''.join(['(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
@@ -88,7 +87,7 b' class NeboardForm(forms.Form):'
     def as_json_errors(self):
         errors = []
 
-        for name, field in self.fields.items():
+        for name, field in list(self.fields.items()):
             if self[name].errors:
                 errors.append({
                     'field': name,
@@ -208,7 +207,7 b' class PostForm(NeboardForm):'
 
 class ThreadForm(PostForm):
 
-    regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
+    regex_tags = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
@@ -229,48 +228,6 b' class ThreadForm(PostForm):'
         return cleaned_data
 
 
-class PostCaptchaForm(PostForm):
-    captcha = CaptchaField()
-
-    def __init__(self, *args, **kwargs):
-        self.request = kwargs['request']
-        del kwargs['request']
-
-        super(PostCaptchaForm, self).__init__(*args, **kwargs)
-
-    def clean(self):
-        cleaned_data = super(PostCaptchaForm, self).clean()
-
-        success = self.is_valid()
-        utils.update_captcha_access(self.request, success)
-
-        if success:
-            return cleaned_data
-        else:
-            raise forms.ValidationError(_("Captcha validation failed"))
-
-
-class ThreadCaptchaForm(ThreadForm):
-    captcha = CaptchaField()
-
-    def __init__(self, *args, **kwargs):
-        self.request = kwargs['request']
-        del kwargs['request']
-
-        super(ThreadCaptchaForm, self).__init__(*args, **kwargs)
-
-    def clean(self):
-        cleaned_data = super(ThreadCaptchaForm, self).clean()
-
-        success = self.is_valid()
-        utils.update_captcha_access(self.request, success)
-
-        if success:
-            return cleaned_data
-        else:
-            raise forms.ValidationError(_("Captcha validation failed"))
-
-
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES,

boards/migrations/0015_post_to_thread.py

@@ -17,7 +17,7 b' class Migration(DataMigration):'
             thread.replies.add(post)
             post.thread_new = thread
             post.save()
-            print str(post.thread_new.id)
+            print(str(post.thread_new.id))
 
             for reply in post.replies.all():
                 thread.replies.add(reply)

boards/models/post.py

@@ -36,7 +36,7 b" NO_IP = '0.0.0.0'"
 # TODO Real user agent should be saved instead of this
 UNKNOWN_UA = ''
 
-REGEX_REPLY = re.compile(ur'\[post\](\d+)\[/post\]')
+REGEX_REPLY = re.compile(r'\[post\](\d+)\[/post\]')
 
 logger = logging.getLogger(__name__)
 
@@ -48,6 +48,9 b' class PostManager(models.Manager):'
         Creates new post
         """
 
+        if not tags:
+            tags = []
+
         posting_time = timezone.now()
         if not thread:
             thread = Thread.objects.create(bump_time=posting_time,
@@ -75,8 +78,7 b' class PostManager(models.Manager):'
                                                             post.id))
 
         thread.replies.add(post)
-        if tags:
-            map(thread.add_tag, tags)
+        list(map(thread.add_tag, tags))
 
         if new_thread:
             Thread.objects.process_oldest_threads()
@@ -112,7 +114,8 b' class PostManager(models.Manager):'
         """
 
         posts = self.filter(poster_ip=ip)
-        map(self.delete_post, posts)
+        for post in posts:
+            self.delete_post(post)
 
     def connect_replies(self, post):
         """

boards/static/css/md/base_page.css

@@ -222,13 +222,12 b' blockquote {'
 }
 
 .multiquote {
-    border-left: solid 4px #ccc;
     padding: 3px;
     display: inline-block;
     background: #222;
-    border-right: solid 1px #ccc;
-    border-top: solid 1px #ccc;
-    border-bottom: solid 1px #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 4px;
+    font-size: 0.9em;
 }
 
 .spoiler {

boards/tests.py

@@ -182,10 +182,6 b' class PagesTest(TestCase):'
 
 class FormTest(TestCase):
     def test_post_validation(self):
-        # Disable captcha for the test
-        captcha_enabled = neboard.settings.ENABLE_CAPTCHA
-        neboard.settings.ENABLE_CAPTCHA = False
-
         client = Client()
 
         valid_tags = u'tag1 tag_2 тег_3'
@@ -222,9 +218,6 b' class FormTest(TestCase):'
         self.assertEqual(2, Post.objects.count(),
                          msg=u'No posts were created')
 
-        # Restore captcha setting
-        settings.ENABLE_CAPTCHA = captcha_enabled
-
 
 class ViewTest(TestCase):
 
@@ -248,7 +241,7 b' class ViewTest(TestCase):'
                 except NoReverseMatch:
                     # This view just needs additional arguments
                     pass
-                except Exception, e:
+                except Exception as e:
                     self.fail('Got exception %s at %s view' % (e, view_name))
             except AttributeError:
                 # This is normal, some views do not have names

boards/thumbs.py

@@ -8,7 +8,7 b' from django.db.models import ImageField'
 from django.db.models.fields.files import ImageFieldFile
 from PIL import Image
 from django.core.files.base import ContentFile
-import cStringIO
+import io
 
 
 def generate_thumb(img, thumb_size, format):
@@ -51,13 +51,13 b' def generate_thumb(img, thumb_size, form'
         image2 = image
         image2.thumbnail(thumb_size, Image.ANTIALIAS)
 
-    io = cStringIO.StringIO()
+    output = io.BytesIO()
     # PNG and GIF are the same, JPG is JPEG
     if format.upper() == 'JPG':
         format = 'JPEG'
 
-    image2.save(io, format)
-    return ContentFile(io.getvalue())
+    image2.save(output, format)
+    return ContentFile(output.getvalue())
 
 
 class ImageWithThumbsFieldFile(ImageFieldFile):

boards/urls.py

@@ -45,7 +45,6 b" urlpatterns = patterns('',"
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
-    url(r'^captcha/', include('captcha.urls')),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', DeletePostView.as_view(),
             name='delete'),

boards/utils.py

@@ -39,8 +39,6 b' def need_include_captcha(request):'
     if current_delay < delay_time:
         enable_captcha = True
 
-    print 'ENABLING' + str(enable_captcha)
-
     return enable_captcha
 
 
@@ -56,8 +54,6 b' def update_captcha_access(request, passe'
                   if KEY_CAPTCHA_DELAY_TIME in request.session
                   else settings.CAPTCHA_DEFAULT_SAFE_TIME)
 
-    print "DELAY TIME = " + str(delay_time)
-
     if passed:
         delay_time -= 2 if delay_time >= 7 else 5
     else:
@@ -79,4 +75,4 b' def get_client_ip(request):'
 def datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
-               * 1000000 + datetime.microsecond)
  No newline at end of file
+               * 1000000 + datetime.microsecond)

boards/views/all_threads.py

@@ -86,7 +86,7 b' class AllThreadsView(PostMixin, BaseBoar'
         if tag_strings:
             tag_strings = tag_strings.split(TAG_DELIMITER)
             for tag_name in tag_strings:
-                tag_name = string.lower(tag_name.strip())
+                tag_name = tag_name.strip().lower()
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
@@ -115,7 +115,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         text = self._remove_invalid_links(text)
 
-        if FORM_IMAGE in data.keys():
+        if FORM_IMAGE in list(data.keys()):
             image = data[FORM_IMAGE]
         else:
             image = None

boards/views/api.py

@@ -7,6 +7,7 b' from django.shortcuts import get_object_'
 from django.template import RequestContext
 from django.utils import timezone
 from django.core import serializers
+from django.template.loader import render_to_string
 
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Thread, Tag
@@ -219,7 +220,14 b' def api_get_post(request, post_id):'
 def _get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None,
         include_last_update=False):
     if format_type == DIFF_TYPE_HTML:
-        return get_post(request, post_id).content.strip()
+        post = get_object_or_404(Post, id=post_id)
+
+        context = RequestContext(request)
+        context['post'] = post
+        if PARAMETER_TRUNCATED in request.GET:
+            context[PARAMETER_TRUNCATED] = True
+
+        return render_to_string('boards/api_post.html', context)
     elif format_type == DIFF_TYPE_JSON:
         post = get_object_or_404(Post, id=post_id)
         post_json = {

boards/views/thread.py

@@ -119,7 +119,7 b' class ThreadView(BaseBoardView, PostMixi'
 
         text = self._remove_invalid_links(text)
 
-        if FORM_IMAGE in data.keys():
+        if FORM_IMAGE in list(data.keys()):
             image = data[FORM_IMAGE]
         else:
             image = None

neboard/__init__.py

@@ -1,1 +0,0 b''
-import settings
  No newline at end of file

neboard/settings.py

@@ -148,8 +148,6 b' INSTALLED_APPS = ('
     'south',
     'debug_toolbar',
 
-    'captcha',
-
     # Search
     'haystack',
 
@@ -168,11 +166,6 b' DEBUG_TOOLBAR_PANELS = ('
     'debug_toolbar.panels.logger.LoggingPanel',
 )
 
-# TODO: NEED DESIGN FIXES
-CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
-                         u'<div class="form-label">%(image)s</div>'
-                         u'<div class="form-text">%(text_field)s</div>')
-
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
@@ -229,9 +222,6 b' THEMES = ['
 
 POPULAR_TAGS = 10
 
-ENABLE_CAPTCHA = False
-# if user tries to post before CAPTCHA_DEFAULT_SAFE_TIME. Captcha will be shown
-CAPTCHA_DEFAULT_SAFE_TIME = 30  # seconds
 POSTING_DELAY = 20  # seconds
 
 COMPRESS_HTML = True
@@ -239,7 +229,7 b' COMPRESS_HTML = True'
 # Debug mode middlewares
 if DEBUG:
     MIDDLEWARE_CLASSES += (
-        'boards.profiler.ProfilerMiddleware',
+        #'boards.profiler.ProfilerMiddleware',
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
 

requirements.txt

@@ -1,10 +1,7 b''
 south>=0.8.4
-line_profiler
 haystack
 pillow
 django>=1.6
 django_cleanup
 django-markupfield
-django-simple-captcha
-line-profiler
 bbcode