Skip to content

Commit 2cb875a

Browse files
committed
fix remaining flake8 errors
1 parent 9d5a1ce commit 2cb875a

File tree

13 files changed

+28
-55
lines changed

13 files changed

+28
-55
lines changed

ajax_datatable/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
from __future__ import unicode_literals
22
__version__ = '4.3.1'
33

4-
from .columns import (
4+
from .columns import ( # noqa
55
Column,
66
ForeignColumn,
77
ColumnLink,
88
PlaceholderColumnLink,
99
Order,
1010
)
1111

12-
from .exceptions import (
12+
from .exceptions import ( # noqa
1313
ColumnOrderError,
1414
)
1515

16-
from .views import (
16+
from .views import ( # noqa
1717
AjaxDatatableView
1818
)

ajax_datatable/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import json
77
from django.views.generic import View
88
from django.http.response import HttpResponse, HttpResponseBadRequest
9+
from django.core.exceptions import FieldDoesNotExist
910
from django.core.paginator import Paginator
1011
from django.core.serializers.json import DjangoJSONEncoder
1112
from django.db import models
@@ -143,7 +144,7 @@ def initialize(self, request):
143144
else:
144145
try:
145146
title = self.model._meta.get_field(name).verbose_name.title()
146-
except AttributeError:
147+
except (AttributeError, FieldDoesNotExist):
147148
title = name
148149

149150
column['name'] = name

example/backend/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from django.contrib import admin
22
from django.utils.safestring import mark_safe
3-
from django.utils.translation import ugettext_lazy as _
43
from django.utils import timezone
54
from .models import Tag
65
from .models import Artist

example/backend/management/commands/fix_albums_release_date.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
from django.db import transaction
99
from django.db import connections
1010
from django.db import DEFAULT_DB_ALIAS
11-
from django.contrib import auth
12-
from django.contrib.auth import get_user_model
1311
from django.core.management.base import BaseCommand
14-
from backend.models import Artist
1512
from backend.models import Album
16-
from backend.models import Track
1713

1814
MONTH_NAMES = [calendar.month_name[i] for i in range(1, 12+1)]
1915

@@ -52,7 +48,7 @@ def fix_release_dates(self):
5248
albums = Album.objects.filter(year=None).exclude(url='')
5349
print(albums)
5450

55-
network = pylast.LastFMNetwork(
51+
pylast.LastFMNetwork(
5652
api_key=settings.LASTFM_API_KEY,
5753
api_secret=settings.LASTFM_API_SECRET,
5854
username=settings.LASTFM_USERNAME,
@@ -110,7 +106,7 @@ def scrape_release_date(url):
110106
day = int(tokens[-3])
111107
release_date = datetime.date(year, month, day)
112108
# print(release_date)
113-
except Exception as e:
109+
except Exception:
114110
release_date = None
115111

116112
return release_date

example/backend/management/commands/load_from_lastfm.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
from django.db import transaction
44
from django.db import connections
55
from django.db import DEFAULT_DB_ALIAS
6-
from django.contrib import auth
7-
from django.contrib.auth import get_user_model
86
from django.core.management.base import BaseCommand
97
from backend.models import Artist
108
from backend.models import Album
@@ -98,7 +96,7 @@ def load_artist(self, artist, obj_artist):
9896
try:
9997
title = obj_track.get_title()
10098
print(' %s' % title)
101-
track = Track.objects.create(
99+
Track.objects.create(
102100
album=album,
103101
name=title,
104102
)

example/backend/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import uuid
2-
import os
32
from django.db import models
43
from django.urls import reverse
54
from django.utils import timezone
@@ -107,7 +106,9 @@ def clone(self, request=None):
107106

108107
obj = Track.objects.get(id=self.id)
109108
obj.pk = uuid.uuid4()
110-
obj.description = increment_revision(self.description)
109+
# TODO: this seems abandoned, Track has no field description and there is
110+
# no function increment_revision
111+
# obj.description = increment_revision(self.description)
111112
obj.save()
112113
return obj
113114

example/frontend/ajax_datatable_views.py

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
1-
import json
2-
import datetime
3-
import sys
4-
import inspect
5-
#import dateutil.parser
61
from django.contrib.auth import get_user_model
7-
from django.urls import reverse
8-
from django.shortcuts import render
9-
from django.contrib.auth.decorators import login_required
102
from ajax_datatable.views import AjaxDatatableView
11-
from ajax_datatable.utils import trace
12-
from django.utils.decorators import method_decorator
13-
from django.http import JsonResponse
14-
from django.views.decorators.csrf import csrf_exempt
15-
from django.contrib.auth import get_user_model
163
from django.utils.translation import ugettext_lazy as _
17-
from django.template import TemplateDoesNotExist
18-
from django.template.loader import render_to_string
19-
from django.db.models import Count, Min, Sum, Avg
20-
from django.utils.safestring import mark_safe
21-
from django.template import loader, Context
22-
from django.contrib.contenttypes.models import ContentType
23-
from django.contrib.humanize.templatetags.humanize import intcomma
24-
from django.template.defaultfilters import truncatechars
254
from django.contrib.auth.models import Permission
26-
from django.db.models import Q
275

286
from project.query_debugger import query_debugger
297
from backend.models import Track
@@ -119,7 +97,7 @@ class TrackAjaxDatatableView(AjaxDatatableView):
11997
{'name': 'album', 'foreign_field': 'album__name', 'visible': True, 'lookup_field': '__istartswith', },
12098
{'name': 'artist', 'title': 'Artist', 'foreign_field': 'album__artist__name',
12199
'visible': True, 'choices': True, 'autofilter': True, },
122-
#{'name': 'tags', 'visible': True, 'searchable': False, },
100+
# {'name': 'tags', 'visible': True, 'searchable': False, },
123101
{'name': 'tags', 'm2m_foreign_field': 'tags__name', 'searchable': True, 'choices': True, 'autofilter': True, },
124102
]
125103

@@ -162,7 +140,7 @@ def get_initial_queryset(self, request=None):
162140
def get_numeric_param(key):
163141
try:
164142
value = int(request.POST.get(key))
165-
except:
143+
except (ValueError, AttributeError):
166144
value = None
167145
return value
168146

example/frontend/urls.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
path('tracks/', views.tracks_list_view, name="tracks-list"),
1717
path('ajax_datatable/tracks/', ajax_datatable_views.TrackAjaxDatatableView.as_view(), name="ajax_datatable_track"),
1818
path('ajax_datatable/album/', ajax_datatable_views.AlbumAjaxDatatableView.as_view(), name="ajax_datatable_album"),
19-
path('ajax_datatable/artist/', ajax_datatable_views.ArtistAjaxDatatableView.as_view(), name="ajax_datatable_artist"),
19+
path('ajax_datatable/artist/',
20+
ajax_datatable_views.ArtistAjaxDatatableView.as_view(), name="ajax_datatable_artist"),
2021

2122
path('ajax_datatable/permissions/', ajax_datatable_views.PermissionAjaxDatatableView.as_view(),
2223
name="ajax_datatable_permissions"),
2324
path('minimal/', TemplateView.as_view(template_name='frontend/minimal.html'), name="minimal"),
2425

2526
path('custompks/', TemplateView.as_view(template_name='frontend/custompk/list.html'), name="custompks-list"),
26-
path('ajax_datatable/custompks/', ajax_datatable_views.CustomPkAjaxDatatableView.as_view(), name="ajax_datatable_custompk"),
27+
path('ajax_datatable/custompks/',
28+
ajax_datatable_views.CustomPkAjaxDatatableView.as_view(), name="ajax_datatable_custompk"),
2729

2830
path('side_filters/', TemplateView.as_view(template_name='frontend/side_filters.html'), name="side_filters"),
2931
]

example/frontend/views.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from django.shortcuts import render
2-
from django.contrib.auth.decorators import login_required
32
from django.contrib.auth import get_user_model
43
from project.query_debugger import query_debugger
5-
from backend.models import Track
4+
# from backend.models import Track
65

76

87
User = get_user_model()
@@ -14,7 +13,7 @@ def tracks_list_view(request):
1413
Render the page which contains the table.
1514
That will in turn invoke (via Ajax) object_datatable_view(), to fill the table content
1615
"""
17-
model = Track
16+
# model = Track
1817
template_name = "frontend/track/list.html"
1918

2019
return render(request, template_name, {

example/project/settings.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
2020

2121
# try:
22-
# main.__build__ = subprocess.check_output(["git", "describe", "--tags", "--always"], cwd=BASE_DIR).decode('utf-8').strip()
22+
# main.__build__ = subprocess.check_output(
23+
# ["git", "describe", "--tags", "--always"], cwd=BASE_DIR).decode('utf-8').strip()
2324
# except:
2425
# main.__build__ = main.__version__ + " ?"
2526
try:
2627
project.__build__ = subprocess.check_output(
2728
["git", "describe", "--tags", "--always"], cwd=BASE_DIR).decode('utf-8').strip()
28-
except:
29+
except Exception:
2930
project.__build__ = ""
3031

3132
print('build: %s' % project.__build__, file=sys.stderr)
@@ -39,7 +40,7 @@
3940
# SECURITY WARNING: don't run with debug turned on in production!
4041
DEBUG = True
4142

42-
#ALLOWED_HOSTS = []
43+
# ALLOWED_HOSTS = []
4344
ALLOWED_HOSTS = ['*', ]
4445

4546

@@ -176,7 +177,7 @@
176177

177178
# Load local settings when supplied
178179
try:
179-
from project.local import *
180+
from project.local import * # noqa
180181
print('Local settings loaded !', file=sys.stderr)
181-
except ModuleNotFoundError as e:
182+
except ModuleNotFoundError:
182183
pass

0 commit comments

Comments
 (0)