install phase tidied, un-needed removal of tests folders removed, test phase revised and fixed for py3 due to flaws in the source code's setup, includes the patch. Fixes Bugs #493500 by Nikoli and #476246 by Patrick

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 364 insertions, 40 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 807d3dc1ef32..6f06f248183d 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.99 2014/01/15 12:41:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.100 2014/04/01 11:17:49 idella4 Exp $
 
   15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bsddb3-6.0.0.ebuild:
   Stable for sparc, wrt bug #482056
@@ -47,7 +47,7 @@
 
   28 May 2013; Ian Delaney <idella4@gentoo.org> +bsddb3-5.3.0-r1.ebuild,
   bsddb3-5.3.0.ebuild:
-  revbump, migrate -> distutils-r1, tes fail cited wrt Bug #470976
+  revbump, migrate -> distutils-r1, test fail cited wrt Bug #470976
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> bsddb3-5.3.0.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index e78fb1e0b353..462994827f08 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX py3tests.patch 14369 SHA256 cc10cc7334d5485b5a485001721fdfb352dabdeaf6ef4992856a6ba8750a5c6e SHA512 15ffa14351e9822a9daf8409b2af5283133896d30b015ffc2e82ef971308840688bd58040ca42ab252d155e6f5460e07216dc8f70a3e8efc875f3807b8e09b03 WHIRLPOOL a5078b2f827d59dc4d1adad3659b1bcd62947969e7cfe2250a7c8da1f37b7a1e23393b0bef6f07113df49e84751d0f29c547563d4b07e7aa4feaf53e4e5ca9d6
 DIST bsddb3-5.1.2.tar.gz 380258 SHA256 98f3401f910a0002a09cd6e947023f8eb266f10d1dac468c65d6e191b5f25a17 SHA512 6deb214efe6b477e82a6c2f3c142958e4748ff0f01686817c4a57d66954a26733513a57eeb7f94c8b39737f976df8d4d76fa1513069f8f778a66cda1dd91a92c WHIRLPOOL 4f2870ec124204ac88a87281379fd7421b7d6dd7489f5015617d498c2037684f330fb85a824d661e48a602b65f608dc00877725a7b2a11f5e237fee03c2ebc06
 DIST bsddb3-5.2.0.tar.gz 377968 SHA256 6e1522c4b826d06bef4cb7ae13eadde29c5f2c65916c894c11118b8b866ed6cb SHA512 b650da5e7690dfe3250e91be429170c94f71e6f5924277303940e130a4fd95b4195214012e7712e5ae71071bc8ee7a0096d625039832680a06cb08df1a99d655 WHIRLPOOL 4db52052fa08707195a769a2b642bf9978c626bf2fbede955abff89b58803c75d25b67fd9024c773d9cff35a0bad2fea9289e8739a387aeabbb8a86752a9e673
 DIST bsddb3-5.3.0.tar.gz 385113 SHA256 4619f6189e5f94e337c62ae398ccb9c25568f3c3cab39970a4ea7625d38f8b3e SHA512 e12f3795d67154b799f63e11a58a4cc8839b01f90745f0bb19047ccfb74315ad8f0db9a8c60f423d1b9da2982d6bd1b469b74e25bcd5824239a333b6721e1e8f WHIRLPOOL fd130a128ae7e6414b27c7f85cef9e7a7bd33e915db878d7a41d88aeaddbc782539ce02a227664b85f18ba802dcec9e2d122622b5948d22afcec4c540816373d
