diff --git a/rental/admin.py b/rental/admin.py index 90e09d6..aa8b113 100644 --- a/rental/admin.py +++ b/rental/admin.py @@ -7,7 +7,6 @@ from rental.models.picture import Picture from rental.models.place import Place from rental.models.testimonial import Testimonial - admin.site.register(Booking) admin.site.register(Guest) admin.site.register(Place) diff --git a/rental/forms/booking.py b/rental/forms/booking.py index 6888892..f20f656 100644 --- a/rental/forms/booking.py +++ b/rental/forms/booking.py @@ -1,8 +1,8 @@ from django import forms +from rental.enums import PlaceNames from rental.models.booking import Booking from rental.models.place import Place -from rental.enums import PlaceNames class BookingForm(forms.Form): diff --git a/rental/forms/contact.py b/rental/forms/contact.py index 0f77957..7488bce 100644 --- a/rental/forms/contact.py +++ b/rental/forms/contact.py @@ -1,4 +1,5 @@ from django import forms + from rental.models.contact import Contact from rental.models.place import Place diff --git a/rental/migrations/0001_initial.py b/rental/migrations/0001_initial.py index 22c35d5..0d0289d 100644 --- a/rental/migrations/0001_initial.py +++ b/rental/migrations/0001_initial.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-06 11:50 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0006_auto_20191107_2114.py b/rental/migrations/0006_auto_20191107_2114.py index 232fe5a..50bad0e 100644 --- a/rental/migrations/0006_auto_20191107_2114.py +++ b/rental/migrations/0006_auto_20191107_2114.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-07 21:14 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0007_auto_20191107_2116.py b/rental/migrations/0007_auto_20191107_2116.py index ba63ee8..48727f6 100644 --- a/rental/migrations/0007_auto_20191107_2116.py +++ b/rental/migrations/0007_auto_20191107_2116.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-07 21:16 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0012_auto_20191110_1814.py b/rental/migrations/0012_auto_20191110_1814.py index 76d1dd6..89002c2 100644 --- a/rental/migrations/0012_auto_20191110_1814.py +++ b/rental/migrations/0012_auto_20191110_1814.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-10 18:14 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0013_auto_20191110_1817.py b/rental/migrations/0013_auto_20191110_1817.py index dba67c7..801274b 100644 --- a/rental/migrations/0013_auto_20191110_1817.py +++ b/rental/migrations/0013_auto_20191110_1817.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-10 18:17 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0017_auto_20191111_0855.py b/rental/migrations/0017_auto_20191111_0855.py index 68dd637..b0b6513 100644 --- a/rental/migrations/0017_auto_20191111_0855.py +++ b/rental/migrations/0017_auto_20191111_0855.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-11 08:55 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0019_auto_20191111_1020.py b/rental/migrations/0019_auto_20191111_1020.py index e25e875..fbdaad2 100644 --- a/rental/migrations/0019_auto_20191111_1020.py +++ b/rental/migrations/0019_auto_20191111_1020.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-11 10:20 -from django.db import migrations, models import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0021_auto_20191111_1112.py b/rental/migrations/0021_auto_20191111_1112.py index 1751701..6f41e1e 100644 --- a/rental/migrations/0021_auto_20191111_1112.py +++ b/rental/migrations/0021_auto_20191111_1112.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-11 11:12 -from django.db import migrations, models import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/migrations/0022_auto_20191111_1211.py b/rental/migrations/0022_auto_20191111_1211.py index c799305..237d951 100644 --- a/rental/migrations/0022_auto_20191111_1211.py +++ b/rental/migrations/0022_auto_20191111_1211.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.6 on 2019-11-11 12:11 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/rental/models/booking.py b/rental/models/booking.py index 1c2c0c3..6ffa2f9 100644 --- a/rental/models/booking.py +++ b/rental/models/booking.py @@ -1,10 +1,11 @@ from datetime import datetime + from django.db import models -from rental.models.guest import Guest -from rental.models.place import Place import rental.services.calendar as calendar import rental.tasks.apiMailer as mailer # or gMailer +from rental.models.guest import Guest +from rental.models.place import Place class BookingManager(models.Manager): diff --git a/rental/models/place.py b/rental/models/place.py index 75eb4c8..c633513 100644 --- a/rental/models/place.py +++ b/rental/models/place.py @@ -1,7 +1,7 @@ from django.db import models -from rental.models.picture import Picture import rental.services.calendar as calendar +from rental.models.picture import Picture class Place(models.Model): diff --git a/rental/services/calendar.py b/rental/services/calendar.py index a6c56e9..f97633d 100644 --- a/rental/services/calendar.py +++ b/rental/services/calendar.py @@ -1,17 +1,17 @@ import datetime -import os import logging +import os import pickle -from google.auth.transport.requests import Request -from google_auth_oauthlib.flow import InstalledAppFlow, Flow -from googleapiclient.discovery import build from django.shortcuts import get_object_or_404 +from google.auth.transport.requests import Request +from google_auth_oauthlib.flow import Flow, InstalledAppFlow +from googleapiclient.discovery import build -from villafleurie.settings import BASE_DIR -from rental.models.guest import Guest -import rental.models.place as m_place import rental.models.booking as m_booking +import rental.models.place as m_place +from rental.models.guest import Guest +from villafleurie.settings import BASE_DIR def build_service(): diff --git a/rental/tasks/apiMailer.py b/rental/tasks/apiMailer.py index 53be4e0..088c150 100644 --- a/rental/tasks/apiMailer.py +++ b/rental/tasks/apiMailer.py @@ -1,10 +1,11 @@ from __future__ import absolute_import, unicode_literals + from datetime import datetime -from celery import shared_task import requests +from celery import shared_task -from villafleurie.settings import EMAIL_HOST_USER, DEFAULT_FROM_EMAIL +from villafleurie.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST_USER """ Mailer Service used to send messages using API WebHooks. All Mailers must implement the following methods: diff --git a/rental/tasks/gMailer.py b/rental/tasks/gMailer.py index 411f594..146c816 100644 --- a/rental/tasks/gMailer.py +++ b/rental/tasks/gMailer.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from celery import shared_task -from django.core.mail import send_mail, mail_admins +from django.core.mail import mail_admins, send_mail from villafleurie.settings import EMAIL_HOST_USER diff --git a/rental/tests/booking.py b/rental/tests/booking.py index c36d5d7..6179cd7 100644 --- a/rental/tests/booking.py +++ b/rental/tests/booking.py @@ -3,9 +3,9 @@ from datetime import datetime from django.shortcuts import get_object_or_404 from django.test import TestCase -from rental.models.place import Place from rental.models.booking import Booking from rental.models.guest import Guest +from rental.models.place import Place class BookingTestCase(TestCase): diff --git a/rental/urls.py b/rental/urls.py index de07096..d934c12 100644 --- a/rental/urls.py +++ b/rental/urls.py @@ -1,9 +1,8 @@ from django.contrib.staticfiles.urls import static, staticfiles_urlpatterns from django.urls import path +from rental.views import booking, contact, home, place from villafleurie import settings -from rental.views import home, booking, contact, place - app_name = 'rental' diff --git a/rental/views/booking.py b/rental/views/booking.py index d3359d6..290249e 100644 --- a/rental/views/booking.py +++ b/rental/views/booking.py @@ -1,6 +1,6 @@ from django.core.exceptions import ValidationError from django.db import IntegrityError -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.utils.translation import gettext_lazy as _ from rental.forms.booking import BookingForm diff --git a/rental/views/place.py b/rental/views/place.py index d5b2ad2..4d30050 100644 --- a/rental/views/place.py +++ b/rental/views/place.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.utils.translation import gettext_lazy as _ from rental.models.place import Place diff --git a/villafleurie/__init__.py b/villafleurie/__init__.py index d51fd28..e331a74 100644 --- a/villafleurie/__init__.py +++ b/villafleurie/__init__.py @@ -1,4 +1,5 @@ from __future__ import absolute_import, unicode_literals + from .celery import app as celery_app __all__ = ('celery_app',) diff --git a/villafleurie/celery.py b/villafleurie/celery.py index ed59e6e..cd96bc3 100644 --- a/villafleurie/celery.py +++ b/villafleurie/celery.py @@ -1,7 +1,8 @@ from __future__ import absolute_import, unicode_literals -import os -from celery import Celery +import os + +from celery import Celery os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'villafleurie.settings') app = Celery('villafleurie') diff --git a/villafleurie/settings/production.py b/villafleurie/settings/production.py index 368b573..f610a1c 100644 --- a/villafleurie/settings/production.py +++ b/villafleurie/settings/production.py @@ -1,4 +1,5 @@ import os + from .base import * DEBUG = False diff --git a/villafleurie/urls.py b/villafleurie/urls.py index 87057c4..3fcad01 100644 --- a/villafleurie/urls.py +++ b/villafleurie/urls.py @@ -1,8 +1,7 @@ -from django.contrib import admin -from django.urls import path from django.conf import settings from django.conf.urls import include, url - +from django.contrib import admin +from django.urls import path urlpatterns = [ path('admin/', admin.site.urls),