summaryrefslogtreecommitdiffstats
path: root/debian/patches/debian/0002-setuptools-60.patch
blob: 60276502cef18890fdf63b0bef7c953f5dd621c7 (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
Author: Stefano Rivera <stefanor@debian.org>
Description: Import setuptools before distutils (Closes: #1022491).
 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.
 .
 https://github.com/deluge-torrent/deluge/pull/400

diff -Naurp deluge.orig/setup.py deluge/setup.py
--- deluge.orig/setup.py
+++ deluge/setup.py
@@ -12,14 +12,15 @@ import glob
 import os
 import platform
 import sys
-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 shutil import rmtree, which
 
 from setuptools import Command, find_packages, setup
 from setuptools.command.test import test as _test
 
+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
+
 import msgfmt
 from version import get_version