Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 08:02:54 +11:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Martin Mahner 2018-12-19 15:09:30 +01:00
commit c19d924f7d
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dpaste/forms.py
View file

@ -79,7 +79,7 @@ class SnippetForm(forms.ModelForm):
def clean_content(self): def clean_content(self):
content = self.cleaned_data.get('content', '') content = self.cleaned_data.get('content', '')
if content.strip() == '': if not content.strip():
raise forms.ValidationError(_('This field is required.')) raise forms.ValidationError(_('This field is required.'))
return content return content

3
dpaste/highlight.py
View file

@ -117,8 +117,7 @@ class NakedHtmlFormatter(HtmlFormatter):
return self._wrap_code(source) return self._wrap_code(source)
def _wrap_code(self, source): def _wrap_code(self, source):
for i, t in source: yield from source
yield i, t
class PlainCodeHighlighter(Highlighter): class PlainCodeHighlighter(Highlighter):

2
dpaste/views.py
View file

@ -260,7 +260,7 @@ class APIView(View):
lexer = config.PLAIN_CODE_SYMBOL lexer = config.PLAIN_CODE_SYMBOL
if expires: if expires:
expire_options = [str(i) for i in dict(config.EXPIRE_CHOICES).keys()] expire_options = [str(i) for i in dict(config.EXPIRE_CHOICES)]
if expires not in expire_options: if expires not in expire_options:
return HttpResponseBadRequest( return HttpResponseBadRequest(
'Invalid expire choice "{}" given. Valid values are: {}'.format( 'Invalid expire choice "{}" given. Valid values are: {}'.format(