3 files changed, 0 insertions(+), 88 deletions(-)

M gnu/local.mk
M gnu/packages/openstack.scm
D gnu/packages/patches/python-mox3-python3.6-compat.patch

@@ 2163,7 2163,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pillow-CVE-2022-45199.patch	\
   %D%/packages/patches/python-libxml2-utf8.patch		\
   %D%/packages/patches/python-memcached-syntax-warnings.patch	\
-  %D%/packages/patches/python-mox3-python3.6-compat.patch	\
   %D%/packages/patches/python-packaging-test-arch.patch		\
   %D%/packages/patches/python-pandas-2-no-pytz_datetime.patch		\
   %D%/packages/patches/python-property-cached-asyncio-3_11.patch	\

@@ 174,50 174,6 @@ manner.")
 guidelines}.")
     (license license:asl2.0)))
 
-(define-public python-mox3
-  (package
-    (name "python-mox3")
-    (version "0.24.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "mox3" version))
-        (patches (search-patches "python-mox3-python3.6-compat.patch"))
-        (sha256
-          (base32 "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5"))))
-    (build-system pyproject-build-system)
-    (propagated-inputs
-     (list python-fixtures python-pbr))
-    (native-inputs
-     (list python-openstackdocstheme
-           python-setuptools
-           python-sphinx
-           python-subunit
-           python-testrepository
-           python-testtools
-           python-wheel))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-for-python-3.11
-            (lambda _
-              ;; The getargspec function has been removed in python 3.11.
-              (substitute* "mox3/mox.py"
-                (("self\\._args, varargs, varkw, defaults = inspect\\.getargspec\\(method\\)")
-                 "inspect_result = inspect.getfullargspec(method)
-            self._args = inspect_result.args
-            varargs = inspect_result.varargs
-            varkw = inspect_result.varkw
-            defaults = inspect_result.defaults")))))))
-    (home-page "https://www.openstack.org/")
-    (synopsis "Mock object framework for Python")
-    (description
-      "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/,
-Google mox framework} to Python 3.  It was meant to be as compatible
-with mox as possible, but small enhancements have been made.")
-    (license license:asl2.0)))
-
 (define-public python-openstackdocstheme
   (package
     (name "python-openstackdocstheme")

@@ 1,43 0,0 @@
-Fix regex so that it works with Python 3.6.
-
-See <https://docs.python.org/3/library/re.html#re.LOCALE>.
-
-Copied from upstream bug report:
-https://bugs.launchpad.net/python-mox3/+bug/1665266
-
-From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Thu, 16 Feb 2017 00:24:10 -0800
-Subject: [PATCH] RegexTest: python3.6 compatibility
-
-These fixes are backward-compatible with older python versions:
-
-* raw strings fix invalid escape sequences
-* flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern
----
- mox3/tests/test_mox.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py
-index 15ac565..3a1af17 100644
---- a/mox3/tests/test_mox.py
-+++ b/mox3/tests/test_mox.py
-@@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase):
-     def testReprWithoutFlags(self):
-         """repr should return the regular expression pattern."""
-         self.assertTrue(
--            repr(mox.Regex(r"a\s+b")) == "<regular expression 'a\s+b'>")
-+            repr(mox.Regex(r"a\s+b")) == r"<regular expression 'a\s+b'>")
- 
-     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):
--- 
-2.10.2
-