SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit d5ac44ce authored by Jorran de Wit's avatar Jorran de Wit
Browse files

PEP improvement

parent baed455f
No related branches found
No related tags found
No related merge requests found
...@@ -18,9 +18,13 @@ import strings ...@@ -18,9 +18,13 @@ import strings
class DOIToQueryForm(forms.Form): class DOIToQueryForm(forms.Form):
VALID_DOI_REGEXP = r'^(?i)10.\d{4,9}/[-._;()/:A-Z0-9]+$' VALID_DOI_REGEXP = r'^(?i)10.\d{4,9}/[-._;()/:A-Z0-9]+$'
doi = forms.RegexField(regex=VALID_DOI_REGEXP, strip=True, help_text=strings.doi_query_help_text, doi = forms.RegexField(regex=VALID_DOI_REGEXP, strip=True,
error_messages={'invalid': strings.doi_query_invalid}, help_text=strings.doi_query_help_text,
widget=forms.TextInput({'label': 'DOI', 'placeholder': strings.doi_query_placeholder})) error_messxages={'invalid': strings.doi_query_invalid},
widget=forms.TextInput({
'label': 'DOI',
'placeholder': strings.doi_query_placeholder
}))
def clean_doi(self): def clean_doi(self):
input_doi = self.cleaned_data['doi'] input_doi = self.cleaned_data['doi']
...@@ -51,9 +55,12 @@ class ArxivQueryForm(forms.Form): ...@@ -51,9 +55,12 @@ class ArxivQueryForm(forms.Form):
IDENTIFIER_PATTERN_OLD = r'^[-.a-z]+/[0-9]{7,}v[0-9]{1,2}$' IDENTIFIER_PATTERN_OLD = r'^[-.a-z]+/[0-9]{7,}v[0-9]{1,2}$'
VALID_ARXIV_IDENTIFIER_REGEX = "(?:{})|(?:{})".format(IDENTIFIER_PATTERN_NEW, IDENTIFIER_PATTERN_OLD) VALID_ARXIV_IDENTIFIER_REGEX = "(?:{})|(?:{})".format(IDENTIFIER_PATTERN_NEW, IDENTIFIER_PATTERN_OLD)
identifier = forms.RegexField(regex=VALID_ARXIV_IDENTIFIER_REGEX, strip=True, identifier = forms.RegexField(regex=VALID_ARXIV_IDENTIFIER_REGEX,
help_text=strings.arxiv_query_help_text, error_messages={'invalid': strings.arxiv_query_invalid}, strip=True,
widget=forms.TextInput( {'placeholder': strings.arxiv_query_placeholder})) help_text=strings.arxiv_query_help_text,
error_messages={'invalid': strings.arxiv_query_invalid},
widget=forms.TextInput({
'placeholder': strings.arxiv_query_placeholder}))
def clean_identifier(self): def clean_identifier(self):
identifier = self.cleaned_data['identifier'] identifier = self.cleaned_data['identifier']
...@@ -83,7 +90,8 @@ class RequestCommentaryForm(forms.ModelForm): ...@@ -83,7 +90,8 @@ class RequestCommentaryForm(forms.ModelForm):
class Meta: class Meta:
model = Commentary model = Commentary
fields = [ fields = [
'discipline', 'domain', 'subject_area', 'pub_title', 'author_list', 'pub_date', 'pub_abstract' 'discipline', 'domain', 'subject_area', 'pub_title',
'author_list', 'pub_date', 'pub_abstract'
] ]
placeholders = { placeholders = {
'pub_date': 'Format: YYYY-MM-DD' 'pub_date': 'Format: YYYY-MM-DD'
...@@ -126,8 +134,10 @@ class RequestArxivPreprintForm(RequestCommentaryForm): ...@@ -126,8 +134,10 @@ class RequestArxivPreprintForm(RequestCommentaryForm):
class RequestPublishedArticleForm(RequestCommentaryForm): class RequestPublishedArticleForm(RequestCommentaryForm):
class Meta(RequestCommentaryForm.Meta): class Meta(RequestCommentaryForm.Meta):
fields = RequestCommentaryForm.Meta.fields + ['journal', 'volume', 'pages', 'pub_DOI'] fields = RequestCommentaryForm.Meta.fields + ['journal', 'volume', 'pages', 'pub_DOI']
placeholders = {**RequestCommentaryForm.Meta.placeholders, placeholders = {
**{'pub_DOI': 'ex.: 10.21468/00.000.000000'}} **RequestCommentaryForm.Meta.placeholders,
**{'pub_DOI': 'ex.: 10.21468/00.000.000000'}
}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(RequestPublishedArticleForm, self).__init__(*args, **kwargs) super(RequestPublishedArticleForm, self).__init__(*args, **kwargs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment