[BBGO-92] support Django 2.0

Author: genonfire

VERSION

@@ -1 +1 @@
-1.1.215
+1.1.216

accounts/migrations/0001_initial.py

@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
                 ('alarm_full', models.BooleanField(default=True)),
                 ('portrait', models.ImageField(blank=True, upload_to=b'portrait/%Y-%m-%d/', validators=[accounts.models.img_validator])),
                 ('signature', models.TextField(blank=True)),
-                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
     ]

accounts/models.py

@@ -22,7 +22,7 @@ def img_validator(attached):
 class Profile(models.Model):
     """User model extension"""
 
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
     point = models.IntegerField(default=1)
     last_article_at = models.DateTimeField(auto_now_add=True)
     last_reply_at = models.DateTimeField(auto_now_add=True)

accounts/views.py

@@ -15,9 +15,9 @@
 from django.contrib.auth.models import User
 from django.core.mail import send_mail
 from django.core.signing import TimestampSigner
-from django.core.urlresolvers import reverse_lazy
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
 
 from teams.table import TeamTable
@@ -53,7 +53,7 @@ def setting(request):
             msg = _('Form validation Failure')
 
     elif request.method == "GET":
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             msg = ""
             settingform = SettingForm(instance=request.user.profile)
         else:
@@ -118,7 +118,7 @@ def edit_user_info(request):
         else:
             msg = _('Form validation Failure')
     elif request.method == "GET":
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             msg = ""
             infoform = UserInfoForm(instance=profile)
         else:
@@ -188,11 +188,11 @@ def scrap_list(request, page=0):
                 continue
 
     index_total = int(ceil(float(total) / list_count))
-    index_begin = (current_page / 10) * 10 + 1
+    index_begin = int(current_page / 10) * 10 + 1
     index_end = mindex_end = index_total
     if index_end - index_begin >= 10:
         index_end = index_begin + 9
-    mindex_begin = (current_page / 5) * 5 + 1
+    mindex_begin = int(current_page / 5) * 5 + 1
     if mindex_end - mindex_begin >= 5:
         mindex_end = mindex_begin + 4
 
@@ -327,7 +327,7 @@ def show_deactivate_account(request):
 @login_required
 def deactivate_account(request):
     """Deactivate account"""
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         request.user.is_active = False
         if request.user.is_staff:
             request.user.is_staff = False
@@ -380,11 +380,11 @@ def dashboard_user(request, condition='recent', page=1):
         users = User.objects.order_by(order)[start_at:end_at]
 
     index_total = int(ceil(float(total) / list_count))
-    index_begin = (current_page / 10) * 10 + 1
+    index_begin = int(current_page / 10) * 10 + 1
     index_end = mindex_end = index_total
     if index_end - index_begin >= 10:
         index_end = index_begin + 9
-    mindex_begin = (current_page / 5) * 5 + 1
+    mindex_begin = int(current_page / 5) * 5 + 1
     if mindex_end - mindex_begin >= 5:
         mindex_end = mindex_begin + 4
 

aliases/admin.py

@@ -3,6 +3,6 @@
 
 from django.contrib import admin
 
-from models import Alias
+from .models import Alias
 
 admin.site.register(Alias)

aliases/migrations/0001_initial.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('url', models.URLField(max_length=255)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('clicks', models.IntegerField(default=0)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
     ]

aliases/models.py

@@ -8,7 +8,8 @@
 class Alias(models.Model):
     """Alias of aliases"""
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     name = models.CharField(max_length=32)
     url = models.URLField(max_length=255)
     created_at = models.DateTimeField(auto_now_add=True)

bbgo/settings.py

@@ -52,7 +52,7 @@
 )
 THIRD_PARTY_APPS = (
     'rosetta',
-    'jsi18ncache',
+    'statici18n',
 )
 EDITOR_APPS = (
     'django_summernote',
@@ -71,13 +71,12 @@
 )
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + EDITOR_APPS + LOCAL_APPS
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -201,7 +200,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.8/topics/i18n/
+# https://docs.djangoproject.com/en/1.11/topics/i18n/
 
 # LANGUAGE_CODE = 'en-us'
 LANGUAGE_CODE = 'ko-KR'
@@ -219,9 +218,11 @@
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_DIR = os.path.join(BASE_DIR, 'static')
 STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'static'),
+    STATIC_DIR,
 )
+STATICI18N_OUTPUT_DIR = os.path.join(STATIC_DIR, 'jsi18n')
 
 MEDIA_URL = '/upload/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'upload')

bbgo/urls.py

@@ -13,45 +13,35 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
+import django
 from django.conf import settings
 from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.views.i18n import javascript_catalog
-
-from jsi18ncache.views import javascript_catalog_cache
-
-js_info_dict = {
-    'packages': ('',),
-}
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(
-        r'^jsi18n-debug/$',
-        javascript_catalog,
-        js_info_dict,
-    ),
-    url(
-        r'^.*/jsi18n/$',
-        javascript_catalog_cache,
-        js_info_dict,
-    ),
     url(r'^', include('django.contrib.auth.urls')),
     url(r'^', include('portal.urls')),
-    url(r'^accounts/', include('accounts.urls', namespace='accounts')),
-    url(r'^msgs/', include('msgs.urls', namespace='msgs')),
-    url(r'^blogs/', include('blogs.urls', namespace='blogs')),
-    url(r'^boards/', include('boards.urls', namespace='boards')),
-    url(r'^teams/', include('teams.urls', namespace='teams')),
-    url(r'^spams/', include('spams.urls', namespace='spams')),
-    url(r'^api/', include('core.apiurls', namespace='api')),
-    url(r'^vaults/', include('vaults.urls', namespace='vaults')),
-    url(r'^recipes/', include('recipes.urls', namespace='recipes')),
-    url(r'^a/', include('aliases.urls', namespace='aliases')),
+    url(r'^accounts/', include(('accounts.urls', 'accounts'), namespace='accounts')),
+    url(r'^msgs/', include(('msgs.urls', 'msgs'), namespace='msgs')),
+    url(r'^blogs/', include(('blogs.urls', 'blogs'), namespace='blogs')),
+    url(r'^boards/', include(('boards.urls', 'boards'), namespace='boards')),
+    url(r'^teams/', include(('teams.urls', 'teams'), namespace='teams')),
+    url(r'^spams/', include(('spams.urls', 'spams'), namespace='spams')),
+    url(r'^api/', include(('core.apiurls', 'api'), namespace='api')),
+    url(r'^vaults/', include(('vaults.urls', 'vaults'), namespace='vaults')),
+    url(r'^recipes/', include(
+        ('recipes.urls', 'recipes'), namespace='recipes')),
+    url(r'^a/', include(('aliases.urls', 'aliases'), namespace='aliases')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if 'django_summernote' in settings.INSTALLED_APPS:
     urlpatterns.append(url(r'^summernote/', include('django_summernote.urls')))
 if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns.append(url(r'^trans/', include('rosetta.urls')))
+
+if django.VERSION >= (2, 0):
+    from django.urls import path
+    urlpatterns.append(path('admin/', admin.site.urls))
+else:
+    urlpatterns.append(url('admin/', include(admin.site.urls)))

blogs/admin.py

@@ -3,7 +3,7 @@
 
 from django.contrib import admin
 
-from models import Blog, Comment
+from .models import Blog, Comment
 
 admin.site.register(Blog)
 admin.site.register(Comment)