2.2upgrade

.editorconfig

@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org/
 
 root = true
 
@@ -39,3 +39,6 @@ indent_style = tab
 # Batch files use tabs for indentation
 [*.bat]
 indent_style = tab
+
+[docs/**.txt]
+max_line_length = 79

INSTALL

@@ -1,17 +1,8 @@
 Thanks for downloading Django.
 
-To install it, make sure you have Python 2.7 or greater installed. Then run
+To install it, make sure you have Python 3.5 or greater installed. Then run
 this command from the command prompt:
 
-    python setup.py install
-
-If you're upgrading from a previous version, you need to remove it first.
-
-AS AN ALTERNATIVE, you can just copy the entire "django" directory to Python's
-site-packages directory, which is located wherever your Python installation
-lives. Some places you might check are:
-
-    /usr/lib/python2.7/site-packages (Unix, Python 2.7)
-    C:\\PYTHON\site-packages         (Windows)
+    python -m pip install .
 
 For more detailed instructions, see docs/intro/install.txt.

LICENSE.python

@@ -1,3 +1,14 @@
+Django is licensed under the three-clause BSD license; see the file
+LICENSE for details.
+
+Django includes code from the Python standard library, which is licensed under
+the Python license, a permissive open source license. The copyright and license
+is included below for compliance with Python's terms.
+
+----------------------------------------------------------------------
+
+Copyright (c) 2001-present Python Software Foundation; All Rights Reserved
+
 A. HISTORY OF THE SOFTWARE
 ==========================
 
@@ -74,9 +85,9 @@ analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version prepared by
-Licensee.
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation; All
+Rights Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make

README.rst

@@ -25,8 +25,9 @@ ticket here: https://code.djangoproject.com/newticket
 
 To get more help:
 
-* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang out
-  there. Read the archives at http://django-irc-logs.com/.
+* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang
+  out there. See https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're
+  new to IRC.
 
 * Join the django-users mailing list, or read the archives, at
   https://groups.google.com/group/django-users.

django/__init__.py

@@ -1,8 +1,6 @@
-from __future__ import unicode_literals
-
 from django.utils.version import get_version
 
-VERSION = (1, 11, 0, 'alpha', 0)
+VERSION = (2, 2, 15, 'alpha', 0)
 
 __version__ = get_version(VERSION)
 
@@ -16,12 +14,11 @@ def setup(set_prefix=True):
     from django.apps import apps
     from django.conf import settings
     from django.urls import set_script_prefix
-    from django.utils.encoding import force_text
     from django.utils.log import configure_logging
 
     configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
     if set_prefix:
         set_script_prefix(
-            '/' if settings.FORCE_SCRIPT_NAME is None else force_text(settings.FORCE_SCRIPT_NAME)
+            '/' if settings.FORCE_SCRIPT_NAME is None else settings.FORCE_SCRIPT_NAME
         )
     apps.populate(settings.INSTALLED_APPS)

django/apps/config.py

@@ -2,23 +2,20 @@
 from importlib import import_module
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils._os import upath
 from django.utils.module_loading import module_has_submodule
 
 MODELS_MODULE_NAME = 'models'
 
 
-class AppConfig(object):
-    """
-    Class representing a Django application and its configuration.
-    """
+class AppConfig:
+    """Class representing a Django application and its configuration."""
 
     def __init__(self, app_name, app_module):
-        # Full Python path to the application eg. 'django.contrib.admin'.
+        # Full Python path to the application e.g. 'django.contrib.admin'.
         self.name = app_name
 
-        # Root module for the application eg. <module 'django.contrib.admin'
-        # from 'django/contrib/admin/__init__.pyc'>.
+        # Root module for the application e.g. <module 'django.contrib.admin'
+        # from 'django/contrib/admin/__init__.py'>.
         self.module = app_module
 
         # Reference to the Apps registry that holds this AppConfig. Set by the
@@ -28,27 +25,26 @@ def __init__(self, app_name, app_module):
         # The following attributes could be defined at the class level in a
         # subclass, hence the test-and-set pattern.
 
-        # Last component of the Python path to the application eg. 'admin'.
+        # Last component of the Python path to the application e.g. 'admin'.
         # This value must be unique across a Django project.
         if not hasattr(self, 'label'):
             self.label = app_name.rpartition(".")[2]
 
-        # Human-readable name for the application eg. "Admin".
+        # Human-readable name for the application e.g. "Admin".
         if not hasattr(self, 'verbose_name'):
             self.verbose_name = self.label.title()
 
-        # Filesystem path to the application directory eg.
-        # u'/usr/lib/python2.7/dist-packages/django/contrib/admin'. Unicode on
-        # Python 2 and a str on Python 3.
+        # Filesystem path to the application directory e.g.
+        # '/path/to/django/contrib/admin'.
         if not hasattr(self, 'path'):
             self.path = self._path_from_module(app_module)
 
-        # Module containing models eg. <module 'django.contrib.admin.models'
-        # from 'django/contrib/admin/models.pyc'>. Set by import_models().
+        # Module containing models e.g. <module 'django.contrib.admin.models'
+        # from 'django/contrib/admin/models.py'>. Set by import_models().
         # None if the application doesn't have a models module.
         self.models_module = None
 
-        # Mapping of lower case model names to model classes. Initially set to
+        # Mapping of lowercase model names to model classes. Initially set to
         # None to prevent accidental access before import_models() runs.
         self.models = None
 
@@ -59,8 +55,8 @@ def _path_from_module(self, module):
         """Attempt to determine app's filesystem path from its module."""
         # See #21874 for extended discussion of the behavior of this method in
         # various cases.
-        # Convert paths to list because Python 3's _NamespacePath does not
-        # support indexing.
+        # Convert paths to list because Python's _NamespacePath doesn't support
+        # indexing.
         paths = list(getattr(module, '__path__', []))
         if len(paths) != 1:
             filename = getattr(module, '__file__', None)
@@ -80,7 +76,7 @@ def _path_from_module(self, module):
                 "The app module %r has no filesystem location, "
                 "you must configure this app with an AppConfig subclass "
                 "with a 'path' class attribute." % (module,))
-        return upath(paths[0])
+        return paths[0]
 
     @classmethod
     def create(cls, entry):
@@ -122,8 +118,21 @@ def create(cls, entry):
             cls = getattr(mod, cls_name)
         except AttributeError:
             if module is None:
-                # If importing as an app module failed, that error probably
-                # contains the most informative traceback. Trigger it again.
+                # If importing as an app module failed, check if the module
+                # contains any valid AppConfigs and show them as choices.
+                # Otherwise, that error probably contains the most informative
+                # traceback, so trigger it again.
+                candidates = sorted(
+                    repr(name) for name, candidate in mod.__dict__.items()
+                    if isinstance(candidate, type) and
+                    issubclass(candidate, AppConfig) and
+                    candidate is not AppConfig
+                )
+                if candidates:
+                    raise ImproperlyConfigured(
+                        "'%s' does not contain a class '%s'. Choices are: %s."
+                        % (mod_path, cls_name, ', '.join(candidates))
+                    )
                 import_module(entry)
             else:
                 raise
@@ -157,9 +166,9 @@ def create(cls, entry):
 
     def get_model(self, model_name, require_ready=True):
         """
-        Returns the model with the given case-insensitive model_name.
+        Return the model with the given case-insensitive model_name.
 
-        Raises LookupError if no model exists with this name.
+        Raise LookupError if no model exists with this name.
         """
         if require_ready:
             self.apps.check_models_ready()
@@ -173,7 +182,7 @@ def get_model(self, model_name, require_ready=True):
 
     def get_models(self, include_auto_created=False, include_swapped=False):
         """
-        Returns an iterable of models.
+        Return an iterable of models.
 
         By default, the following models aren't included: