[django2] Many corrections. Consider evaluating this pull request!

.gitignore

@@ -3,6 +3,8 @@
 # C extensions
 *.so
 
+htmlcov
+
 # Packages
 *.egg
 *.egg-info
@@ -17,6 +19,8 @@ develop-eggs
 .installed.cfg
 lib
 lib64
+venv
+venv3
 
 # Installer logs
 pip-log.txt

demo_app/.gitignore

@@ -0,0 +1,2 @@
+db.sqlite3
+db3.sqlite3

demo_app/app/adminx.py

@@ -8,7 +8,7 @@
 
 
 @xadmin.sites.register(views.website.IndexView)
-class MainDashboard(object):
+class MainDashboard:
     widgets = [
         [
             {"type": "html", "title": "Test Widget",
@@ -26,28 +26,28 @@ class MainDashboard(object):
 
 
 @xadmin.sites.register(views.BaseAdminView)
-class BaseSetting(object):
+class BaseSetting:
     enable_themes = True
     use_bootswatch = True
 
 
 @xadmin.sites.register(views.CommAdminView)
-class GlobalSetting(object):
+class GlobalSetting:
     global_search_models = [Host, IDC]
     global_models_icon = {
         Host: "fa fa-laptop", IDC: "fa fa-cloud"
     }
     menu_style = 'default'  # 'accordion'
 
 
-class MaintainInline(object):
+class MaintainInline:
     model = MaintainLog
     extra = 1
     style = "accordion"
 
 
 @xadmin.sites.register(IDC)
-class IDCAdmin(object):
+class IDCAdmin:
     list_display = ("name", "description", "create_time", "contact", "telphone", "address", "customer_id")
     list_display_links = ("name",)
     wizard_form_list = [
@@ -70,7 +70,7 @@ class IDCAdmin(object):
 
 
 @xadmin.sites.register(Host)
-class HostAdmin(object):
+class HostAdmin:
 
     def open_web(self, instance):
         return """<a href="http://%s" target="_blank">Open</a>""" % instance.ip
@@ -150,7 +150,7 @@ def open_web(self, instance):
     reversion_enable = True
 
     data_charts = {
-        "host_service_type_counts": {'title': u"Host service type count", "x-field": "service_type",
+        "host_service_type_counts": {'title': "Host service type count", "x-field": "service_type",
                                      "y-field": ("service_type",),
                                      "option": {
                                          "series": {"bars": {"align": "center", "barWidth": 0.8, 'show': True}},
@@ -161,7 +161,7 @@ def open_web(self, instance):
 
 
 @xadmin.sites.register(HostGroup)
-class HostGroupAdmin(object):
+class HostGroupAdmin:
     list_display = ("name", "description")
     list_display_links = ("name",)
 
@@ -171,7 +171,7 @@ class HostGroupAdmin(object):
 
 
 @xadmin.sites.register(MaintainLog)
-class MaintainLogAdmin(object):
+class MaintainLogAdmin:
     list_display = (
         "host", "maintain_type", "hard_type", "time", "operator", "note")
     list_display_links = ("host",)
@@ -201,7 +201,7 @@ class MaintainLogAdmin(object):
 
 
 @xadmin.sites.register(AccessRecord)
-class AccessRecordAdmin(object):
+class AccessRecordAdmin:
 
     def avg_count(self, instance):
         return int(instance.view_count / instance.user_count)
@@ -219,10 +219,10 @@ def avg_count(self, instance):
 
     refresh_times = (3, 5, 10)
     data_charts = {
-        "user_count": {'title': u"User Report", "x-field": "date", "y-field": ("user_count", "view_count"),
+        "user_count": {'title': "User Report", "x-field": "date", "y-field": ("user_count", "view_count"),
                        "order": ('date',)},
-        "avg_count": {'title': u"Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)},
-        "per_month": {'title': u"Monthly Users", "x-field": "_chart_month", "y-field": ("user_count",),
+        "avg_count": {'title': "Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)},
+        "per_month": {'title': "Monthly Users", "x-field": "_chart_month", "y-field": ("user_count",),
                       "option": {
                           "series": {"bars": {"align": "center", "barWidth": 0.8, 'show': True}},
                           "xaxis": {"aggregate": "sum", "mode": "categories"},

demo_app/app/migrations/0004_auto_20190813_0916.py

@@ -0,0 +1,36 @@
+# Generated by Django 2.2.4 on 2019-08-13 12:16
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('app', '0003_host_administrator'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='host',
+            name='administrator',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL,
+                                    verbose_name='Admin'),
+        ),
+        migrations.AlterField(
+            model_name='host',
+            name='core_num',
+            field=models.SmallIntegerField(
+                choices=[(2, '2 Cores'), (4, '4 Cores'), (6, '6 Cores'), (8, '8 Cores'), (10, '10 Cores'),
+                         (12, '12 Cores'), (14, '14 Cores'), (16, '16 Cores'), (18, '18 Cores'), (20, '20 Cores'),
+                         (22, '22 Cores'), (24, '24 Cores'), (26, '26 Cores'), (28, '28 Cores')]),
+        ),
+        migrations.AlterField(
+            model_name='host',
+            name='service_type',
+            field=models.CharField(
+                choices=[('moniter', 'Moniter'), ('lvs', 'LVS'), ('db', 'Database'), ('analysis', 'Analysis'),
+                         ('admin', 'Admin'), ('storge', 'Storge'), ('web', 'WEB'), ('email', 'Email'), ('mix', 'Mix')],
+                max_length=32),
+        ),
+    ]

demo_app/app/migrations/0005_idc_is_valid.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-09-05 13:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0004_auto_20190813_0916'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='idc',
+            name='is_valid',
+            field=models.BooleanField(default=False),
+        ),
+    ]

demo_app/app/migrations/0006_remove_idc_is_valid.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.16 on 2020-10-27 14:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0005_idc_is_valid'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='idc',
+            name='is_valid',
+        ),
+    ]

demo_app/app/models.py

@@ -6,21 +6,21 @@
 AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 SERVER_STATUS = (
-    (0, u"Normal"),
-    (1, u"Down"),
-    (2, u"No Connect"),
-    (3, u"Error"),
+    (0, "Normal"),
+    (1, "Down"),
+    (2, "No Connect"),
+    (3, "Error"),
 )
 SERVICE_TYPES = (
-    ('moniter', u"Moniter"),
-    ('lvs', u"LVS"),
-    ('db', u"Database"),
-    ('analysis', u"Analysis"),
-    ('admin', u"Admin"),
-    ('storge', u"Storge"),
-    ('web', u"WEB"),
-    ('email', u"Email"),
-    ('mix', u"Mix"),
+    ('moniter', "Moniter"),
+    ('lvs', "LVS"),
+    ('db', "Database"),
+    ('analysis', "Analysis"),
+    ('admin', "Admin"),
+    ('storge', "Storge"),
+    ('web', "WEB"),
+    ('email', "Email"),
+    ('mix', "Mix"),
 )
 
 
@@ -41,32 +41,32 @@ def __str__(self):
         return self.name
 
     class Meta:
-        verbose_name = u"IDC"
+        verbose_name = "IDC"
         verbose_name_plural = verbose_name
 
 
 @python_2_unicode_compatible
 class Host(models.Model):
     idc = models.ForeignKey(IDC, on_delete=models.CASCADE)
     name = models.CharField(max_length=64)
-    nagios_name = models.CharField(u"Nagios Host ID", max_length=64, blank=True, null=True)
+    nagios_name = models.CharField("Nagios Host ID", max_length=64, blank=True, null=True)
     ip = models.GenericIPAddressField(blank=True, null=True)
     internal_ip = models.GenericIPAddressField(blank=True, null=True)
     user = models.CharField(max_length=64)
     password = models.CharField(max_length=128)
     ssh_port = models.IntegerField(blank=True, null=True)
     status = models.SmallIntegerField(choices=SERVER_STATUS)
 
-    brand = models.CharField(max_length=64, choices=[(i, i) for i in (u"DELL", u"HP", u"Other")])
+    brand = models.CharField(max_length=64, choices=[(i, i) for i in ("DELL", "HP", "Other")])
     model = models.CharField(max_length=64)
     cpu = models.CharField(max_length=64)
     core_num = models.SmallIntegerField(choices=[(i * 2, "%s Cores" % (i * 2)) for i in range(1, 15)])
     hard_disk = models.IntegerField()
     memory = models.IntegerField()
 
-    system = models.CharField(u"System OS", max_length=32, choices=[(i, i) for i in (u"CentOS", u"FreeBSD", u"Ubuntu")])
+    system = models.CharField("System OS", max_length=32, choices=[(i, i) for i in ("CentOS", "FreeBSD", "Ubuntu")])
     system_version = models.CharField(max_length=32)
-    system_arch = models.CharField(max_length=32, choices=[(i, i) for i in (u"x86_64", u"i386")])
+    system_arch = models.CharField(max_length=32, choices=[(i, i) for i in ("x86_64", "i386")])
 
     create_time = models.DateField()
     guarantee_date = models.DateField()
@@ -79,7 +79,7 @@ def __str__(self):
         return self.name
 
     class Meta:
-        verbose_name = u"Host"
+        verbose_name = "Host"
         verbose_name_plural = verbose_name
 
 
@@ -97,7 +97,7 @@ def __str__(self):
                                                self.maintain_type, self.hard_type)
 
     class Meta:
-        verbose_name = u"Maintain Log"
+        verbose_name = "Maintain Log"
         verbose_name_plural = verbose_name
 
 
@@ -110,7 +110,7 @@ class HostGroup(models.Model):
         Host, verbose_name=u'Hosts', blank=True, related_name='groups')
 
     class Meta:
-        verbose_name = u"Host Group"
+        verbose_name = "Host Group"
         verbose_name_plural = verbose_name
 
     def __str__(self):
@@ -124,7 +124,7 @@ class AccessRecord(models.Model):
     view_count = models.IntegerField()
 
     class Meta:
-        verbose_name = u"Access Record"
+        verbose_name = "Access Record"
         verbose_name_plural = verbose_name
 
     def __str__(self):

demo_app/demo/settings.py

@@ -27,10 +27,14 @@
 LANGUAGES = (
     ('en', _('English')),
     ('zh-hans', _('Chinese')),
+    ('pt-br', _('Portuguese')),
 )
 
 ALLOWED_HOSTS = []
+# SITE_ID = 1
 
+# extra optional plugin
+# XADMIN_INCLUDE_PLUGINS = ('comments',)
 
 # Application definition
 
@@ -41,7 +45,8 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-
+    # 'django.contrib.sites',
+    # 'django_comments',
     'xadmin',
     'crispy_forms',
     'reversion',
@@ -57,6 +62,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.locale.LocaleMiddleware'
 ]
 
 ROOT_URLCONF = 'demo.urls'
@@ -68,6 +74,10 @@
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
@@ -79,7 +89,6 @@
 
 WSGI_APPLICATION = 'demo.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
 
@@ -113,7 +122,7 @@
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'en'
 
 TIME_ZONE = 'UTC'
 

setup.py

@@ -20,10 +20,10 @@
         'setuptools',
         'django>=2',
         'django-crispy-forms>=1.6.0',
+        'django-import-export>=0.5.1',
         'django-reversion>=2.0.0',
         'django-formtools>=1.0',
-        'django-import-export>=0.5.1',
-        'httplib2==0.9.2',
+        'httplib2==0.18.1',
         'future',
         'six'
     ],