dev-python/pyro: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/2363

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-python/pyro/files/4.20-0001-Use-unittest2-for-older-Python-version.patch b/dev-python/pyro/files/4.20-0001-Use-unittest2-for-older-Python-version.patch
deleted file mode 100644 (file)
index 554ea01..0000000
--- a/dev-python/pyro/files/4.20-0001-Use-unittest2-for-older-Python-version.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From d27de91579bd64397a9554b6c6a2257f098dbaad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 18 Jul 2013 20:19:03 +0200
-Subject: [PATCH] Use unittest2 for older Python versions.
-
----
- tests/PyroTests/test_core.py           | 6 +++++-
- tests/PyroTests/test_daemon.py         | 7 ++++++-
- tests/PyroTests/test_echoserver.py     | 7 ++++++-
- tests/PyroTests/test_flame.py          | 7 ++++++-
- tests/PyroTests/test_ironpython.py     | 6 +++++-
- tests/PyroTests/test_naming.py         | 7 ++++++-
- tests/PyroTests/test_naming2.py        | 6 +++++-
- tests/PyroTests/test_package.py        | 7 ++++++-
- tests/PyroTests/test_serialize.py      | 6 +++++-
- tests/PyroTests/test_server.py         | 6 +++++-
- tests/PyroTests/test_server_timeout.py | 7 ++++++-
- tests/PyroTests/test_socket.py         | 6 +++++-
- tests/PyroTests/test_tpjobqueue.py     | 7 ++++++-
- tests/PyroTests/test_util.py           | 7 +++++--
- 14 files changed, 77 insertions(+), 15 deletions(-)
-
-diff --git a/tests/PyroTests/test_core.py b/tests/PyroTests/test_core.py
-index cbcbded..a0b801f 100644
---- a/tests/PyroTests/test_core.py
-+++ b/tests/PyroTests/test_core.py
-@@ -5,7 +5,6 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
- import copy\r
- import logging\r
- import os, sys, time\r
-@@ -17,6 +16,11 @@ import Pyro4.constants
- import Pyro4.futures\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- if sys.version_info>=(3,0):\r
-     import imp\r
-diff --git a/tests/PyroTests/test_daemon.py b/tests/PyroTests/test_daemon.py
-index cf7c06e..05472fd 100644
---- a/tests/PyroTests/test_daemon.py
-+++ b/tests/PyroTests/test_daemon.py
-@@ -5,14 +5,19 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
-+import sys\r
- import os, time, socket\r
--import unittest\r
- import Pyro4.core\r
- import Pyro4.constants\r
- import Pyro4.socketutil\r
- from Pyro4.errors import DaemonError,PyroError\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class MyObj(object):\r
-     def __init__(self, arg):\r
-diff --git a/tests/PyroTests/test_echoserver.py b/tests/PyroTests/test_echoserver.py
-index abca795..5e58e24 100644
---- a/tests/PyroTests/test_echoserver.py
-+++ b/tests/PyroTests/test_echoserver.py
-@@ -4,13 +4,18 @@ Tests for the built-in test echo server.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
-+import sys\r
- import time\r
- import Pyro4.test.echoserver as echoserver\r
- import Pyro4\r
- from threading import Thread,Event\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class EchoServerThread(Thread):\r
-     def __init__(self):\r
-diff --git a/tests/PyroTests/test_flame.py b/tests/PyroTests/test_flame.py
-index 2406bae..fdc611f 100644
---- a/tests/PyroTests/test_flame.py
-+++ b/tests/PyroTests/test_flame.py
-@@ -5,12 +5,17 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
- import Pyro4.utils.flame\r
- import Pyro4.utils.flameserver\r
- import Pyro4.errors\r
-+import sys\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class FlameDisabledTests(unittest.TestCase):\r
-     def testFlameDisabled(self):\r
-diff --git a/tests/PyroTests/test_ironpython.py b/tests/PyroTests/test_ironpython.py
-index 70dff4f..8343729 100644
---- a/tests/PyroTests/test_ironpython.py
-+++ b/tests/PyroTests/test_ironpython.py
-@@ -4,10 +4,14 @@ Tests for some Ironpython peculiarities.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
- import sys\r
- import pickle\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- if sys.platform=="cli":\r
- \r
-diff --git a/tests/PyroTests/test_naming.py b/tests/PyroTests/test_naming.py
-index d61fa99..fb5b580 100644
---- a/tests/PyroTests/test_naming.py
-+++ b/tests/PyroTests/test_naming.py
-@@ -5,7 +5,7 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
-+import sys\r
- import time\r
- import Pyro4.core\r
- import Pyro4.naming\r
-@@ -15,6 +15,11 @@ from Pyro4.errors import NamingError
- from Pyro4 import threadutil\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class NSLoopThread(threadutil.Thread):\r
-     def __init__(self, nameserver):\r
-diff --git a/tests/PyroTests/test_naming2.py b/tests/PyroTests/test_naming2.py
-index afa0b22..ae398ac 100644
---- a/tests/PyroTests/test_naming2.py
-+++ b/tests/PyroTests/test_naming2.py
-@@ -5,7 +5,6 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
- import sys, select, os\r
- import Pyro4.core\r
- import Pyro4.naming\r
-@@ -15,6 +14,11 @@ import Pyro4.socketutil
- from Pyro4.errors import NamingError,PyroError\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class OfflineNameServerTests(unittest.TestCase):\r
-     def setUp(self):\r
-diff --git a/tests/PyroTests/test_package.py b/tests/PyroTests/test_package.py
-index 9ab3bba..052eebf 100644
---- a/tests/PyroTests/test_package.py
-+++ b/tests/PyroTests/test_package.py
-@@ -4,7 +4,6 @@ Tests for the package structure and import names.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
- import Pyro4\r
- import Pyro4.constants\r
- import Pyro4.core\r
-@@ -14,7 +13,13 @@ import Pyro4.nsc
- import Pyro4.socketutil\r
- import Pyro4.threadutil\r
- import Pyro4.util\r
-+import sys\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class TestPackage(unittest.TestCase):\r
-     def testPyro4(self):\r
-diff --git a/tests/PyroTests/test_serialize.py b/tests/PyroTests/test_serialize.py
-index 4fea39c..f05c84a 100644
---- a/tests/PyroTests/test_serialize.py
-+++ b/tests/PyroTests/test_serialize.py
-@@ -5,7 +5,6 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
- import sys\r
- import pprint\r
- import Pyro4.util\r
-@@ -13,6 +12,11 @@ import Pyro4.errors
- import Pyro4.core\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class SerializeTests_pickle(unittest.TestCase):\r
-     SERIALIZER="pickle"\r
-diff --git a/tests/PyroTests/test_server.py b/tests/PyroTests/test_server.py
-index d1ebfcc..b2dd661 100644
---- a/tests/PyroTests/test_server.py
-+++ b/tests/PyroTests/test_server.py
-@@ -5,7 +5,6 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
- import Pyro4.core\r
- import Pyro4.errors\r
- import Pyro4.util\r
-@@ -13,6 +12,11 @@ import time, os, sys, platform
- from Pyro4 import threadutil\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class MyThing(object):\r
-     def __init__(self):\r
-diff --git a/tests/PyroTests/test_server_timeout.py b/tests/PyroTests/test_server_timeout.py
-index daa5a8d..dd5ee34 100644
---- a/tests/PyroTests/test_server_timeout.py
-+++ b/tests/PyroTests/test_server_timeout.py
-@@ -4,10 +4,15 @@ Tests for a running Pyro server, with timeouts.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
-+import sys\r
- import os\r
- import test_server\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- class ServerTestsThreadTimeout(test_server.ServerTestsThreadNoTimeout):\r
-     SERVERTYPE="thread"\r
-diff --git a/tests/PyroTests/test_socket.py b/tests/PyroTests/test_socket.py
-index 4d44139..b487686 100644
---- a/tests/PyroTests/test_socket.py
-+++ b/tests/PyroTests/test_socket.py
-@@ -4,7 +4,6 @@ Tests for the low level socket functions.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
- import socket, os, sys\r
- import Pyro4.socketutil as SU\r
- from Pyro4 import threadutil\r
-@@ -13,6 +12,11 @@ from Pyro4.socketserver.threadpoolserver import SocketServer_Threadpool
- import Pyro4\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- # determine ipv6 capability\r
- has_ipv6 = socket.has_ipv6\r
-diff --git a/tests/PyroTests/test_tpjobqueue.py b/tests/PyroTests/test_tpjobqueue.py
-index 8ab7f7b..7cdc3bb 100644
---- a/tests/PyroTests/test_tpjobqueue.py
-+++ b/tests/PyroTests/test_tpjobqueue.py
-@@ -5,12 +5,17 @@ Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
- """\r
- \r
- from __future__ import with_statement\r
--import unittest\r
-+import sys\r
- import time\r
- import random\r
- from Pyro4.tpjobqueue import ThreadPooledJobQueue, JobQueueError\r
- import Pyro4.threadutil\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- MIN_POOL_SIZE = 5\r
- MAX_POOL_SIZE = 10\r
-diff --git a/tests/PyroTests/test_util.py b/tests/PyroTests/test_util.py
-index ac1e639..497ec4a 100644
---- a/tests/PyroTests/test_util.py
-+++ b/tests/PyroTests/test_util.py
-@@ -4,12 +4,15 @@ Tests for the utility functions.
- Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).\r
- """\r
- \r
--import unittest\r
--\r
- import sys, imp, os, platform\r
- import Pyro4.util\r
- from testsupport import *\r
- \r
-+if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \\r
-+        (sys.version_info >= (3, 1)):\r
-+    import unittest\r
-+else:\r
-+    import unittest2 as unittest\r
- \r
- if not hasattr(imp,"reload"):\r
-     imp.reload=reload   # python 2.5 doesn't have imp.reload\r
--- 
-1.8.2.1
-