Fixed #27857 -- Dropped support for Python 3.4.

Author: timgraham

INSTALL

@@ -1,6 +1,6 @@
 Thanks for downloading Django.
 
-To install it, make sure you have Python 3.4 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

django/db/models/expressions.py

@@ -150,12 +150,6 @@ def __init__(self, output_field=None):
         if output_field is not None:
             self.output_field = output_field
 
-    def __getstate__(self):
-        # This method required only for Python 3.4.
-        state = self.__dict__.copy()
-        state.pop('convert_value', None)
-        return state
-
     def get_db_converters(self, connection):
         return (
             []

django/http/cookie.py

@@ -1,20 +1,7 @@
-import sys
 from http import cookies
 
-# Cookie pickling bug is fixed in Python 3.4.3+
-# http://bugs.python.org/issue22775
-if sys.version_info >= (3, 4, 3):
-    SimpleCookie = cookies.SimpleCookie
-else:
-    Morsel = cookies.Morsel
-
-    class SimpleCookie(cookies.SimpleCookie):
-        def __setitem__(self, key, value):
-            if isinstance(value, Morsel):
-                # allow assignment of constructed Morsels (e.g. for pickling)
-                dict.__setitem__(self, key, value)
-            else:
-                super().__setitem__(key, value)
+# For backwards compatibility in Django 2.1.
+SimpleCookie = cookies.SimpleCookie
 
 
 def parse_cookie(cookie):

django/test/html.py

@@ -1,8 +1,7 @@
 """Compare two HTML documents."""
 
 import re
-
-from django.utils.html_parser import HTMLParseError, HTMLParser
+from html.parser import HTMLParser
 
 WHITESPACE = re.compile(r'\s+')
 
@@ -138,14 +137,18 @@ def __str__(self):
         return ''.join(str(c) for c in self.children)
 
 
+class HTMLParseError(Exception):
+    pass
+
+
 class Parser(HTMLParser):
     SELF_CLOSING_TAGS = (
         'br', 'hr', 'input', 'img', 'meta', 'spacer', 'link', 'frame', 'base',
         'col',
     )
 
     def __init__(self):
-        HTMLParser.__init__(self)
+        HTMLParser.__init__(self, convert_charrefs=False)
         self.root = RootElement()
         self.open_tags = []
         self.element_positions = {}

django/urls/converters.py

@@ -60,10 +60,7 @@ def register_converter(converter, type_name):
 
 @lru_cache.lru_cache(maxsize=None)
 def get_converters():
-    converters = {}
-    converters.update(DEFAULT_CONVERTERS)
-    converters.update(REGISTERED_CONVERTERS)
-    return converters
+    return {**DEFAULT_CONVERTERS, **REGISTERED_CONVERTERS}
 
 
 def get_converter(raw_converter):

django/urls/resolvers.py

@@ -343,9 +343,7 @@ def lookup_str(self):
         'path.to.ClassBasedView').
         """
         callback = self.callback
-        # Python 3.5 collapses nested partials, so can change "while" to "if"
-        # when it's the minimum supported version.
-        while isinstance(callback, functools.partial):
+        if isinstance(callback, functools.partial):
             callback = callback.func
         if not hasattr(callback, '__name__'):
             return callback.__module__ + "." + callback.__class__.__name__

django/utils/html.py

@@ -1,6 +1,7 @@
 """HTML utilities suitable for global use."""
 
 import re
+from html.parser import HTMLParser
 from urllib.parse import (
     parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit,
 )
@@ -11,8 +12,6 @@
 from django.utils.safestring import SafeData, SafeText, mark_safe
 from django.utils.text import normalize_newlines
 
-from .html_parser import HTMLParseError, HTMLParser
-
 # Configuration for urlize() function.
 TRAILING_PUNCTUATION_RE = re.compile(
     '^'           # Beginning of word
@@ -132,7 +131,7 @@ def linebreaks(value, autoescape=False):
 
 class MLStripper(HTMLParser):
     def __init__(self):
-        HTMLParser.__init__(self)
+        HTMLParser.__init__(self, convert_charrefs=False)
         self.reset()
         self.fed = []
 
@@ -154,16 +153,9 @@ def _strip_once(value):
     Internal tag stripping utility used by strip_tags.
     """
     s = MLStripper()
-    try:
-        s.feed(value)
-    except HTMLParseError:
-        return value
-    try:
-        s.close()
-    except HTMLParseError:
-        return s.get_data() + s.rawdata
-    else:
-        return s.get_data()
+    s.feed(value)
+    s.close()
+    return s.get_data()
 
 
 @keep_lazy_text

django/utils/html_parser.py

@@ -288,9 +288,9 @@ Once the tests complete, you should be greeted with a message informing you
 whether the test suite passed or failed. Since you haven't yet made any changes
 to Django's code, the entire test suite **should** pass. If you get failures or
 errors make sure you've followed all of the previous steps properly. See
-:ref:`running-unit-tests` for more information. If you're using Python 3.5+,
-there will be a couple failures related to deprecation warnings that you can
-ignore. These failures have since been fixed in Django.
+:ref:`running-unit-tests` for more information. There will be a couple failures
+related to deprecation warnings that you can ignore. These failures have since
+been fixed in Django.
 
 Note that the latest Django trunk may not always be stable. When developing
 against trunk, you can check `Django's continuous integration builds`__ to

docs/intro/contributing.txt

@@ -29,7 +29,7 @@ your operating system's package manager.
 You can verify that Python is installed by typing ``python`` from your shell;
 you should see something like::
 
-    Python 3.4.x
+    Python 3.x.y
     [GCC 4.x] on linux
     Type "help", "copyright", "credits" or "license" for more information.
     >>>