try:
from email.mime.nonmultipart import MIMENonMultipart
from email.encoders import encode_7or8bit
+ from email.parser import HeaderParser
import email.utils
except ImportError:
# Python 2.4 compatibility
from email.MIMENonMultipart import MIMENonMultipart
from email.Encoders import encode_7or8bit
+ from email.Parser import HeaderParser
import email.Utils
email.utils = email.Utils
class Person(models.Model):
email = models.CharField(max_length=255, unique = True)
- name = models.CharField(max_length=255, null = True)
- user = models.ForeignKey(User, null = True)
+ name = models.CharField(max_length=255, null = True, blank = True)
+ user = models.ForeignKey(User, null = True, blank = True)
- def __str__(self):
+ def __unicode__(self):
if self.name:
- return '%s <%s>' % (self.name, self.email)
+ return u'%s <%s>' % (self.name, self.email)
else:
return self.email
listid = models.CharField(max_length=255, unique=True)
listemail = models.CharField(max_length=200)
- def __str__(self):
+ def __unicode__(self):
return self.name
class UserProfile(models.Model):
user = models.ForeignKey(User, unique = True)
- primary_project = models.ForeignKey(Project, null = True)
+ primary_project = models.ForeignKey(Project, null = True, blank = True)
maintainer_projects = models.ManyToManyField(Project,
related_name = 'maintainer_project')
send_email = models.BooleanField(default = False,
def name(self):
if self.user.first_name or self.user.last_name:
names = filter(bool, [self.user.first_name, self.user.last_name])
- return ' '.join(names)
+ return u' '.join(names)
return self.user.username
def contributor_projects(self):
person.link_to_user(self.user)
person.save()
- def __str__(self):
+ def __unicode__(self):
return self.name()
class State(models.Model):
ordering = models.IntegerField(unique = True)
action_required = models.BooleanField(default = True)
- def __str__(self):
+ def __unicode__(self):
return self.name
class Meta:
state = models.ForeignKey(State)
archived = models.BooleanField(default = False)
headers = models.TextField(blank = True)
- content = models.TextField()
+ content = models.TextField(null = True, blank = True)
+ pull_url = models.CharField(max_length=255, null = True, blank = True)
commit_ref = models.CharField(max_length=255, null = True, blank = True)
- hash = HashField(null = True, db_index = True)
+ hash = HashField(null = True, blank = True)
- def __str__(self):
+ def __unicode__(self):
return self.name
def comments(self):
except:
self.state = State.objects.get(ordering = 0)
- if self.hash is None:
+ if self.hash is None and self.content is not None:
self.hash = hash_patch(self.content).hexdigest()
super(Patch, self).save()
if postscript:
body += '---\n' + postscript.strip() + '\n'
- body += '\n' + self.content
+ if self.content:
+ body += '\n' + self.content
mail = PatchMbox(body)
mail['Subject'] = self.name
mail['Message-Id'] = self.msgid
mail.set_unixfrom('From patchwork ' + self.date.ctime())
- return mail
+ copied_headers = ['To', 'Cc']
+ orig_headers = HeaderParser().parsestr(str(self.headers))
+ for header in copied_headers:
+ if header in orig_headers:
+ mail[header] = orig_headers[header]
+
+ return mail
@models.permalink
def get_absolute_url(self):
headers = models.TextField(blank = True)
content = models.TextField()
- response_re = re.compile('^(Tested|Reviewed|Acked|Signed-off|Nacked)-by: .*$', re.M | re.I)
+ response_re = re.compile( \
+ '^(Tested|Reviewed|Acked|Signed-off|Nacked|Reported)-by: .*$',
+ re.M | re.I)
def patch_responses(self):
return ''.join([ match.group(0) + '\n' for match in \