arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 00:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Swap to pycodestyle rather than pep8 in Travis

Browse Source 
And eliminate W605 errors
This commit is contained in:
FreneticScribbler
2020-02-21 12:20:44 +00:00
parent 3cf13299eb
commit cf7934974e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -19,7 +19,7 @@ before_script:
- python manage.py collectstatic --noinput - python manage.py collectstatic --noinput
script: script:
- pep8 . --exclude=migrations,importer* - pycodestyle . --exclude=migrations,importer*
- python manage.py check - python manage.py check
- python manage.py makemigrations --check --dry-run - python manage.py makemigrations --check --dry-run
- coverage run manage.py test --verbosity=2 - coverage run manage.py test --verbosity=2

2
RIGS/finance.py
View File

@@ -76,7 +76,7 @@ class InvoicePrint(generic.View):
pdfData = buffer.read() pdfData = buffer.read()
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name) escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
response = HttpResponse(content_type='application/pdf') response = HttpResponse(content_type='application/pdf')
response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % (invoice.pk, invoice.event.pk, escapedEventName) response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % (invoice.pk, invoice.event.pk, escapedEventName)

4
RIGS/rigboard.py
View File

@@ -110,7 +110,7 @@ class EventCreate(generic.CreateView):
context['currentVAT'] = models.VatRate.objects.current_rate() context['currentVAT'] = models.VatRate.objects.current_rate()
form = context['form'] form = context['form']
if re.search('"-\d+"', form['items_json'].value()): if re.search(r'"-\d+"', form['items_json'].value()):
messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.") messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
# Get some other objects to include in the form. Used when there are errors but also nice and quick. # Get some other objects to include in the form. Used when there are errors but also nice and quick.
@@ -218,7 +218,7 @@ class EventPrint(generic.View):
response = HttpResponse(content_type='application/pdf') response = HttpResponse(content_type='application/pdf')
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name) escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName) response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
response.write(merged.getvalue()) response.write(merged.getvalue())

2
RIGS/signals.py
View File

@@ -69,7 +69,7 @@ def send_eventauthorisation_success_email(instance):
external_styles=css).transform() external_styles=css).transform()
client_email.attach_alternative(html, 'text/html') client_email.attach_alternative(html, 'text/html')
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name) escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', instance.event.name)
client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName), client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
merged.getvalue(), merged.getvalue(),

2
RIGS/test_functional.py
View File

@@ -122,7 +122,7 @@ class UserRegistrationTest(LiveServerTestCase):
email = mail.outbox[0] email = mail.outbox[0]
self.assertIn('John Smith "JS" activation required', email.subject) self.assertIn('John Smith "JS" activation required', email.subject)
urls = re.findall( urls = re.findall(
'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body) r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body)
self.assertEqual(len(urls), 1) self.assertEqual(len(urls), 1)
mail.outbox = [] # empty this for later mail.outbox = [] # empty this for later