3 files changed, 24 insertions, 4 deletions
diff --git a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
new file mode 100644
index 000000000000..8c118e6a9ca1
--- /dev/null
+++ b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
@@ -0,0 +1,18 @@
+From: Zac Medico <zmedico@gentoo.org>
+Subject: [PATCH] RegexTest: python3.6 compatibility
+
+https://bugs.launchpad.net/python-mox3/+bug/1665266
+
+--- mox3-0.12.0/mox3/tests/test_mox.py
++++ mox3-0.12.0/mox3/tests/test_mox.py
+@@ -316,8 +316,8 @@
+ 
+     def testReprWithFlags(self):
+         """repr should return the regular expression pattern and flags."""
+-        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) ==
+-                        "<regular expression 'a\s+b', flags=4>")
++        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) ==
++                        r"<regular expression 'a\s+b', flags=8>")
+ 
+ 
+ class IsTest(testtools.TestCase):
diff --git a/dev-python/mox3/mox3-0.10.0.ebuild b/dev-python/mox3/mox3-0.10.0.ebuild
index 5404e3405eaf..15856263acdd 100644
--- a/dev-python/mox3/mox3-0.10.0.ebuild
+++ b/dev-python/mox3/mox3-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_IN_SOURCE_BUILD=TRUE
 
 inherit distutils-r1
diff --git a/dev-python/mox3/mox3-0.12.0.ebuild b/dev-python/mox3/mox3-0.12.0.ebuild
index 2ceca6dc06ea..c412788fc12d 100644
--- a/dev-python/mox3/mox3-0.12.0.ebuild
+++ b/dev-python/mox3/mox3-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
@@ -40,6 +40,8 @@ RDEPEND="
 	${CRDEPEND}
 "
 
+PATCHES=( "${FILESDIR}"/${P}-RegexTest-python3.6.patch )
+
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }