blob: af27c9e42e5d32e5cef5000bb6419047f531b64d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From: Stefano Rivera <stefanor@debian.org>
Date: Sat, 12 Nov 2022 22:34:04 +0200
Subject: Import setuptools before distutils
setuptools 60 uses its own bundled version of distutils, by default. It
injects this into sys.modules, at import time. So we need to make sure
that it is imported, before anything else imports distutils, to ensure
everything is using the same distutils version.
This change in setuptools is to prepare for Python 3.12, which will drop
distutils.
Bug-Debian: https://bugs.debian.org/1022491
Forwarded: https://github.com/deluge-torrent/deluge/pull/400
---
setup.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
index 5cae466..fb49f10 100755
--- a/setup.py
+++ b/setup.py
@@ -15,15 +15,16 @@ import glob
import os
import platform
import sys
+from shutil import rmtree
+
+from setuptools import find_packages, setup
+from setuptools.command.test import test as _test
+
from distutils import cmd
from distutils.command.build import build as _build
from distutils.command.clean import clean as _clean
from distutils.command.install_data import install_data as _install_data
from distutils.spawn import find_executable
-from shutil import rmtree
-
-from setuptools import find_packages, setup
-from setuptools.command.test import test as _test
import msgfmt
from version import get_version
|
