Changeset - de23056b5196
[Not reviewed]
Merge
0 4 0
Patrick Altman - 8 years ago 2015-12-28 16:50:06
paltman@gmail.com
Merge pull request #115 from miurahr/pip8

fix pip8 warnings
2 files changed with 3 insertions and 4 deletions:
0 comments (0 inline, 0 general)
symposion/markdown_parser.py
Show inline comments
 
from __future__ import unicode_literals
 
from html5lib import html5parser, sanitizer
 

	
 
import markdown
 

	
 

	
 
def parse(text):
 

	
 
    # First run through the Markdown parser
 
    text = markdown.markdown(text, extensions=["extra"], safe_mode=False)
 

	
 
    # Sanitize using html5lib
 
    # bits = []
 
    # parser = html5parser.HTMLParser(tokenizer=sanitizer.HTMLSanitizer)
 
    # for token in parser.parseFragment(text).childNodes:
 
    #     bits.append(token.toxml())
 
    # return "".join(bits)
 
    return text
symposion/speakers/models.py
Show inline comments
...
 
@@ -4,51 +4,51 @@ import datetime
 

	
 
from django.core.urlresolvers import reverse
 
from django.db import models
 
from django.utils.encoding import python_2_unicode_compatible
 
from django.utils.translation import ugettext_lazy as _
 

	
 
from django.contrib.auth.models import User
 

	
 
from symposion.markdown_parser import parse
 

	
 

	
 
@python_2_unicode_compatible
 
class Speaker(models.Model):
 

	
 
    SESSION_COUNT_CHOICES = [
 
        (1, "One"),
 
        (2, "Two")
 
    ]
 

	
 
    user = models.OneToOneField(User, null=True, related_name="speaker_profile", verbose_name=_("User"))
 
    name = models.CharField(verbose_name=_("Name"), max_length=100,
 
                            help_text=_("As you would like it to appear in the"
 
                                        " conference program."))
 
    biography = models.TextField(blank=True, help_text=_("A little bit about you.  Edit using "
 
                                                    "<a href='http://warpedvisions.org/projects/"
 
                                                    "markdown-cheat-sheet/target='_blank'>"
 
                                                    "Markdown</a>."), verbose_name=_("Biography"))
 
                                                         "<a href='http://warpedvisions.org/projects/"
 
                                                         "markdown-cheat-sheet/target='_blank'>"
 
                                                         "Markdown</a>."), verbose_name=_("Biography"))
 
    biography_html = models.TextField(blank=True)
 
    photo = models.ImageField(upload_to="speaker_photos", blank=True, verbose_name=_("Photo"))
 
    annotation = models.TextField(verbose_name=_("Annotation"))  # staff only
 
    invite_email = models.CharField(max_length=200, unique=True, null=True, db_index=True, verbose_name=_("Invite_email"))
 
    invite_token = models.CharField(max_length=40, db_index=True, verbose_name=_("Invite token"))
 
    created = models.DateTimeField(
 
        default=datetime.datetime.now,
 
        editable=False,
 
        verbose_name=_("Created")
 
    )
 

	
 
    class Meta:
 
        ordering = ['name']
 
        verbose_name = _("Speaker")
 
        verbose_name_plural = _("Speakers")
 

	
 
    def save(self, *args, **kwargs):
 
        self.biography_html = parse(self.biography)
 
        return super(Speaker, self).save(*args, **kwargs)
 

	
 
    def __str__(self):
 
        if self.user:
 
            return self.name
 
        else:
0 comments (0 inline, 0 general)