Python 3.9 upgrade (#1827)

* Remove unmaintained Vagrant setup/instructions

* update python version to 3.9

* upgrade dependencies to reach python3.9 compatibility

* upgrade requests, migrate to latest chardet

* result of `pyupgrade --py3-plus --py39-plus

Author: ewdurbin

Vagrantfile

@@ -3,18 +3,18 @@ django-pipeline==1.6.14
 django-sitetree==1.10.0
 Django==2.0.13
 docutils==0.12
-Markdown==2.5.2
+Markdown==3.3.4
 cmarkgfm==0.4.2
-Pillow==5.1.0
-psycopg2==2.7.3.2
+Pillow==8.3.1
+psycopg2==2.8.6
 python3-openid==3.1.0
 # lxml used by BeautifulSoup.
-lxml==4.1.1
+lxml==4.6.3
 cssselect==0.9.1
-feedparser==5.2.1
+feedparser==6.0.8
 beautifulsoup4==4.6.0
 icalendar==3.8.4
-chardet2==2.0.3
+chardet==4.0.0
 # TODO: We may drop 'django-imagekit' completely.
 django-imagekit==4.0.2
 git+https://github.com/django-haystack/django-haystack.git@802b0f6f4b3b99314453261876a32bac2bbec94f
@@ -25,7 +25,7 @@ django-tastypie==0.14.1
 pytz==2017.2
 python-dateutil==2.8.1
 
-requests[security]>=2.20.0
+requests[security]>=2.26.0
 
 django-honeypot==0.6.0
 django-markupfield==1.4.3

base-requirements.txt

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings

blogs/migrations/0001_initial.py

@@ -27,7 +27,7 @@ def text_from_html(body):
     soup = BeautifulSoup(body, "html.parser")
     texts = soup.findAll(text=True)
     visible_texts = filter(tag_visible, texts)
-    return u" ".join(t.strip() for t in visible_texts)
+    return " ".join(t.strip() for t in visible_texts)
 
 
 class BlogEntry(models.Model):

blogs/models.py

@@ -11,7 +11,7 @@ class BlogParserTest(unittest.TestCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.test_file_path = get_test_rss_path()
-        cls.entries = get_all_entries("file://{}".format(cls.test_file_path))
+        cls.entries = get_all_entries(f"file://{cls.test_file_path}")
 
     def test_entries(self):
         self.assertEqual(len(self.entries), 25)

blogs/tests/test_parser.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import markupfield.fields
 import django.utils.timezone

boxes/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

boxes/migrations/0002_auto_20150416_1853.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.5 on 2017-11-01 21:38
-from __future__ import unicode_literals
 
 from django.db import migrations
 

boxes/migrations/0003_auto_20171101_2138.py

@@ -35,7 +35,7 @@ def collect_initial_data_functions(self, app_label):
             app_list = apps.get_app_configs()
         for app in app_list:
             try:
-                factory_module = importlib.import_module('{}.factories'.format(app.name))
+                factory_module = importlib.import_module(f'{app.name}.factories')
             except ImportError:
                 continue
             else:
@@ -50,7 +50,7 @@ def output(self, app_name, verbosity, *, done=False, result=False):
             if done:
                 self.stdout.write(self.style.SUCCESS('DONE'))
             else:
-                self.stdout.write('Creating initial data for {!r}... '.format(app_name), ending='')
+                self.stdout.write(f'Creating initial data for {app_name!r}... ', ending='')
         if verbosity >= 2 and result:
             pprint.pprint(result)
 
@@ -74,7 +74,7 @@ def flush_handler(self, do_flush, verbosity):
             try:
                 call_command('flush', verbosity=verbosity, interactive=False)
             except Exception as exc:
-                self.stdout.write(self.style.ERROR('{}: {}'.format(type(exc).__name__, exc)))
+                self.stdout.write(self.style.ERROR(f'{type(exc).__name__}: {exc}'))
         return confirm
 
     def handle(self, **options):
@@ -92,7 +92,7 @@ def handle(self, **options):
             try:
                 call_command('loaddata', 'sitetree_menus', '-v0')
             except Exception as exc:
-                self.stdout.write(self.style.ERROR('{}: {}'.format(type(exc).__name__, exc)))
+                self.stdout.write(self.style.ERROR(f'{type(exc).__name__}: {exc}'))
             else:
                 self.output('sitetree', verbosity, done=True)
 
@@ -106,7 +106,7 @@ def handle(self, **options):
             try:
                 result = function()
             except Exception as exc:
-                self.stdout.write(self.style.ERROR('{}: {}'.format(type(exc).__name__, exc)))
+                self.stdout.write(self.style.ERROR(f'{type(exc).__name__}: {exc}'))
                 continue
             else:
                 self.output(app_name, verbosity, done=True, result=result)

cms/management/commands/create_initial_data.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import markupfield.fields
 import django.utils.timezone