@@ -11,23 +12,13 @@ EBUILD bsddb3-5.2.0.ebuild 1684 SHA256 649130f02f887efde7c23daf7798c067cccaa812b
 EBUILD bsddb3-5.3.0-r1.ebuild 1928 SHA256 93d755b486528c4e79096affb1732e73c12b060f950a671d6f39594e67d7421c SHA512 c9efb870ccc143b3b4e957e7b7e5de25ede04f9321194be3dace2935f2cf2fe69f614387a707ed6b5bd36cbbd19f2ebf35d695ca20f66bbf2823fa067eb38019 WHIRLPOOL 4c9f994cf7778177b203d812f43f7ab074b4957bf3f312903dc38eff532729ae396c3a213b30dc307a37ea46b7c0518e6d7fe48d651c269f5a7c2e1844fe86e4
 EBUILD bsddb3-5.3.0.ebuild 1797 SHA256 c22a9969c59694758268c49e7616611cce850ae865d41932716f270d637b3491 SHA512 bf438260898fd7e7d3605af5980beb93c4d1e132e738df5abc1afd496da00877d585e98f68a5da7c016a70c7888da544b6602a1003ba561b23f8a3f20e4974ab WHIRLPOOL e3b4e7f0da87ae85f7398753d927a1f2c9188650ff61f503a7f928c09f07feaf756db8540b1193b5104f3e819df6352ebae4580f329d95283bf77c790227fdf9
 EBUILD bsddb3-6.0.0.ebuild 2071 SHA256 9e1a887f9d57e8669e556c9bcd082144d6b10f2120bf73148287803bb02e9ee6 SHA512 7d6fcc8436dfcf57ea0cc7c00c0d63abda29af293a4916bd305b3747fac618106701d91110ce24dc9f98a34ed85e4e68971fd5ab57a783f0311fad4b855f62d7 WHIRLPOOL e4f5b2796ac37e72fb1a12cc07c2fb47bafbaf50974443898777c63637f70358ebc77133dd86f3131c5e3b62d087e2380df7cccc734f22700566efa614731daa
-EBUILD bsddb3-6.0.1.ebuild 2081 SHA256 e995de9fd7a7bf5fb9a6143bbeb74e3afcbd82439fe94c99d39149486334a4af SHA512 4edbcaba674cbe5fdf784bbe327d5f765d5b51369ddf0ae628a765de48eb3ae938add4b3d4f7826d86f43e9c4368cdfdb803fc7d60fe2dfc4abe9e4132e56962 WHIRLPOOL 51297201b0eb0ee4ba2a065f778857913af4e80dfa99097b62311086de875b006d154789810f4129ab18c7e120f8da5ec19ee23fd23c95c6febebf8fc24934ce
-MISC ChangeLog 12416 SHA256 1c5da560811bb9f12508a8e1303f9b844eebe802ca9b7ea8b9d2eac01004ceef SHA512 cfb202fae00b4f4dfc73bd9fad84e97facf79d1a5a09f49e02760ab1be2fcd68fa15e6ff72c405018c72fe74bc33789a8a7bffe190822e4e7fd3bdfe2ea14603 WHIRLPOOL 052cea9c4213bfc74dfdd9fc67ca6704e361ec371e2b1e7be44eb69b53b1121e4f5840959d0363565e5a78bd110b62526d8496257c3895e6a26a39d1a9ebe624
+EBUILD bsddb3-6.0.1.ebuild 1993 SHA256 2898739efcc76c0be80da22f75297866ca9380ecf33f64ad9cd4472a52f36d9c SHA512 355ea8b3edce086c2fa735ed62c923394f25bad32f4f90a4787456182ea062c23ea636e2a3cbd1c7b5e3fc3573e7a72acd4b8b8afa14d6138f277c455fd385ac WHIRLPOOL a07e297fb1d995d7e4adcaa0b87d0e4901c068390a2120ebedeca5a52b0c579dc37dc20de24f9f3a13116c1567b45ace00f9cfa83aa24005489547b38f8d39f0
+MISC ChangeLog 12422 SHA256 1b786f8d6ba2c6a28475a9952deb9d2dbbcba14918ac069a7eaa7828469122f9 SHA512 e5892387f4a0c5beb78f96c84b05a88a9631c12f688144cddb3e0a1bffe5da9375b5d529c680ce73a479b287cb9fd09468fab47801dad7401dfc4e679672b07a WHIRLPOOL 987d7fa62b614278b4cda79c511d740341c4e9f5c773f7dffe05c54b9835009b169580f3aa3cbfb31d607b17398f89f366b99a7ca96d185c1635d6ee69ae4295
 MISC metadata.xml 229 SHA256 deca31172b77151b3139dfaed2c167a0b52849981f10c7fc8c8ebf8bffdbd1da SHA512 be71168c3d6afae44ec7b2ba090d518feee71b53aeb4291be18a68f71b2d12bc97a600a565066a86194da5f8e448850007f1ac10a9d0b4ae705cbae4f21a5854 WHIRLPOOL c6441aea3df06cffbc9fe3facc2eb5e2b7c880ea9b73ef5e3e84ef49e2a7f5aecd51dcb127dcb2c27c7ddef88eeea473ea971536c923b6f7ba81b05ca5227a87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1oICAAoJELp701BxlEWfEawQAJNSDD0/Bb5Gxcpw+Seuum6L
