mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 06:17:17 +00:00
[ISSUE-3/4] Adds test container and tooling (#8)
* Adding black, isort, and flake8 to pytest * Applying black, flake8, and isort to codebase
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from comic.models import Setting, ComicBook, ComicPage, ComicStatus, Directory
|
||||
from comic.models import ComicBook, ComicPage, ComicStatus, Directory, Setting
|
||||
|
||||
|
||||
@admin.register(Setting)
|
||||
|
||||
@@ -3,7 +3,7 @@ from os.path import isdir
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from comic.models import Setting, Directory, ComicBook
|
||||
from comic.models import ComicBook, Directory, Setting
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import datetime
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
from django.utils.timezone import utc
|
||||
import uuid
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
from django.utils.timezone import utc
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
# Generated by Django 1.9.2 on 2016-03-31 10:40
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
import uuid
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def gen_uuid(apps, schema_editor):
|
||||
comicbook = apps.get_model("comic", "comicbook")
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
# Generated by Django 1.9.2 on 2016-03-31 10:40
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
import uuid
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
# Generated by Django 1.9.2 on 2016-04-01 08:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import uuid
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ def gen_feeds(apps, schema_editor):
|
||||
user_misc = apps.get_model("comic", "UserMisc")
|
||||
User = apps.get_model("auth", "user")
|
||||
for user in User.objects.all():
|
||||
um = user_misc.objects.create(user=user)
|
||||
user_misc.objects.create(user=user)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import uuid
|
||||
import zipfile
|
||||
from os import path, listdir
|
||||
from os import listdir, path
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
@@ -83,12 +83,15 @@ __all__ = ["is_rarfile", "RarInfo", "RarFile", "RarExtFile"]
|
||||
## Imports and compat - support both Python 2.x and 3.x
|
||||
##
|
||||
|
||||
import sys, os, struct, errno
|
||||
from struct import pack, unpack
|
||||
import errno
|
||||
import os
|
||||
import struct
|
||||
import sys
|
||||
from binascii import crc32
|
||||
from tempfile import mkstemp
|
||||
from subprocess import Popen, PIPE, STDOUT
|
||||
from datetime import datetime
|
||||
from struct import pack, unpack
|
||||
from subprocess import PIPE, STDOUT, Popen
|
||||
from tempfile import mkstemp
|
||||
|
||||
# only needed for encryped headers
|
||||
try:
|
||||
|
||||
@@ -3,10 +3,10 @@ import os
|
||||
from os import path
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.test import TestCase, Client
|
||||
from django.test import Client, TestCase
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
|
||||
from comic.models import ComicBook, ComicPage, Setting, ComicStatus, Directory
|
||||
from comic.models import ComicBook, ComicPage, ComicStatus, Directory, Setting
|
||||
from comic.util import generate_directory
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
from django.conf.urls import url
|
||||
|
||||
from . import feeds
|
||||
from . import views
|
||||
from . import feeds, views
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^$", views.comic_list, name="index"),
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
from collections import OrderedDict
|
||||
from os import path, listdir
|
||||
from os import listdir, path
|
||||
|
||||
from django.db.transaction import atomic
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
|
||||
from .models import ComicBook, Setting, ComicStatus, Directory
|
||||
from .models import ComicBook, ComicStatus, Directory, Setting
|
||||
|
||||
|
||||
def generate_title_from_path(file_path):
|
||||
|
||||
@@ -5,26 +5,26 @@ except ImportError:
|
||||
import uuid
|
||||
from os import path
|
||||
|
||||
from django.contrib.auth import login, authenticate
|
||||
from django.contrib.auth import authenticate, login
|
||||
from django.contrib.auth.decorators import login_required, user_passes_test
|
||||
from django.contrib.auth.models import User
|
||||
from django.db.models import Max
|
||||
from django.db.transaction import atomic
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
|
||||
from django.views.decorators.csrf import ensure_csrf_cookie
|
||||
from django.views.decorators.http import require_POST
|
||||
|
||||
from .forms import SettingsForm, AccountForm, EditUserForm, AddUserForm, InitialSetupForm
|
||||
from .models import Setting, ComicBook, ComicStatus, Directory, ComicPage, UserMisc
|
||||
from .forms import AccountForm, AddUserForm, EditUserForm, InitialSetupForm, SettingsForm
|
||||
from .models import ComicBook, ComicPage, ComicStatus, Directory, Setting, UserMisc
|
||||
from .util import (
|
||||
generate_breadcrumbs_from_path,
|
||||
generate_breadcrumbs_from_menu,
|
||||
generate_title_from_path,
|
||||
Menu,
|
||||
generate_breadcrumbs_from_menu,
|
||||
generate_breadcrumbs_from_path,
|
||||
generate_directory,
|
||||
generate_label,
|
||||
generate_title_from_path,
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user