Skip to content

Commit 7bda0ac

Browse files
authored
Feat flake8 strength (mediacms-io#209)
* remove warnings from flake
1 parent 748d4ba commit 7bda0ac

File tree

7 files changed

+12
-16
lines changed

7 files changed

+12
-16
lines changed

cms/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433

434434
try:
435435
# keep a local_settings.py file for local overrides
436-
from .local_settings import *
436+
from .local_settings import * # noqa
437437

438438
# ALLOWED_HOSTS needs a url/ip
439439
ALLOWED_HOSTS.append(FRONTEND_HOST.replace("http://", "").replace("https://", ""))

files/feeds.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from django.conf import settings
22
from django.contrib.postgres.search import SearchQuery
33
from django.contrib.syndication.views import Feed
4-
from django.db.models import Q
54
from django.urls import reverse
65
from django.utils.feedgenerator import Rss201rev2Feed
76

87
from . import helpers
9-
from .models import Category, Media
8+
from .models import Media
109
from .stop_words import STOP_WORDS
1110

1211

files/helpers.py

-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,6 @@ def media_file_info(input_file):
381381
}
382382

383383
if has_audio:
384-
audio_duration = 1
385384
if "duration" in audio_info.keys():
386385
audio_duration = float(audio_info["duration"])
387386
elif "tags" in audio_info.keys() and "DURATION" in audio_info["tags"]:

files/models.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
from mptt.models import MPTTModel, TreeForeignKey
2525

2626
from . import helpers
27-
from .methods import notify_users
2827
from .stop_words import STOP_WORDS
2928

3029
logger = logging.getLogger(__name__)
@@ -1343,6 +1342,8 @@ def media_save(sender, instance, created, **kwargs):
13431342
# SOS: do not put anything here, as if more logic is added,
13441343
# we have to disconnect signal to avoid infinite recursion
13451344
if created:
1345+
from .methods import notify_users
1346+
13461347
instance.media_init()
13471348
notify_users(friendly_token=instance.friendly_token, action="media_added")
13481349

@@ -1507,7 +1508,7 @@ def encoding_file_save(sender, instance, created, **kwargs):
15071508
# to avoid that this is run twice
15081509
if (
15091510
len(orig_chunks)
1510-
== Encoding.objects.filter(
1511+
== Encoding.objects.filter( # noqa
15111512
media=instance.media,
15121513
profile=instance.profile,
15131514
chunks_info=instance.chunks_info,
@@ -1537,7 +1538,7 @@ def encoding_file_save(sender, instance, created, **kwargs):
15371538
chunks_paths = [f.media_file.path for f in chunks]
15381539

15391540
all_logs = "\n".join([st.logs for st in chunks])
1540-
encoding.logs = "{0}\n{1}\n{2}".format(chunks_paths, all_logs)
1541+
encoding.logs = "{0}\n{1}".format(chunks_paths, all_logs)
15411542
workers = list(set([st.worker for st in chunks]))
15421543
encoding.worker = json.dumps({"workers": workers})
15431544
start_date = min([st.add_date for st in chunks])
@@ -1548,15 +1549,14 @@ def encoding_file_save(sender, instance, created, **kwargs):
15481549
who = Encoding.objects.filter(media=encoding.media, profile=encoding.profile).exclude(id=encoding.id)
15491550

15501551
who.delete()
1551-
pass # TODO: merge with above if, do not repeat code
1552+
# TODO: merge with above if, do not repeat code
15521553
else:
15531554
if instance.status in ["fail", "success"]:
15541555
instance.media.post_encode_actions(encoding=instance, action="add")
15551556

15561557
encodings = set([encoding.status for encoding in Encoding.objects.filter(media=instance.media)])
15571558
if ("running" in encodings) or ("pending" in encodings):
15581559
return
1559-
workers = list(set([encoding.worker for encoding in Encoding.objects.filter(media=instance.media)]))
15601560

15611561

15621562
@receiver(post_delete, sender=Encoding)

files/views.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def get(self, request, format=None):
795795
media = media.filter(user__username=author)
796796

797797
if upload_date:
798-
gte = lte = None
798+
gte = None
799799
if upload_date == 'today':
800800
gte = datetime.now().date()
801801
if upload_date == 'this_week':
@@ -807,8 +807,6 @@ def get(self, request, format=None):
807807
if upload_date == 'this_year':
808808
year = datetime.now().date().year
809809
gte = datetime(year, 1, 1)
810-
if lte:
811-
media = media.filter(add_date__lte=lte)
812810
if gte:
813811
media = media.filter(add_date__gte=gte)
814812

@@ -1046,8 +1044,8 @@ def post(self, request, encoding_id):
10461044
chunk=chunk,
10471045
chunk_file_path=chunk_file_path,
10481046
).count()
1049-
> 1
1050-
and force is False
1047+
> 1 # noqa
1048+
and force is False # noqa
10511049
):
10521050
Encoding.objects.filter(id=encoding_id).delete()
10531051
return Response({"status": "fail"}, status=status.HTTP_400_BAD_REQUEST)

setup.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[flake8]
22
exclude = .git,*migrations*
33
max-line-length = 119
4-
ignore=F401,F403,E501,W503
4+
#ignore=F401,F403,E501,W503
5+
ignore=E501

users/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ def contact_user(request, username):
149149
)
150150
user = User.objects.filter(username=username).first()
151151
if user and (user.allow_contact or is_mediacms_editor(request.user)):
152-
subject = request.data.get("subject")
153152
from_email = request.user.email
154153
subject = f"[{settings.PORTAL_NAME}] - Message from {from_email}"
155154
body = request.data.get("body")

0 commit comments

Comments
 (0)