Merge pull request #1757 from adamantike/django-3.2

Upgrade tutorial to Django 3.2

Author: das-g

book.json

@@ -6,7 +6,7 @@
       "py_min_version": "3.6",
       "py_min_release": "3.6.8",
       "pa_py_version": "3.8",
-      "django_version": "2.2.4"
+      "django_version": "3.2.10"
     },
     "links": {
         "sidebar": {

en/deploy/README.md

@@ -245,7 +245,7 @@ You can also go to the "Files" page and navigate around using PythonAnywhere's b
 Your site should now be live on the public Internet!  Click through to the PythonAnywhere "Web" page to get a link to it. You can share this with anyone you want. :)
 
 
-> **Note** This is a beginners' tutorial, and in deploying this site we've taken a few shortcuts which aren't ideal from a security point of view.  If and when you decide to build on this project, or start a new project, you should review the [Django deployment checklist](https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/) for some tips on securing your site.
+> **Note** This is a beginners' tutorial, and in deploying this site we've taken a few shortcuts which aren't ideal from a security point of view.  If and when you decide to build on this project, or start a new project, you should review the [Django deployment checklist](https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/) for some tips on securing your site.
 
 
 ## Debugging tips

en/django_admin/README.md

@@ -52,6 +52,6 @@ Make sure that at least two or three posts (but not all) have the publish date s
 
 ![Django admin](images/edit_post3.png)
 
-If you want to know more about Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/2.2/ref/contrib/admin/
+If you want to know more about Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/3.2/ref/contrib/admin/
 
 This is probably a good moment to grab a coffee (or tea) or something to eat to re-energize yourself. You created your first Django model – you deserve a little break!

en/django_forms/README.md

@@ -374,7 +374,7 @@ Feel free to change the title or the text and save the changes!
 
 Congratulations! Your application is getting more and more complete!
 
-If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/2.2/topics/forms/
+If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/3.2/topics/forms/
 
 ## Security
 

en/django_installation/instructions.md

@@ -203,7 +203,7 @@ Now, run `pip install -r requirements.txt` to install Django.
 ```
 (myvenv) ~$ pip install -r requirements.txt
 Collecting Django~={{ book.django_version }} (from -r requirements.txt (line 1))
-  Downloading Django-{{ book.django_version }}-py3-none-any.whl (7.1MB)
+  Downloading Django-{{ book.django_version }}-py3-none-any.whl (7.9MB)
 Installing collected packages: Django
 Successfully installed Django-{{ book.django_version }}
 ```

en/django_models/README.md

@@ -92,6 +92,7 @@ djangogirls
 ├── db.sqlite3
 ├── manage.py
 ├── mysite
+│   ├── asgi.py
 │   ├── __init__.py
 │   ├── settings.py
 │   ├── urls.py
@@ -102,7 +103,7 @@ djangogirls
 
 ```
 
-After creating an application, we also need to tell Django that it should use it. We do that in the file `mysite/settings.py` -- open it in your code editor. We need to find `INSTALLED_APPS` and add a line containing `'blog.apps.BlogConfig',` just above `]`. So the final product should look like this:
+After creating an application, we also need to tell Django that it should use it. We do that in the file `mysite/settings.py` -- open it in your code editor. We need to find `INSTALLED_APPS` and add a line containing `'blog',` just above `]`. So the final product should look like this:
 
 {% filename %}mysite/settings.py{% endfilename %}
 ```python
@@ -113,7 +114,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'blog.apps.BlogConfig',
+    'blog',
 ]
 ```
 
@@ -163,7 +164,7 @@ Now we define the properties we were talking about: `title`, `text`, `created_da
 - `models.DateTimeField` – this is a date and time.
 - `models.ForeignKey` – this is a link to another model.
 
