Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-python/pyro/ChangeLog6
-rw-r--r--dev-python/pyro/Manifest17
-rw-r--r--dev-python/pyro/files/4.20-0001-Use-unittest2-for-older-Python-version.patch354
-rw-r--r--dev-python/pyro/pyro-4.20.ebuild8
4 files changed, 377 insertions, 8 deletions
diff --git a/dev-python/pyro/ChangeLog b/dev-python/pyro/ChangeLog
index ee8b5e6ae6d7..a893bbe9f20b 100644
--- a/dev-python/pyro/ChangeLog
+++ b/dev-python/pyro/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pyro
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.86 2013/07/10 14:30:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.87 2013/07/18 19:33:31 aidecoe Exp $
+
+ 18 Jul 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> pyro-4.20.ebuild,
+ +files/4.20-0001-Use-unittest2-for-older-Python-version.patch:
+ Fixed tests for Python 2.6 and 3.1.
*pyro-4.20 (10 Jul 2013)
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 5c0144a50dfb..ce36b6913436 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX 4.20-0001-Use-unittest2-for-older-Python-version.patch 11402 SHA256 e85d7ccc913449f7b6960f2c2aaf1b0604e4533f0c616c2dca30c6052c39ef2d SHA512 cdc894f7fef27ec84e24687a9674ac92fed7d17eda290a2f8ecc289f7bda7dff78e255a3ae4e951b3b4f572e27f2ccaa63508d9cf3156b0eef11889824270c4e WHIRLPOOL 949bca82d430d85f24587875d223bb9f27766eeec087416bb196c71ff442853364ca93a3e4b45386ed3f2dd9b1af1de6c63ad42a5e1ea99a79aa3446d93e9669
DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 WHIRLPOOL 0d7efcead6bc7a31a690c012a4213c835d43ca932e461ab25ddb2e12636970de2c3da6feb4915385bdadaf2261558d2041d5e6dad9899f11e450aa0a065460da
DIST Pyro4-4.11.tar.gz 262099 SHA256 d84ccfe85b14b3cb086f98d70dbf05671d6cb8498bd6f20f0041d6010dd320da SHA512 196417ce0c289d4a2fbb1e3fbf1d04e4168a8a6a8c64c23ed0205b7b839602fcde587766fc0d6ffa0f38fc72586d7050523becb560682d175967101b78a4d386 WHIRLPOOL 4f3532d82dad196b1862b9290fb89db1af4d94890c83b1ffb5b3687d209f06af474a857ef6542819d9c01cf4e463d34b6f5edf7344a22ba163e22e5bcc44e017
DIST Pyro4-4.17.tar.gz 273775 SHA256 1d0cecdd3340dca695d6f833830e7a59f937d4bedbcff53109abe66e5a65d22c SHA512 653a098d8f424845bc14307bb75baeee4536e1115ffbb2580c9db68cce991f980aaabd6f105285c0574761d99c17eaa62321a5f50a10f38076d6e5146b06970f WHIRLPOOL 7d3839e6ccf58df9c48f59374a7b840178993ed96362b7710f845d0fed4350ae4a29ac7dacdf2ba401dcc1aac78943d6a45581e372cd82372527625fb773d0e3
@@ -11,14 +12,18 @@ EBUILD pyro-3.16.ebuild 1036 SHA256 aa5d2c23c3c186cd2a656c877ac595ad6682aa6795b5
EBUILD pyro-4.11.ebuild 1976 SHA256 e3eeeb22612bea8f9a5cad9e9709d85ec2de26df063adebe637fdda6af5b32e5 SHA512 160004568ebb123f4bb6318272a0239d18c8b766ce067208628258ac07e1195cac5cdba65a29a534e6837c90dc9e59a6a9e39ffc6dae0fb31c8e1944d71789e5 WHIRLPOOL 7be1b6815f46c10235418626138eb21d46f8f0954c443639ffff7f04f30a52c969cdc64d535bf90f9382d9fd2918d35508b2351fca6e492c723e73d446f99c16
EBUILD pyro-4.17-r1.ebuild 1969 SHA256 a521dd743a042f1eec1866213ca92944d3793e40d0a39591f2042ea2bb9a5592 SHA512 91d7ef052fe6ca9587152703cb84413fee9c2986555cb17aca1eb706b63f5fdb1839063f31705cc0b72fb2b216adadba8439938aaf9304122ca106c89ade9dac WHIRLPOOL 13827b80358027e5d72ff0e83d79bf183312b7e3cc22cc0528be77dd3087628c88f5ffacfb94dd1796567205998eadd7aba38eda4668bbfcc82df67254ab0adf
EBUILD pyro-4.17.ebuild 1975 SHA256 8d5195879eec73bbad668c40ad206d897446a053d02a403db9e092cc458d6891 SHA512 565ec78ee7d3751d293cd0a0bfa1ea835029418bdcbd187734234ffb378499a1d69a993f00ad6c87d01003aa8821501f917eae739befe1bf7d1d6dd7ce2f2f6e WHIRLPOOL 814735ca2fae71d2e1536a2f7b95a51d1bed6a6cc1c88a9279275145f4c52e9ea5cc28d3b2fad1c6ad44d0591b79573cfd7256d4e3920cef1fcc712fc749c0df
-EBUILD pyro-4.20.ebuild 2009 SHA256 c8a387f3517d8a2bba2d4b05d04b24a58b4ca84a9634c70eebc8e38a61a58639 SHA512 6ebcb4a4070291cf1c2179f62bed13460b3e74a2472c9001b34e539b395f23b086f3438ce2d8c43b2b7ebc309ce2c2143c66caa5597ecd6af265f4ce2b338e87 WHIRLPOOL 2de5367e052aa1315480aa4b300cda70b69b8b54d8fd4c49a1ea41ba22851babfca06991affcd56840ed7802abdb6b7add386af54dfa7565771c243056e99726
+EBUILD pyro-4.20.ebuild 2252 SHA256 d5f5c0fc756e981faccd83e5761ff8c24f70175d9eb600aaf1b01f05486f9ee5 SHA512 a9af50f06a93e6f77b03c3c622ee180031027833ab39481b6e52662ecf60cabc2ad7fce905f1bbe72606c256a668ae5cff9e3e13368d80541364b4f3ec4c4142 WHIRLPOOL 94b85e51c087f90e1f7ae385d4381ff132e9ed4fa66d87a4c445efc8e5234a42279f5aee24dd282cf5bf361686954cc63b12e8c54ad3fc9e5d55e71ff7aae331
EBUILD pyro-4.8.ebuild 1978 SHA256 1033178299c6bbc4d7aee4678988a7c9ace0d11d1a97289c12f1e100c4089f0b SHA512 bd4cee708ee75b0b971811881ec6ed450f53a3cae25fb8ac619e0811a0d887f812c121133393c652fc6f9f70fa743227118a664d1b714083266618b4b388c0fa WHIRLPOOL c4f01e05f8df20cdacc3852309181144dc0a48f6e0a60365204fc212969f4a86eb7822593a7aec62524968f8ab172f091e376035926fbe07440c5da6c60c614c
-MISC ChangeLog 13430 SHA256 198325053643aa172b77ff3d40039ce0db658f089d7793facdbbc5d0dba45c0e SHA512 f4645943b5de575415323f6d1cc6b8282803834ccbcbb18b37e9b949760f707b42acbafcfda4eace1dbb52e33607a22e8db308d12e0bf376980ee3c673ff3c53 WHIRLPOOL d7bec83b3b46ba2168ef49480cfff6d3639b94d86a6ff92394544ee37a7dfc730a71ceb46382d0b7de2fc6842d84026bc4c5475c9223ed8f9a3c9bdbc46d23ad
+MISC ChangeLog 13609 SHA256 a22e0f64c824db9594c0daec53d97582aec9956c44647dc7d5f0c2f64867de6d SHA512 b9e85d9e4be573d6a737f130236a4c73cbc0291b06d87e692e2c741752c07cb9f63a9ec9057ccdd2d5a5dff784aa6f54f3a21220f1af16190cf0e9d51972c121 WHIRLPOOL 36cfb6766a6ed368fa57af0ec49b05545721e0c03c310a9ac387f4c6d9d0e26d1a4976b292293066ef330ef211a3252acbbdf38e5e3fb34743c582755cd25fda
MISC metadata.xml 339 SHA256 a1c442dc950a4581ae9e312d05ea3ee1fafed4b39a515b130cb98902ba7b13b7 SHA512 985041c771f508ab36cfa012e903496dc19cfaf8f02f952e8f428219b4b6b3c585da6a1a2a46a22fb17a9c2dba4af068ad87379d62cdcb978c883db62f10c75a WHIRLPOOL ef88f1522163e8ea82e46a1224250393bb020df0f66230e0132bd90056adab217a2f6c4ad5816c00b3a3d366f6fb85398b6073e208614807bf0c5be7e12dae76
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHdb/YACgkQso7CE7gHKw0e6QCgxlfrmjYTrNCc80+FRksOXORL
-i6MAniCIEk/b7cJ0D7fnudh4PTDpdFo+
-=m+fz
+iQEcBAEBCAAGBQJR6EMMAAoJEPATRTHh2/q1m9YIAIlio/52ZCbYN5o8r1nydT68
+ich3u+WHrxIoh7fXC8zL2sXZCgMotmwp0NfwNodScUg8IyR3lqf392VC/VhAprtH
+xkIWxL3NDX1YhMjXWNBh/t8Y8dQY+6B/u76UNAG/gGK15O6Nr5tyiGywsJF3Snwd
+p6JN/QmgzbTH9ZLfWBEl2uPYAFLS0fMqCrb0U3nqCLhcSkZB9tpdkoYhdCS88tcO
+VvUKghlVIR9sNl4W/sO9719SIuCj335UlwO/z3d1bWGna1If9hHbNbNsUPi1FP3E
+Qi0oFPN9I8a+XKCz4Jj9yMabqSYd3isBcQHcJ9f1qkEhdlC5hQzLXjPJHjJboyQ=
+=FP2f
-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..554ea01321a6
--- /dev/null
+++ b/dev-python/pyro/files/4.20-0001-Use-unittest2-for-older-Python-version.patch
@@ -0,0 +1,354 @@
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
+ import copy
+ import logging
+ import os, sys, time
+@@ -17,6 +16,11 @@ import Pyro4.constants
+ import Pyro4.futures
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ if sys.version_info>=(3,0):
+ import imp
+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).
+ """
+
+ from __future__ import with_statement
++import sys
+ import os, time, socket
+-import unittest
+ import Pyro4.core
+ import Pyro4.constants
+ import Pyro4.socketutil
+ from Pyro4.errors import DaemonError,PyroError
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class MyObj(object):
+ def __init__(self, arg):
+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).
+ """
+
+-import unittest
++import sys
+ import time
+ import Pyro4.test.echoserver as echoserver
+ import Pyro4
+ from threading import Thread,Event
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class EchoServerThread(Thread):
+ def __init__(self):
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
+ import Pyro4.utils.flame
+ import Pyro4.utils.flameserver
+ import Pyro4.errors
++import sys
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class FlameDisabledTests(unittest.TestCase):
+ def testFlameDisabled(self):
+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).
+ """
+
+-import unittest
+ import sys
+ import pickle
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ if sys.platform=="cli":
+
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
++import sys
+ import time
+ import Pyro4.core
+ import Pyro4.naming
+@@ -15,6 +15,11 @@ from Pyro4.errors import NamingError
+ from Pyro4 import threadutil
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class NSLoopThread(threadutil.Thread):
+ def __init__(self, nameserver):
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
+ import sys, select, os
+ import Pyro4.core
+ import Pyro4.naming
+@@ -15,6 +14,11 @@ import Pyro4.socketutil
+ from Pyro4.errors import NamingError,PyroError
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class OfflineNameServerTests(unittest.TestCase):
+ def setUp(self):
+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).
+ """
+
+-import unittest
+ import Pyro4
+ import Pyro4.constants
+ import Pyro4.core
+@@ -14,7 +13,13 @@ import Pyro4.nsc
+ import Pyro4.socketutil
+ import Pyro4.threadutil
+ import Pyro4.util
++import sys
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class TestPackage(unittest.TestCase):
+ def testPyro4(self):
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
+ import sys
+ import pprint
+ import Pyro4.util
+@@ -13,6 +12,11 @@ import Pyro4.errors
+ import Pyro4.core
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class SerializeTests_pickle(unittest.TestCase):
+ SERIALIZER="pickle"
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
+ import Pyro4.core
+ import Pyro4.errors
+ import Pyro4.util
+@@ -13,6 +12,11 @@ import time, os, sys, platform
+ from Pyro4 import threadutil
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class MyThing(object):
+ def __init__(self):
+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).
+ """
+
+-import unittest
++import sys
+ import os
+ import test_server
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ class ServerTestsThreadTimeout(test_server.ServerTestsThreadNoTimeout):
+ SERVERTYPE="thread"
+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).
+ """
+
+-import unittest
+ import socket, os, sys
+ import Pyro4.socketutil as SU
+ from Pyro4 import threadutil
+@@ -13,6 +12,11 @@ from Pyro4.socketserver.threadpoolserver import SocketServer_Threadpool
+ import Pyro4
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ # determine ipv6 capability
+ has_ipv6 = socket.has_ipv6
+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).
+ """
+
+ from __future__ import with_statement
+-import unittest
++import sys
+ import time
+ import random
+ from Pyro4.tpjobqueue import ThreadPooledJobQueue, JobQueueError
+ import Pyro4.threadutil
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ MIN_POOL_SIZE = 5
+ MAX_POOL_SIZE = 10
+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).
+ """
+
+-import unittest
+-
+ import sys, imp, os, platform
+ import Pyro4.util
+ from testsupport import *
+
++if (sys.version_info >= (2, 7) and sys.version_info < (3, 0)) or \
++ (sys.version_info >= (3, 1)):
++ import unittest
++else:
++ import unittest2 as unittest
+
+ if not hasattr(imp,"reload"):
+ imp.reload=reload # python 2.5 doesn't have imp.reload
+--
+1.8.2.1
+
diff --git a/dev-python/pyro/pyro-4.20.ebuild b/dev-python/pyro/pyro-4.20.ebuild
index 64cda8984874..ed7ff14bb6f6 100644
--- a/dev-python/pyro/pyro-4.20.ebuild
+++ b/dev-python/pyro/pyro-4.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.20.ebuild,v 1.1 2013/07/10 14:30:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.20.ebuild,v 1.2 2013/07/18 19:33:31 aidecoe Exp $
EAPI=5
@@ -27,12 +27,18 @@ DEPEND="${RDEPEND}
test? (
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
+ python_targets_python2_6? (
+ dev-python/unittest2[python_targets_python2_6] )
+ python_targets_python3_1? (
+ dev-python/unittest2[python_targets_python3_1] )
)"
S="${WORKDIR}/${MY_P}"
DISTUTILS_IN_SOURCE_BUILD=1
python_prepare_all() {
+ epatch "${FILESDIR}/${PV}-0001-Use-unittest2-for-older-Python-version.patch"
+
sed \
-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
-i tests/run_suite.py || die