[WIP] Python3 support - Django

.gitignore

@@ -1,3 +1,9 @@
 *.swp
 *.~
 *.py[co]
+__pycache__/
+.idea/
+nohup.out
+.gcloudignore
+cloud_sql_proxy
+.vscode/

app.yaml

@@ -1,15 +1,5 @@
-application: sympy-live-hrd
-version: 58
-
-runtime: python27
-threadsafe: true
-api_version: 1
-
-libraries:
-- name: numpy
-  version: latest
-- name: matplotlib
-  version: latest
+runtime: python37
+entrypoint: gunicorn -b :8080 sympy_live_django.wsgi
 
 handlers:
 # redirect Sphinx extension
@@ -52,5 +42,6 @@ handlers:
 # endpoint where you want the shell to run, e.g. /shell . You'll also probably
 # want to add login: admin to restrict to admins only.
 - url: .*
-  script: shell.application
+#  script: shell.application
+  script: auto
   secure: always

index.yaml

@@ -0,0 +1,23 @@
+indexes:
+
+# AUTOGENERATED
+
+# This index.yaml is automatically updated whenever the dev_appserver
+# detects that a new type of query is run.  If you want to manage the
+# index.yaml file manually, remove the above marker line (the line
+# saying "# AUTOGENERATED").  If you want to manage some indexes
+# manually, move them above the marker line.  The index.yaml file is
+# automatically uploaded to the admin console when you next deploy
+# your application using appcfg.py.
+
+- kind: Searches
+  properties:
+  - name: private
+  - name: timestamp
+    direction: desc
+
+- kind: Searches
+  properties:
+  - name: user_id
+  - name: timestamp
+    direction: desc

manage.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sympy_live_django.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()

requirements.txt

@@ -0,0 +1,31 @@
+asgiref==3.2.3
+bitarray==1.2.1
+cachetools==4.0.0
+certifi==2019.11.28
+chardet==3.0.4
+cycler==0.10.0
+Django==3.0.2
+google-api-core==1.16.0
+google-auth==1.11.0
+google-cloud==0.34.0
+google-cloud-core==1.2.0
+google-cloud-storage==1.25.0
+google-resumable-media==0.5.0
+googleapis-common-protos==1.51.0
+gunicorn==20.0.4
+idna==2.8
+kiwisolver==1.1.0
+matplotlib==3.1.2
+mysqlclient==1.4.6
+numpy==1.18.1
+protobuf==3.11.2
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pyparsing==2.4.6
+python-dateutil==2.8.1
+pytz==2019.3
+requests==2.22.0
+rsa==4.0
+six==1.14.0
+sqlparse==0.3.0
+urllib3==1.25.8

shell/admin.py

@@ -0,0 +1,15 @@
+from django.contrib import admin
+from .models import Searches
+from django.contrib.sessions.models import Session
+
+
+class SearchesEntry(admin.ModelAdmin):
+    list_display = ("id", "user_id", "query", "timestamp", "private")
+
+
+class SessionEntry(admin.ModelAdmin):
+    list_display = ("session_key", "expire_date", "session_data")
+
+
+admin.site.register(Searches, SearchesEntry)
+admin.site.register(Session, SessionEntry)

shell/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ShellConfig(AppConfig):
+    name = 'shell'

shell/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.2 on 2020-02-08 11:12
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Searches',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('query', models.CharField(default=None, max_length=100)),
+                ('timestamp', models.DateTimeField(auto_now_add=True)),
+                ('private', models.BooleanField()),
+                ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

shell/migrations/0002_auto_20200209_1757.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.2 on 2020-02-09 12:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shell', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='searches',
+            name='private',
+            field=models.BooleanField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='searches',
+            name='query',
+            field=models.CharField(blank=True, default=None, max_length=100),
+        ),
+    ]

shell/migrations/0003_auto_20200209_1806.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.2 on 2020-02-09 12:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shell', '0002_auto_20200209_1757'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='searches',
+            name='private',
+            field=models.BooleanField(),
+        ),
+        migrations.AlterField(
+            model_name='searches',
+            name='query',
+            field=models.CharField(default=None, max_length=100),
+        ),
+    ]

shell/migrations/0004_auto_20200225_1806.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.2 on 2020-02-25 12:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shell', '0003_auto_20200209_1806'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='searches',
+            options={'verbose_name_plural': 'Searches'},
+        ),
+    ]

shell/models.py

@@ -0,0 +1,19 @@
+from django.db import models
+from django.contrib.auth.models import User
+
+
+class Searches(models.Model):
+    user_id = models.ForeignKey(User, on_delete=models.CASCADE)
+    query = models.CharField(max_length=100, default=None)
+    timestamp = models.DateTimeField(auto_now_add=True)
+    private = models.BooleanField()
+
+    class Meta:
+        verbose_name_plural = "Searches"
+
+
+# class SessionTable(models.Model):
+#     global_names = models.CharField(max_length=50)
+#     globals = models.BinaryField()
+#     unpicklable_names = models.CharField(max_length=30)
+#     unpicklables = models.CharField(max_length=30)

rlcompleter.py → shell/rlcompleter.py

@@ -39,13 +39,13 @@
 
 """
 
-import __builtin__
-# import __main__
+import builtins
+import __main__
 
 __all__ = ["Completer"]
 
 class Completer:
-    def __init__(self, namespace = None):
+    def __init__(self, namespace=None):
         """Create a new completer for the command line.
 
         Completer([namespace]) -> completer instance.
@@ -61,7 +61,7 @@ def __init__(self, namespace = None):
         """
 
         if namespace and not isinstance(namespace, dict):
-            raise TypeError,'namespace must be a dictionary'
+            raise TypeError('namespace must be a dictionary')
 
         # Don't bind to namespace quite yet, but flag whether the user wants a
         # specific namespace or to use __main__.__dict__. This will allow us
@@ -110,8 +110,8 @@ def global_matches(self, text):
         for word in keyword.kwlist:
             if word[:n] == text:
                 matches.append(word)
-        for nspace in [__builtin__.__dict__, self.namespace]:
-            for word, val in nspace.items():
+        for nspace in [builtins.__dict__, self.namespace]:
+            for word, val in list(nspace.items()):
                 if word[:n] == text and word != "__builtins__":
                     matches.append(self._callable_postfix(val, word))
         return matches

shell/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.