Opened 5 years ago

Last modified 3 months ago

#23919 closed Cleanup/optimization

Cleanups for when we drop Python 2 compatibility — at Version 40

Reported by: Tim Graham Owned by: nobody
Component: Core (Other) Version:
Severity: Normal Keywords:
Cc: cmawebsite@…, Tom Forbes Triage Stage: Accepted
Has patch: no Needs documentation: no
Needs tests: no Patch needs improvement: no
Easy pickings: no UI/UX: no

Description (last modified by Aymeric Augustin)

This is a tracking ticket of things that we can remove when we drop Python 2 compatibility in Django 2.0. Please edit the description of the ticket as you come across new items.

  • django.core.mail.message.make_msgid() #23905
  • django.dispatch.weakref_backports
  • django.http.cookie workarounds
  • django.utils.2to3_fixes
  • django.utils.decorators.ContextDecorator
  • django.utils.encoding
    • @python_2_unicode_compatible
    • force/smart _unicode
    • either force/smart _text or force/smart _str
  • django.utils.html_parser.use_workaround
  • django.utils.http functions like urlquote_plus -- I think the versions of these functions on Python 3 don't have the unicode characters bug we are working around.
  • django.utils.lru_cache - PR 7877
  • django.utils.six
  • from __future__ import unicode_literals
  • str() stuff for environment variables, e.g. 0bfb53866199f366ed140d49938fd185e5898156
  • Inheriting from object in django.core.servers.basehttp (and perhaps other places) ala 4ee06ec3fc8e94d164afbd2f9c880c60c658a9ac
  • git grep 'long int' (mostly docs)
  • django.utils._os [npath,upath]
  • In tests: contextlib.closing(self.urlopen (contextlib.closing no longer needed)
  • Support for pysqlite (doesn't support Python 3)
  • Replace super(ClassName, self) with super()
  • Remove # -*- coding: utf-8 -*- source file encoding (that's the default on Python 3)
  • Evaluate replacement of custom __del__ methods by weakref.finalize
  • Remove __ne__ from objects already defining a __eq__ - PR 7877
  • Remove note about PYTHONHASHSEED (see #26243)
  • Remove Field.creation_counter (replace by metaclass __prepare__ returning OrderedDict(), https://docs.python.org/3/reference/datamodel.html#preparing-the-class-namespace)
  • django.test.utils.reset_warning_registry()
  • Replace errno checks by IOError subclasses defined by PEP 3151
  • django.utils.glob
  • django.utils.cookies.SimpleCookie
  • django.test.mock
  • Replace tempfile.mkdtemp + remove with tempfile.TemporaryDirectory context manager
  • Replace io.open() by a plain open() - PR 7877
  • Evaluate need for assertRegex, assertRaisesRegex in tests. Some usage is merely to account for differences in messages between Python 2 and 3.
  • re.U, re.UNICODE (default behavior of Python 3)

Change History (40)

comment:1 Changed 5 years ago by Wojtek Ruszczewski

Various nonlocal workarounds (example).

comment:2 Changed 5 years ago by Collin Anderson

Description: modified (diff)

comment:3 Changed 5 years ago by Tim Graham

Description: modified (diff)

comment:4 Changed 5 years ago by Anssi Kääriäinen

I believe we can get rid of the Field.creation_counter hack. In Python 3 it is possible to store the attrs in a sorted dictionary. See http://stackoverflow.com/questions/4459531/how-to-read-class-attributes-in-the-same-order-as-declared.

comment:5 Changed 5 years ago by Collin Anderson

Description: modified (diff)

comment:6 Changed 5 years ago by Tim Graham

Description: modified (diff)

comment:7 Changed 5 years ago by Tim Graham

Description: modified (diff)

comment:8 Changed 5 years ago by Collin Anderson

Cc: cmawebsite@… added
Description: modified (diff)

comment:9 Changed 5 years ago by Collin Anderson

Description: modified (diff)

comment:10 Changed 5 years ago by Curtis Maloney

In far too many tests we rely on the fact six aliases builtins [like input] instead of using mock.

I submitted a patch recently to clean up a couple of these I found, but I am finding more.

comment:11 Changed 5 years ago by Curtis Maloney

Description: modified (diff)

comment:12 Changed 4 years ago by Tim Graham

Description: modified (diff)

comment:13 Changed 4 years ago by Tim Graham

Description: modified (diff)

comment:14 Changed 4 years ago by Moritz Sichert

Description: modified (diff)

comment:15 Changed 4 years ago by Tim Graham

Description: modified (diff)

comment:16 Changed 4 years ago by Claude Paroz

Description: modified (diff)

comment:17 Changed 4 years ago by Simon Charette

Description: modified (diff)

comment:18 Changed 4 years ago by Collin Anderson

Description: modified (diff)

comment:19 Changed 4 years ago by Anssi Kääriäinen

Description: modified (diff)

comment:20 Changed 4 years ago by Tim Graham

Description: modified (diff)

comment:21 Changed 3 years ago by Jon Dufresne

Description: modified (diff)

comment:22 Changed 3 years ago by Curtis Maloney

Description: modified (diff)

comment:23 Changed 3 years ago by Curtis Maloney

Description: modified (diff)

comment:24 Changed 3 years ago by Jon Dufresne

Description: modified (diff)

comment:25 Changed 3 years ago by Claude Paroz

Description: modified (diff)

comment:26 Changed 3 years ago by Tim Graham

Description: modified (diff)

comment:27 Changed 3 years ago by Tim Graham

Description: modified (diff)

comment:28 Changed 3 years ago by Claude Paroz

Note that I have a local branch which does some boring removals (unicode_literals, utf-8 preambles, some six usage). So ping me as soon as the Django 2.0 deprecated stuff is removed and I'll offer a patch for that.

comment:29 Changed 3 years ago by Asif Saifuddin Auvi

I am also working to remove python2 workarounds by following a module by module approach.

comment:30 Changed 3 years ago by Aymeric Augustin

If Claude has already prepared these changes, perhaps you should wait for his patch instead of duplicating his work?

comment:31 in reply to:  30 Changed 3 years ago by Asif Saifuddin Auvi

Replying to Aymeric Augustin:

If Claude has already prepared these changes, perhaps you should wait for his patch instead of duplicating his work?

Yes I talked with Claude on IRC to pause before his work is merged.

comment:32 in reply to:  4 Changed 3 years ago by Josh Smeaton

Replying to Anssi Kääriäinen:

I believe we can get rid of the Field.creation_counter hack. In Python 3 it is possible to store the attrs in a sorted dictionary. See http://stackoverflow.com/questions/4459531/how-to-read-class-attributes-in-the-same-order-as-declared.

We could also remove this when we support python 3.6, as class attributes retain their order. I'm guessing this is a consequence (or the cause of) dictionaries retaining insertion order. https://docs.python.org/3.6/whatsnew/3.6.html#pep-520-preserving-class-attribute-definition-order

comment:33 Changed 3 years ago by Claude Paroz <claude@…>

In d7b9aaa:

Refs #23919 -- Removed encoding preambles and future imports

comment:34 Changed 3 years ago by Claude Paroz <claude@…>

In f3c43ad:

Refs #23919 -- Removed python_2_unicode_compatible decorator usage

comment:35 Changed 3 years ago by Tim Graham

Triage Stage: Someday/MaybeAccepted

PR for removing Python 2 references from docs.

comment:36 Changed 3 years ago by Claude Paroz <claude@…>

In c716fe87:

Refs #23919 -- Removed six.PY2/PY3 usage

Thanks Tim Graham for the review.

comment:37 Changed 3 years ago by GitHub <noreply@…>

In f6acd1d:

Refs #23919 -- Removed Python 2 notes in docs.

comment:38 Changed 3 years ago by Claude Paroz <claude@…>

In 7b2f2e74:

Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews.

comment:39 Changed 3 years ago by Claude Paroz <claude@…>

In 2b281cc3:

Refs #23919 -- Removed most of remaining six usage

Thanks Tim Graham for the review.

comment:40 Changed 3 years ago by Aymeric Augustin

Description: modified (diff)
Note: See TracTickets for help on using tickets.
Back to Top