-6JXHUZcw19+CKW6PpO8eU0e+zx7vCSrE6qadcLrQ84PZoDjZEq3eQiR89f+5YZKu
-c5jRQBVQzZu6GCAEzTgmOKvwFWFkllzDB16wTN/Ll8J0mid7PCVHYGm2u7i8N3L3
-k9gqmIWsc84HhCpV2+MmQHMGvbxdNe1m/ekir/g2r4cHgfnwM5iBP+1wBuVRcExT
-c+VN2/mBDCuRI6rhvQyFbAO6NO7oQogzb0GNKQCqa/FUC7MwMDrVEInwcWSLj9SF
-AZjOyEFnYtw6F2z5DUaoEY/qJ9qBQr3IQojufjhufWTwC2jab/e4gPD5HKMqjixg
-b6qhfsEe2w7sKRjoEk0PxNjf6AKTDABnR+1UxqFJ7pOQPK1GLEtRswLy34y9FEw6
-JVW6CnA/3AlegUs67yDUt+PMrNc9RopZcKRYE9ZjsvIC9AgmduRxuNWoy9eL6GJD
-/9CtS9MixrA+oM+jefCwlJu3exBysqHRS0WNeW/Z23eLw1LBHMNo7Zs6G9UUgBjU
-N/n2BA7pPh2SsryyS4wZJl3Rb1M0wdQz7SHF7vovtwUEKC2DuoRlBYbFLeFMxIHQ
-Cw9xEK9UnZyEyn901gt7ESpkxRrtYCBW6deo7Ted+SwkUpF9YjfCYyPLMYIK5C3l
-XVIXo82f0EJVSL47iD7M
-=FwC9
+iEYEAREIAAYFAlM6nrEACgkQso7CE7gHKw1BkgCfXO+9XNK4R7S/Q9B369QxyhnW
+AL8AoJU0FG7nM1+X8lj016lFiA6wIJ+D
+=4zXA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bsddb3/bsddb3-6.0.1.ebuild b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
index bad1ac7bcd0f..f503723b4b0a 100644
--- a/dev-python/bsddb3/bsddb3-6.0.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.1 2014/01/08 05:47:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.2 2014/04/01 11:17:49 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -20,10 +20,10 @@ RDEPEND=">=sys-libs/db-4.8.30"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+# PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
-DOCS=( ChangeLog TODO.txt )
 DISTUTILS_IN_SOURCE_BUILD=1