-We will not explain every bit of code here since it would take too much time. You should take a look at Django's documentation if you want to know more about Model fields and how to define things other than those described above (https://docs.djangoproject.com/en/2.2/ref/models/fields/#field-types).
+We will not explain every bit of code here since it would take too much time. You should take a look at Django's documentation if you want to know more about Model fields and how to define things other than those described above (https://docs.djangoproject.com/en/3.2/ref/models/fields/#field-types).
 
 What about `def publish(self):`? This is exactly the `publish` method we were talking about before. `def` means that this is a function/method and `publish` is the name of the method. You can change the name of the method if you want. The naming rule is that we use lowercase and underscores instead of spaces. For example,  a method that calculates average price could be called `calculate_average_price`.
 
@@ -181,8 +182,8 @@ The last step here is to add our new model to our database. First we have to mak
 ```
 (myvenv) ~/djangogirls$ python manage.py makemigrations blog
 Migrations for 'blog':
-  blog/migrations/0001_initial.py:
-  - Create model Post
+  blog/migrations/0001_initial.py
+    - Create model Post
 ```
 
 **Note:** Remember to save the files you edit. Otherwise, your computer will execute the previous version which might give you unexpected error messages.

en/django_start_project/README.md

@@ -53,6 +53,7 @@ The `(myvenv) C:\Users\Name\djangogirls>` part shown here is just example of the
 djangogirls
 ├── manage.py
 ├── mysite
+│   ├── asgi.py
 │   ├── __init__.py
 │   ├── settings.py
 │   ├── urls.py
@@ -87,7 +88,7 @@ In `settings.py`, find the line that contains `TIME_ZONE` and modify it to choos
 TIME_ZONE = 'Europe/Berlin'
 ```
 
-A language code consist of the language, e.g. `en` for English or `de` for German, and the country code, e.g. `de` for Germany or `ch` for Switzerland. If English is not your native language, you can add this to change the default buttons and notifications from Django to be in your language. So you would have "Cancel" button translated into the language you defined here. [Django comes with a lot of prepared translations](https://docs.djangoproject.com/en/2.2/ref/settings/#language-code).
+A language code consist of the language, e.g. `en` for English or `de` for German, and the country code, e.g. `de` for Germany or `ch` for Switzerland. If English is not your native language, you can add this to change the default buttons and notifications from Django to be in your language. So you would have "Cancel" button translated into the language you defined here. [Django comes with a lot of prepared translations](https://docs.djangoproject.com/en/3.2/ref/settings/#language-code).
 
 If you want a different language, change the language code by changing the following line:
 
@@ -102,7 +103,7 @@ We'll also need to add a path for static files. (We'll find out all about static
 {% filename %}mysite/settings.py{% endfilename %}
 ```python
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = BASE_DIR / 'static'
 ```
 
 When `DEBUG` is `True` and `ALLOWED_HOSTS` is empty, the host is validated against `['localhost', '127.0.0.1', '[::1]']`. This won't
@@ -118,7 +119,7 @@ ALLOWED_HOSTS = ['127.0.0.1', '.pythonanywhere.com']
 
 > Also add `.amazonaws.com` to the `ALLOWED_HOSTS` if you are using cloud9
 
-> If you are hosting your project on `Glitch.com`, let us protect the Django secret key that needs to 
+> If you are hosting your project on `Glitch.com`, let us protect the Django secret key that needs to
 > remain confidential (otherwise, anyone remixing your project could see it):
 >
 >   * First, we are going to create a random secret key.
@@ -130,8 +131,8 @@ ALLOWED_HOSTS = ['127.0.0.1', '.pythonanywhere.com']
 >           print(get_random_secret_key())'
 >     ```
 >     This should display a long random string, perfect to use as a secret key for your brand new Django web site.
->     We will now paste this key into a `.env` file that Glitch will only show you if you are the owner of the web site.    
->   
+>     We will now paste this key into a `.env` file that Glitch will only show you if you are the owner of the web site.
+>
 >   * Create a file `.env` at the root of your project and add the following property in it:
 >
 >     {% filename %}.env{% endfilename %}
