summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-06-04 07:47:43 +0200
committerMichał Górny <mgorny@gentoo.org>2020-06-04 08:23:48 +0200
commit7603a6f3a0af50e49d9b8257195a859b55328cf5 (patch)
tree9237e47c7649b8293b609d9044235bec3795f996 /dev-python/twisted/files
parentdev-python/python-lzo: Port to py39 (diff)
downloadgentoo-7603a6f3a0af50e49d9b8257195a859b55328cf5.tar.gz
gentoo-7603a6f3a0af50e49d9b8257195a859b55328cf5.tar.bz2
gentoo-7603a6f3a0af50e49d9b8257195a859b55328cf5.zip
dev-python/twisted: Remove old
Bug: https://bugs.gentoo.org/711760 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/twisted/files')
-rw-r--r--dev-python/twisted/files/test_main.patch73
-rw-r--r--dev-python/twisted/files/trial22
-rw-r--r--dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch11
-rw-r--r--dev-python/twisted/files/twisted-16.6.0-test-fixes.patch282
-rw-r--r--dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch74
-rw-r--r--dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch47
-rw-r--r--dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch25
-rw-r--r--dev-python/twisted/files/utf8_overrides.patch64
8 files changed, 0 insertions, 598 deletions
diff --git a/dev-python/twisted/files/test_main.patch b/dev-python/twisted/files/test_main.patch
deleted file mode 100644
index bfef40450d52..000000000000
--- a/dev-python/twisted/files/test_main.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2c3c28f5dbbd61bcfa5c548d1d423fffbaf2132d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:32:18 -0700
-Subject: [PATCH] tests/test_main.py: Fix test_twisted to handle differntly
- sorted options
-
-Some systems retuned the usage with '__main__.py' instead of the command 'trial'
-So, substitute that out if it exists.
-The options returned via python can be a different sort order than is output via the
-command --help. So break up the lines into a list and check equality, lines are neither
-missing or extra.
----
- src/twisted/test/test_main.py | 34 ++++++++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_main.py b/src/twisted/test/test_main.py
-index 572769018..b010a389e 100644
---- a/src/twisted/test/test_main.py
-+++ b/src/twisted/test/test_main.py
-@@ -18,6 +18,10 @@ from twisted.trial.unittest import TestCase
-
- class MainTests(TestCase):
- """Test that twisted scripts can be invoked as modules."""
-+ # this test just does not work correctly on Gentoo
-+ # the output has '__main__.py' instead of 'trial'
-+ # I have only been able to get 2.7 working correctly
-+ # with replacing the value with what is expected.
- def test_twisted(self):
- """Invoking python -m twisted should execute twist."""
- cmd = sys.executable
-@@ -28,11 +32,37 @@ class MainTests(TestCase):
-
- def processEnded(ign):
- f = p.outF
-- output = f.getvalue().replace(b'\r\n', b'\n')
-+ # Some systems may return __main__.py instead of the command name expected
-+ output = f.getvalue().replace(b'\r\n', b'\n').replace(b"__main__.py", b"trial")
-
- options = TwistOptions()
- message = '{}\n'.format(options).encode('utf-8')
-- self.assertEqual(output, message)
-+ # NOTE: python may return the options in a different order
-+ # than is output via the command --help option
-+ # so we must break up the text and compare that lines
-+ # are not missing or extra from what is expected
-+ a = output.split(b'\n')
-+ b = message.split(b'\n')
-+ extras = []
-+ missing = []
-+ equal_len = (len(a) == len(b))
-+ for i in a:
-+ if i not in b:
-+ extras.append(i)
-+ for i in b:
-+ if i not in a:
-+ missing.append(i)
-+
-+ self.assertTrue(equal_len,
-+ msg="Usage reported a different number of lines than expected")
-+ self.assertTrue(extras == [],
-+ msg="Usage returned these extra lines not expected: %s"
-+ % '\n'.join(extras)
-+ )
-+ self.assertTrue(missing == [],
-+ msg="Usage was missing these expected lines: %s"
-+ % '\n'.join(missing)
-+ )
- return d.addCallback(processEnded)
-
- def test_twisted_import(self):
---
-2.12.1
-
diff --git a/dev-python/twisted/files/trial b/dev-python/twisted/files/trial
deleted file mode 100644
index 8da58861abf6..000000000000
--- a/dev-python/twisted/files/trial
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) Twisted Matrix Laboratories.
-# See LICENSE for details.
-import os, sys
-
-try:
- import _preamble
-except ImportError:
- try:
- sys.exc_clear()
- except AttributeError:
- # exc_clear() (and the requirement for it) has been removed from Py3
- pass
-
-# begin chdir armor
-sys.path[:] = map(os.path.abspath, sys.path)
-# end chdir armor
-
-sys.path.insert(0, os.path.abspath(os.getcwd()))
-
-from twisted.scripts.trial import run
-run()
diff --git a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index ed1a46840678..000000000000
--- a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/twisted/plugin.py
-+++ src/twisted/plugin.py
-@@ -180,7 +180,7 @@
- if pluginKey not in existingKeys:
- del dropinDotCache[pluginKey]
- needsWrite = True
-- if needsWrite:
-+ if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
- try:
- dropinPath.setContent(pickle.dumps(dropinDotCache))
- except:
diff --git a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch b/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
deleted file mode 100644
index 3ce04aa3f684..000000000000
--- a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From 91b6d8b5b9d602152fb7148c6e2921463b93a8a5 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 10:55:32 -0700
-Subject: [PATCH] twisted test overrides
-
----
- src/twisted/internet/test/test_gireactor.py | 3 ++-
- src/twisted/pair/test/test_ethernet.py | 9 +++++++++
- src/twisted/pair/test/test_ip.py | 8 ++++++++
- src/twisted/pair/test/test_rawudp.py | 10 +++++++++-
- src/twisted/pair/test/test_tuntap.py | 16 ++++++++++++++++
- src/twisted/python/test/test_dist3.py | 2 ++
- src/twisted/test/test_ident.py | 5 ++++-
- src/twisted/test/test_plugin.py | 6 ++++++
- src/twisted/test/test_policies.py | 5 +++++
- src/twisted/test/test_udp.py | 6 ++++++
- 10 files changed, 67 insertions(+), 3 deletions(-)
-
-diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
-index 43147fdce..6333218e7 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -39,6 +39,7 @@ from twisted.python.compat import _PY3
- if gireactor is None:
- skip = "gtk3/gi not importable"
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-
-
- class GApplicationRegistrationTests(ReactorBuilder, TestCase):
-@@ -103,7 +104,7 @@ class GApplicationRegistrationTests(ReactorBuilder, TestCase):
-
- self.runReactor(app, reactor)
-
-- if gtk3reactor is None:
-+ if gtk3reactor is None or EMERGE_TEST_OVERRIDE:
- test_gtkApplicationActivate.skip = (
- "Gtk unavailable (may require running with X11 DISPLAY env set)")
-
-diff --git a/src/twisted/pair/test/test_ethernet.py b/src/twisted/pair/test/test_ethernet.py
-index a4c3a5d19..fe9c57151 100644
---- a/src/twisted/pair/test/test_ethernet.py
-+++ b/src/twisted/pair/test/test_ethernet.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
-
- from twisted.python import components
- from twisted.pair import ethernet, raw
- from zope.interface import implementer
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-
- @implementer(raw.IRawPacketProtocol)
- class MyProtocol:
-@@ -221,3 +226,7 @@ class EthernetTests(unittest.TestCase):
- raise
- else:
- raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+
-+if EMERGE_TEST_OVERRIDE:
-+ EthernetTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_ip.py b/src/twisted/pair/test/test_ip.py
-index 0f192a357..0a99658ef 100644
---- a/src/twisted/pair/test/test_ip.py
-+++ b/src/twisted/pair/test/test_ip.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
-
- from twisted.python import components
- from twisted.pair import ip, raw
- from zope import interface
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-
- @interface.implementer(raw.IRawDatagramProtocol)
- class MyProtocol:
-@@ -432,3 +437,6 @@ class IPTests(unittest.TestCase):
- raise
- else:
- raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+ IPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_rawudp.py b/src/twisted/pair/test/test_rawudp.py
-index 15aae10f1..dade38618 100644
---- a/src/twisted/pair/test/test_rawudp.py
-+++ b/src/twisted/pair/test/test_rawudp.py
-@@ -1,12 +1,17 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
--
- #
-+
-+import os
-+
- from twisted.trial import unittest
-
- from twisted.internet import protocol
- from twisted.pair import rawudp
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-+
- class MyProtocol(protocol.DatagramProtocol):
- def __init__(self, expecting):
- self.expecting = list(expecting)
-@@ -325,3 +330,6 @@ class RawUDPTests(unittest.TestCase):
- raise
- else:
- raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+ RawUDPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_tuntap.py b/src/twisted/pair/test/test_tuntap.py
-index 5e2da6e0f..53e03a008 100644
---- a/src/twisted/pair/test/test_tuntap.py
-+++ b/src/twisted/pair/test/test_tuntap.py
-@@ -64,6 +64,7 @@ if platformSkip is None:
- else:
- skip = platformSkip
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-
-
- @implementer(IReactorFDSet)
-@@ -1417,3 +1418,18 @@ class RealIOSystemTests(IOSystemTestsMixin, SynchronousTestCase,
- """
- General L{_IInputOutputSystem} tests applied to L{_RealSystem}.
- """
-+
-+if EMERGE_TEST_OVERRIDE:
-+ RealIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ MemoryIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TapTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TunTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TunnelAddressEqualityTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TunnelAddressTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TuntapPortTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ TunnelTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ FakeTapDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ FakeTapDeviceWithPITests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ FakeTunDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ RealDeviceWithProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+ RealDeviceWithoutProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/python/test/test_dist3.py b/src/twisted/python/test/test_dist3.py
-index 3ce2bdd60..494674bc7 100644
---- a/src/twisted/python/test/test_dist3.py
-+++ b/src/twisted/python/test/test_dist3.py
-@@ -53,3 +53,5 @@ class ModulesToInstallTests(TestCase):
- test_exist.skip = "Only on Python 2"
- else:
- test_notexist.skip = "Only on Python 3"
-+
-+ModulesToInstallTests.skip = "This is an upstream distribution test only"
-diff --git a/src/twisted/test/test_ident.py b/src/twisted/test/test_ident.py
-index d86b840e5..3cc40261f 100644
---- a/src/twisted/test/test_ident.py
-+++ b/src/twisted/test/test_ident.py
-@@ -12,7 +12,7 @@ from twisted.protocols import ident
- from twisted.python import failure
- from twisted.internet import error
- from twisted.internet import defer
--from twisted.python.compat import NativeStringIO
-+from twisted.python.compat import NativeStringIO, _PY3
-
- from twisted.trial import unittest
- from twisted.test.proto_helpers import StringTransport
-@@ -216,6 +216,9 @@ class ProcMixinTests(unittest.TestCase):
- """
- L{ident.ProcServerMixin.lookup} uses the Linux TCP process table.
- """
-+ if not _PY3:
-+ # test is broken in py2.7
-+ return
- open_calls = []
-
- def mocked_open(*args, **kwargs):
-diff --git a/src/twisted/test/test_plugin.py b/src/twisted/test/test_plugin.py
-index a23caa72b..a6d61858c 100644
---- a/src/twisted/test/test_plugin.py
-+++ b/src/twisted/test/test_plugin.py
-@@ -29,6 +29,8 @@ else:
- On python 2, import caches don't need to be invalidated.
- """
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-
-
- class ITestPlugin(Interface):
-@@ -327,6 +329,8 @@ class PluginTests(unittest.TestCase):
- attainable, but an error should be logged to show that the cache
- couldn't be updated.
- """
-+ if EMERGE_TEST_OVERRIDE:
-+ return
- # Generate the cache
- plugin.getCache(self.module)
-
-@@ -580,6 +584,8 @@ class DeveloperSetupTests(unittest.TestCase):
- provide useful coverage on Windows due to the different meaning of
- "read-only directory".
- """
-+ if EMERGE_TEST_OVERRIDE:
-+ return
- self.unlockSystem()
- self.sysplug.child('newstuff.py').setContent(pluginFileContents('one'))
- self.lockSystem()
-diff --git a/src/twisted/test/test_policies.py b/src/twisted/test/test_policies.py
-index 3d92633d6..c08809a66 100644
---- a/src/twisted/test/test_policies.py
-+++ b/src/twisted/test/test_policies.py
-@@ -7,6 +7,8 @@ Test code for policies.
-
- from __future__ import division, absolute_import
-
-+import os
-+
- from zope.interface import Interface, implementer, implementedBy
-
- from twisted.python.compat import NativeStringIO
-@@ -23,6 +25,7 @@ try:
- except ImportError:
- import __builtin__ as builtins
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-
-
- class SimpleProtocol(protocol.Protocol):
-@@ -883,6 +886,8 @@ class LoggingFactoryTests(unittest.TestCase):
- automatically opens a unique log file for that protocol and attaches
- the logfile to the built protocol.
- """
-+ if EMERGE_TEST_OVERRIDE:
-+ return
- open_calls = []
- open_rvalues = []
-
-diff --git a/src/twisted/test/test_udp.py b/src/twisted/test/test_udp.py
-index 6cf4583b2..86b513704 100644
---- a/src/twisted/test/test_udp.py
-+++ b/src/twisted/test/test_udp.py
-@@ -8,6 +8,8 @@ Tests for implementations of L{IReactorUDP} and L{IReactorMulticast}.
-
- from __future__ import division, absolute_import
-
-+import os
-+
- from twisted.trial import unittest
-
- from twisted.python.compat import intToBytes
-@@ -15,6 +17,8 @@ from twisted.internet.defer import Deferred, gatherResults, maybeDeferred
- from twisted.internet import protocol, reactor, error, defer, interfaces, udp
- from twisted.python import runtime
-
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-
- class Mixin:
-
-@@ -699,3 +703,5 @@ if not interfaces.IReactorUDP(reactor, None):
- ReactorShutdownInteractionTests.skip = "This reactor does not support UDP"
- if not interfaces.IReactorMulticast(reactor, None):
- MulticastTests.skip = "This reactor does not support multicast"
-+elif EMERGE_TEST_OVERRIDE:
-+ MulticastTests.skip = "This reactor test does not work via FEATURES=test emerge twisted"
---
-2.12.1
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch b/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
deleted file mode 100644
index ea7a480abace..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e58956fe12af7b41f6c1735ba7b14cba69e82a5e Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@FreeBSD.org>
-Date: Fri, 6 Oct 2017 02:47:55 -0700
-Subject: [PATCH] Fix test on Python 3.6.3
-
----
- src/twisted/test/test_sslverify.py | 53 +++++++++++++++++++++++++++++------------------------
- 1 file changed, 29 insertions(+), 24 deletions(-)
-
-diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
-index aca56f5..3fdc480 100644
---- a/src/twisted/test/test_sslverify.py
-+++ b/src/twisted/test/test_sslverify.py
-@@ -3052,28 +3052,33 @@ class SelectVerifyImplementationTests(unittest.SynchronousTestCase):
- in self.flushWarnings()
- if warning["category"] == UserWarning)
-
-- if _PY3:
-- importError = (
-- "'import of 'service_identity' halted; None in sys.modules'")
-- else:
-- importError = "'No module named service_identity'"
--
-- expectedMessage = (
-- "You do not have a working installation of the "
-- "service_identity module: {message}. Please install it from "
-- "<https://pypi.python.org/pypi/service_identity> "
-- "and make sure all of its dependencies are satisfied. "
-- "Without the service_identity module, Twisted can perform only "
-- "rudimentary TLS client hostname verification. Many valid "
-- "certificate/hostname mappings may be rejected.").format(
-- message=importError)
-+ importErrors =[
-+ # Python 3.6.3
-+ "'import of service_identity halted; None in sys.modules'",
-+ # Python 3
-+ "'import of 'service_identity' halted; None in sys.modules'",
-+ # Python 2
-+ "'No module named service_identity'"
-+ ]
-
-- self.assertEqual(
-- (warning["message"], warning["filename"], warning["lineno"]),
--
-- # Make sure we're abusing the warning system to a sufficient
-- # degree: there is no filename or line number that makes sense for
-- # this warning to "blame" for the problem. It is a system
-- # misconfiguration. So the location information should be blank
-- # (or as blank as we can make it).
-- (expectedMessage, "", 0))
-+ expectedMessages = []
-+ for importError in importErrors:
-+ expectedMessages.append(
-+ "You do not have a working installation of the "
-+ "service_identity module: {message}. Please install it from "
-+ "<https://pypi.python.org/pypi/service_identity> "
-+ "and make sure all of its dependencies are satisfied. "
-+ "Without the service_identity module, Twisted can perform only"
-+ " rudimentary TLS client hostname verification. Many valid "
-+ "certificate/hostname mappings may be rejected.".format(
-+ message=importError))
-+
-+ self.assertIn(warning["message"], expectedMessages)
-+
-+ # Make sure we're abusing the warning system to a sufficient
-+ # degree: there is no filename or line number that makes sense for
-+ # this warning to "blame" for the problem. It is a system
-+ # misconfiguration. So the location information should be blank
-+ # (or as blank as we can make it).
-+ self.assertEqual(warning["filename"], "")
-+ self.assertEqual(warning["lineno"], 0)
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch b/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
deleted file mode 100644
index 7e3ec26bcfdb..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c7db4c055e92509e5c19a051cbebea53034994ba Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Wed, 25 Oct 2017 14:39:57 -0700
-Subject: [PATCH] python-2.7 utf-8 fixes
-
----
- src/twisted/test/test_twistd.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index 3a9d337..4b0cf28 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -1902,8 +1902,12 @@ class DaemonizeTests(unittest.TestCase):
- message is Unicode, the child encodes the message as ascii
- with backslash Unicode code points.
- """
-+ if sys.hexversion >= 0x3000000:
-+ reported_str = b'\u2022'
-+ else:
-+ reported_str = b'\xe2\x80\xa2'
- self.assertErrorWritten(raised=u"\u2022",
-- reported=b'1 RuntimeError: \\u2022')
-+ reported=b'1 RuntimeError: ' + reported_str)
-
-
-
-@@ -2003,9 +2007,15 @@ class DaemonizeTests(unittest.TestCase):
- unicode and too long, it's truncated by the child, even if
- this splits a unicode escape sequence.
- """
-+ if sys.hexversion >= 0x3000000:
-+ reported_str = b'\\u2022'
-+ length = 14
-+ else:
-+ reported_str = b'\xe2\x80\xa2'
-+ length = 28
- self.assertErrorWritten(
- raised=u"\u2022" * 30,
-- reported=b'1 RuntimeError: ' + b'\\u2022' * 14,
-+ reported=b'1 RuntimeError: ' + reported_str * length,
- )
-
-
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch b/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
deleted file mode 100644
index 318304e58df3..000000000000
--- a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cac07e9ef273b065eeebbeeaa27155c8402a36e1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 7 Jul 2018 11:37:23 -0700
-Subject: [PATCH] Disable writing of plugin cache
-
----
- src/twisted/plugin.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/plugin.py b/src/twisted/plugin.py
-index 82522ee..e5849d6 100644
---- a/src/twisted/plugin.py
-+++ b/src/twisted/plugin.py
-@@ -180,7 +180,7 @@ def getCache(module):
- if pluginKey not in existingKeys:
- del dropinDotCache[pluginKey]
- needsWrite = True
-- if needsWrite:
-+ if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
- try:
- dropinPath.setContent(pickle.dumps(dropinDotCache))
- except OSError as e:
---
-libgit2 0.26.4
-
diff --git a/dev-python/twisted/files/utf8_overrides.patch b/dev-python/twisted/files/utf8_overrides.patch
deleted file mode 100644
index 41f48cebfd84..000000000000
--- a/dev-python/twisted/files/utf8_overrides.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f8b2e95cc9bd1cbae565e1b4d576950961edc9a7 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:40:16 -0700
-Subject: [PATCH] UTF8 test overrides: The DaemonizeTests SafeStrTests tests
- may need to be run independantly
-
-Some other tests may leave python in a state that returns a different form of the b'\\u2022'
-bytestring (b'\xe2\x80\xa2') which causes the tests to fail.
-In StafeStrTests, the returned 't\\xfcst' != 't\xc3\xbcst' originally sent, but is just
-the unicode equivalent.
-
-This adds an environment override which can be used to skip these test during a full
-"trial twisted" run. The DaemonizeTests, SafeStrTests can then be run independantly
-with a clean python interpreter.
----
- src/twisted/test/test_reflect.py | 6 ++++++
- src/twisted/test/test_twistd.py | 3 +++
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/twisted/test/test_reflect.py b/src/twisted/test/test_reflect.py
-index ff0c7fc9e..0c13b949b 100644
---- a/src/twisted/test/test_reflect.py
-+++ b/src/twisted/test/test_reflect.py
-@@ -19,6 +19,9 @@ from twisted.python.reflect import (
- accumulateMethods, prefixedMethods, prefixedMethodNames,
- addMethodNamesToDict, fullyQualifiedName)
-
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
-+
-+
-
- class Base(object):
- """
-@@ -553,6 +556,9 @@ class SafeStrTests(TestCase):
- x = b't\xc3\xbcst'
- self.assertEqual(reflect.safe_str(x), x)
-
-+ if UTF8_OVERRIDES:
-+ test_workingUtf8_2.skip = "test_workingUtf8_2 requires to be run independantly of other tests"
-+
-
- def test_workingUtf8_3(self):
- """
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index b74fe4a08..d55be16b9 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -78,6 +78,7 @@ if getattr(os, 'setuid', None) is None:
- else:
- setuidSkip = None
-
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
-
-
- def patchUserDatabase(patch, user, uid, group, gid):
-@@ -1913,3 +1914,5 @@ class DaemonizeTests(unittest.TestCase):
-
- if _twistd_unix is None:
- DaemonizeTests.skip = "twistd unix support not available"
-+elif UTF8_OVERRIDES:
-+ DaemonizeTests.skip = "twistd.DaemonizeTests testing needs to be run separately"
---
-2.12.1
-