+PATCHES=( "${FILESDIR}"/py3tests.patch )
 
 src_configure() {
 	local DB_VER
@@ -45,31 +45,24 @@ src_compile() {
 }
 
 python_test() {
-	# https://sourceforge.net/p/pybsddb/bugs/72/
+	# py3 tests misfire in the source om running test_all.py
+	local test
 	pushd "${BUILD_DIR}"/../ > /dev/null
 	if [[ "${EPYTHON}" == python2* ]]; then
-		"${PYTHON}" build/lib/bsddb3/tests/test_all.py
-	elif [[ "${EPYTHON}" == python3* ]]; then
-		if [[ "${EPYTHON}" == 'python3.3' ]]; then
-			einfo "py3.3 has an internal problem within this ebuild but is known to pass tests"
-		else
-			"${PYTHON}" setup.py build
-			einfo "all 500 tests are run silently and may take a number of minutes to complete"
-			"${PYTHON}" -v test3.py || die
-		fi
+		einfo "all 500 tests are run silently and may take a number of minutes to complete"
+		"${PYTHON}" build/lib/bsddb3/tests/test_all.py || die  "tests failed under ${EPYTHON}"
+	elif python_is_python3; then
+		mv Lib3/bsddb/test/test_all.py . || die
+		for test in Lib3/bsddb/test/test_*
+		do
+			"${PYTHON}" $test || die "tet $test failed under ${EPYTHON}"
+			einfo "test $test passed OK";einfo ""
+		done
 	fi
-}
-
-python_install() {
-	rm -fr "${ED}$(python_get_sitedir)/bsddb3/tests"
-
-	if use doc; then
-		dohtml -r docs/html/* || die "dohtml failed"
-	fi
-	distutils-r1_python_install
+	popd  > /dev/null
 }
 
 python_install_all() {
-	local HTML_DOCS=( docs/html/. )
+	use doc && local HTML_DOCS=( docs/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/bsddb3/files/py3tests.patch b/dev-python/bsddb3/files/py3tests.patch
new file mode 100644
index 000000000000..2970bd851dfe
--- /dev/null
+++ b/dev-python/bsddb3/files/py3tests.patch
@@ -0,0 +1,340 @@
+The code for running tests under py3 is flawed in 2 distinct areas for running tests in the source.
+This patch corrects use of local import syntax in tests under Lib3/, the libs for py3.
+The other appears a typo or an oversight; entry of suite instead of test_suite in 1 test file.
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_associate.py bsddb3-6.0.1/Lib3/bsddb/test/test_associate.py
+--- Lib3/bsddb/test/test_associate.py	2013-12-05 03:52:00.000000000 +0800
++++ Lib3/bsddb/test/test_associate.py	2014-04-01 16:30:39.219546604 +0800
+@@ -42,7 +42,7 @@
+ from pprint import pprint
+ 
+ import unittest
+-from .test_all import db, dbshelve, test_support, verbose, have_threads, \
++from test_all import db, dbshelve, test_support, verbose, have_threads, \
+         get_new_environment_path
+ 
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_basics.py bsddb3-6.0.1/Lib3/bsddb/test/test_basics.py
+--- Lib3/bsddb/test/test_basics.py	2013-12-05 03:51:55.000000000 +0800
++++ Lib3/bsddb/test/test_basics.py	2014-04-01 16:30:39.223546604 +0800
+@@ -46,7 +46,7 @@
+ import time
+ import sys
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, \
++from test_all import db, test_support, verbose, get_new_environment_path, \
+         get_new_database_path
+ 
+ DASH = '-'
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_compare.py bsddb3-6.0.1/Lib3/bsddb/test/test_compare.py
+--- Lib3/bsddb/test/test_compare.py	2013-12-05 03:52:05.000000000 +0800
++++ Lib3/bsddb/test/test_compare.py	2014-04-01 16:32:43.704544030 +0800
+@@ -38,12 +38,12 @@
+ """
+ 
+ import sys, os, re
+-from . import test_all
++import test_all
+ from io import StringIO
+ 
+ import unittest
+ 
+-from .test_all import db, dbshelve, test_support, \
++from test_all import db, dbshelve, test_support, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+@@ -479,4 +479,4 @@
+     return res
+ 
+ if __name__ == '__main__':
+-    unittest.main(defaultTest = 'suite')
++    unittest.main(defaultTest = 'test_suite')
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_compat.py bsddb3-6.0.1/Lib3/bsddb/test/test_compat.py
+--- Lib3/bsddb/test/test_compat.py	2013-12-05 03:51:41.000000000 +0800
++++ Lib3/bsddb/test/test_compat.py	2014-04-01 16:30:39.225546604 +0800
+@@ -41,7 +41,7 @@
+ import os, string
+ import unittest
+ 
+-from .test_all import db, hashopen, btopen, rnopen, verbose, \
++from test_all import db, hashopen, btopen, rnopen, verbose, \
+         get_new_database_path
+ 
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_cursor_pget_bug.py bsddb3-6.0.1/Lib3/bsddb/test/test_cursor_pget_bug.py
+--- Lib3/bsddb/test/test_cursor_pget_bug.py	2013-12-05 03:51:53.000000000 +0800
++++ Lib3/bsddb/test/test_cursor_pget_bug.py	2014-04-01 16:30:39.225546604 +0800
+@@ -36,7 +36,7 @@
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from test_all import db, test_support, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_dbenv.py bsddb3-6.0.1/Lib3/bsddb/test/test_dbenv.py
+--- Lib3/bsddb/test/test_dbenv.py	2013-12-05 03:52:09.000000000 +0800
++++ Lib3/bsddb/test/test_dbenv.py	2014-04-01 16:30:39.227546604 +0800
+@@ -36,7 +36,7 @@
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from test_all import db, test_support, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_dbobj.py bsddb3-6.0.1/Lib3/bsddb/test/test_dbobj.py
+--- Lib3/bsddb/test/test_dbobj.py	2013-12-05 03:51:52.000000000 +0800
++++ Lib3/bsddb/test/test_dbobj.py	2014-04-01 16:30:39.227546604 +0800
+@@ -37,7 +37,7 @@
+ import os, string
+ import unittest
+ 
+-from .test_all import db, dbobj, test_support, get_new_environment_path, \
++from test_all import db, dbobj, test_support, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_db.py bsddb3-6.0.1/Lib3/bsddb/test/test_db.py
+--- Lib3/bsddb/test/test_db.py	2013-12-05 03:52:12.000000000 +0800
++++ Lib3/bsddb/test/test_db.py	2014-04-01 16:30:39.228546604 +0800
+@@ -36,7 +36,7 @@
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from test_all import db, test_support, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_dbshelve.py bsddb3-6.0.1/Lib3/bsddb/test/test_dbshelve.py
+--- Lib3/bsddb/test/test_dbshelve.py	2013-12-05 03:52:04.000000000 +0800
++++ Lib3/bsddb/test/test_dbshelve.py	2014-04-01 16:30:39.229546604 +0800
+@@ -42,7 +42,7 @@
+ import unittest
+ 
+ 
+-from .test_all import db, dbshelve, test_support, verbose, \
++from test_all import db, dbshelve, test_support, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+@@ -73,14 +73,14 @@
+ 
+     def setUp(self):
+         if sys.version_info[0] >= 3 :
+-            from .test_all import do_proxy_db_py3k
++            from test_all import do_proxy_db_py3k
+             self._flag_proxy_db_py3k = do_proxy_db_py3k(False)
+         self.filename = get_new_database_path()
+         self.do_open()
+ 
+     def tearDown(self):
+         if sys.version_info[0] >= 3 :
+-            from .test_all import do_proxy_db_py3k
++            from test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+         self.do_close()
+         test_support.unlink(self.filename)
+@@ -340,7 +340,7 @@
+ 
+     def tearDown(self):
+         if sys.version_info[0] >= 3 :
+-            from .test_all import do_proxy_db_py3k
++            from test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+         self.do_close()
+         test_support.rmtree(self.homeDir)
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_dbtables.py bsddb3-6.0.1/Lib3/bsddb/test/test_dbtables.py
+--- Lib3/bsddb/test/test_dbtables.py	2013-12-05 03:51:49.000000000 +0800
++++ Lib3/bsddb/test/test_dbtables.py	2014-04-01 16:30:39.231546604 +0800
+@@ -32,7 +32,7 @@
+     import pickle
+ 
+ import unittest
+-from .test_all import db, dbtables, test_support, verbose, \
++from test_all import db, dbtables, test_support, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -43,7 +43,7 @@
+     def setUp(self):
+         import sys
+         if sys.version_info[0] >= 3 :
+-            from .test_all import do_proxy_db_py3k
++            from test_all import do_proxy_db_py3k
+             self._flag_proxy_db_py3k = do_proxy_db_py3k(False)
+ 
+         self.testHomeDir = get_new_environment_path()
+@@ -54,7 +54,7 @@
+         self.tdb.close()
+         import sys
+         if sys.version_info[0] >= 3 :
+-            from .test_all import do_proxy_db_py3k
++            from test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+         test_support.rmtree(self.testHomeDir)
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_distributed_transactions.py bsddb3-6.0.1/Lib3/bsddb/test/test_distributed_transactions.py
+--- Lib3/bsddb/test/test_distributed_transactions.py	2013-12-05 03:51:40.000000000 +0800
++++ Lib3/bsddb/test/test_distributed_transactions.py	2014-04-01 16:30:39.231546604 +0800
+@@ -39,10 +39,10 @@
+ import os
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from test_all import db, test_support, get_new_environment_path, \
+         get_new_database_path
+ 
+-from .test_all import verbose
++from test_all import verbose
+ 
+ #----------------------------------------------------------------------
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_early_close.py bsddb3-6.0.1/Lib3/bsddb/test/test_early_close.py
+--- Lib3/bsddb/test/test_early_close.py	2013-12-05 03:51:47.000000000 +0800
++++ Lib3/bsddb/test/test_early_close.py	2014-04-01 16:30:39.232546604 +0800
+@@ -40,7 +40,7 @@
+ import os, sys
+ import unittest
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
++from test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
+ 
+ # We're going to get warnings in this module about trying to close the db when
+ # its env is already closed.  Let's just ignore those.
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_fileid.py bsddb3-6.0.1/Lib3/bsddb/test/test_fileid.py
+--- Lib3/bsddb/test/test_fileid.py	2013-12-05 03:51:44.000000000 +0800
++++ Lib3/bsddb/test/test_fileid.py	2014-04-01 16:30:39.233546604 +0800
+@@ -40,7 +40,7 @@
+ import shutil
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from test_all import db, test_support, get_new_environment_path, get_new_database_path
+ 
+ class FileidResetTestCase(unittest.TestCase):
+     def setUp(self):
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_get_none.py bsddb3-6.0.1/Lib3/bsddb/test/test_get_none.py
+--- Lib3/bsddb/test/test_get_none.py	2013-12-05 03:51:56.000000000 +0800
++++ Lib3/bsddb/test/test_get_none.py	2014-04-01 16:30:39.233546604 +0800
+@@ -40,7 +40,7 @@
+ import os, string
+ import unittest
+ 
+-from .test_all import db, verbose, get_new_database_path
++from test_all import db, verbose, get_new_database_path
+ 
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_join.py bsddb3-6.0.1/Lib3/bsddb/test/test_join.py
+--- Lib3/bsddb/test/test_join.py	2013-12-05 03:51:46.000000000 +0800
++++ Lib3/bsddb/test/test_join.py	2014-04-01 16:30:39.234546604 +0800
+@@ -40,7 +40,7 @@
+ 
+ import unittest
+ 
+-from .test_all import db, dbshelve, test_support, verbose, \
++from test_all import db, dbshelve, test_support, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_lock.py bsddb3-6.0.1/Lib3/bsddb/test/test_lock.py
+--- Lib3/bsddb/test/test_lock.py	2013-12-05 03:52:03.000000000 +0800
++++ Lib3/bsddb/test/test_lock.py	2014-04-01 16:30:39.234546604 +0800
+@@ -40,7 +40,7 @@
+ import time
+ 
+ import unittest
+-from .test_all import db, test_support, verbose, have_threads, \
++from test_all import db, test_support, verbose, have_threads, \
+         get_new_environment_path, get_new_database_path
+ 
+ if have_threads :
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_misc.py bsddb3-6.0.1/Lib3/bsddb/test/test_misc.py
+--- Lib3/bsddb/test/test_misc.py	2013-12-05 03:51:48.000000000 +0800
++++ Lib3/bsddb/test/test_misc.py	2014-04-01 16:30:39.235546604 +0800
+@@ -39,7 +39,7 @@
+ import os, sys
+ import unittest
+ 
+-from .test_all import db, dbshelve, hashopen, test_support, get_new_environment_path, get_new_database_path
++from test_all import db, dbshelve, hashopen, test_support, get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_pickle.py bsddb3-6.0.1/Lib3/bsddb/test/test_pickle.py
+--- Lib3/bsddb/test/test_pickle.py	2013-12-05 03:51:41.000000000 +0800
++++ Lib3/bsddb/test/test_pickle.py	2014-04-01 16:30:39.235546604 +0800
+@@ -47,7 +47,7 @@
+ 
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from test_all import db, test_support, get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_queue.py bsddb3-6.0.1/Lib3/bsddb/test/test_queue.py
+--- Lib3/bsddb/test/test_queue.py	2013-12-05 03:51:50.000000000 +0800
++++ Lib3/bsddb/test/test_queue.py	2014-04-01 16:30:39.236546604 +0800
+@@ -41,7 +41,7 @@
+ from pprint import pprint
+ import unittest
+ 
+-from .test_all import db, verbose, get_new_database_path
++from test_all import db, verbose, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_recno.py bsddb3-6.0.1/Lib3/bsddb/test/test_recno.py
+--- Lib3/bsddb/test/test_recno.py	2013-12-05 03:52:01.000000000 +0800
++++ Lib3/bsddb/test/test_recno.py	2014-04-01 16:30:39.237546604 +0800
+@@ -41,7 +41,7 @@
+ from pprint import pprint
+ import unittest
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
++from test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
+ 
+ letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_replication.py bsddb3-6.0.1/Lib3/bsddb/test/test_replication.py
+--- Lib3/bsddb/test/test_replication.py	2013-12-05 03:51:58.000000000 +0800
++++ Lib3/bsddb/test/test_replication.py	2014-04-01 16:30:39.239546604 +0800
+@@ -40,7 +40,7 @@
+ import time
+ import unittest
+ 
+-from .test_all import db, test_support, have_threads, verbose, \
++from test_all import db, test_support, have_threads, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_sequence.py bsddb3-6.0.1/Lib3/bsddb/test/test_sequence.py
+--- Lib3/bsddb/test/test_sequence.py	2013-12-05 03:51:51.000000000 +0800
++++ Lib3/bsddb/test/test_sequence.py	2014-04-01 16:30:39.239546604 +0800
+@@ -36,7 +36,7 @@
+ import unittest
+ import os
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from test_all import db, test_support, get_new_environment_path, get_new_database_path
+ 
+ 
+ class DBSequenceTest(unittest.TestCase):
+diff -ur bsddb3-6.0.1.orig/Lib3/bsddb/test/test_thread.py bsddb3-6.0.1/Lib3/bsddb/test/test_thread.py
+--- Lib3/bsddb/test/test_thread.py	2013-12-05 03:51:39.000000000 +0800
++++ Lib3/bsddb/test/test_thread.py	2014-04-01 16:30:39.241546604 +0800
+@@ -51,7 +51,7 @@
+         pass
+ 
+ import unittest
+-from .test_all import db, dbutils, test_support, verbose, have_threads, \
++from test_all import db, dbutils, test_support, verbose, have_threads, \
+         get_new_environment_path, get_new_database_path
+ 
+ if have_threads :
+