@@ -143,6 +144,8 @@ ALLOWED_HOSTS = ['127.0.0.1', '.pythonanywhere.com']
 >
 >     {% filename %}mysite/settings.py{% endfilename %}
 >     ```python
+>     import os
+>
 >     SECRET_KEY = os.getenv('SECRET')
 >     ```
 >   * And a little further down in the same file, we inject the name of your new Glitch website:
@@ -165,7 +168,7 @@ This is already set up in this part of your `mysite/settings.py` file:
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
 ```
@@ -176,13 +179,13 @@ To create a database for our blog, let's run the following in the console: `pyth
 ```
 (myvenv) ~/djangogirls$ python manage.py migrate
 Operations to perform:
-  Apply all migrations: auth, admin, contenttypes, sessions
+  Apply all migrations: admin, auth, contenttypes, sessions
 Running migrations:
-  Rendering model states... DONE
   Applying contenttypes.0001_initial... OK
   Applying auth.0001_initial... OK
   Applying admin.0001_initial... OK
   Applying admin.0002_logentry_remove_auto_add... OK
+  Applying admin.0003_logentry_add_action_flag_choices... OK
   Applying contenttypes.0002_remove_content_type_name... OK
   Applying auth.0002_alter_permission_name_max_length... OK
   Applying auth.0003_alter_user_email_max_length... OK
@@ -192,6 +195,9 @@ Running migrations:
   Applying auth.0007_alter_validators_add_error_messages... OK
   Applying auth.0008_alter_user_username_max_length... OK
   Applying auth.0009_alter_user_last_name_max_length... OK
+  Applying auth.0010_alter_group_name_max_length... OK
+  Applying auth.0011_update_proxy_permissions... OK
+  Applying auth.0012_alter_user_first_name_max_length... OK
   Applying sessions.0001_initial... OK
 ```
 

en/django_urls/README.md

@@ -93,10 +93,23 @@ The last part, `name='post_list'`, is the name of the URL that will be used to i
 
 If you try to visit http://127.0.0.1:8000/ now, then you'll find some sort of 'web page not available' message. This is because the server (remember typing `runserver`?) is no longer running. Take a look at your server console window to find out why.
 
-![Error](images/error1.png)
+{% filename %}{{ warning_icon }} command-line{% endfilename %}
+
+```
+    return _bootstrap._gcd_import(name[level:], package, level)
+  File "<frozen importlib._bootstrap>", line 1030, in _gcd_import
+  File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
+  File "<frozen importlib._bootstrap_external>", line 850, in exec_module
+  File "<frozen importlib._bootstrap>", line 228, in _call_with_frames_removed
+  File "/Users/ola/djangogirls/blog/urls.py", line 5, in <module>
+    path('', views.post_list, name='post_list'),
+AttributeError: module 'blog.views' has no attribute 'post_list'
+```
 
 Your console is showing an error, but don't worry – it's actually pretty useful: It's telling you that there is __no attribute 'post_list'__. That's the name of the *view* that Django is trying to find and use, but we haven't created it yet. At this stage, your `/admin/` will also not work. No worries – we will get there.
 If you see a different error message, try restarting your web server. To do that, in the console window that is running the web server, stop it by pressing Ctrl+C (the Control and C keys together). On Windows, you might have to press Ctrl+Break. Then you need to restart the web server by running a `python manage.py runserver` command.
 
 
-> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/2.2/topics/http/urls/
+> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/3.2/topics/http/urls/

en/django_urls/images/error1.png

@@ -39,4 +39,4 @@ Another error! Read what's going on now:
 
 This shows that the server is running again, at least, but it still doesn't look right, does it? Don't worry, it's just an error page, nothing to be scared of! Just like the error messages in the console, these are actually pretty useful. You can read that the *TemplateDoesNotExist*. Let's fix this bug and create a template in the next chapter!
 
-> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/2.2/topics/http/views/
+> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/3.2/topics/http/views/