diff --git a/python-zope.testbrowser.changes b/python-zope.testbrowser.changes
index d62315f..bf80ce9 100644
--- a/python-zope.testbrowser.changes
+++ b/python-zope.testbrowser.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr 3 09:34:27 UTC 2023 - pgajdos@suse.com
+
+- version update to 6.0
+ - Drop support for Python 2.7, 3.5, 3.6.
+ - Drop support for deprecated ``python setup.py test``.
+ - Add support for Python 3.11.
+ - Do not break in ``mechRepr`` when using ````.
+- deleted patches
+ - zope.testbrowser-remove-bad-test.patch (upstreamed)
+
-------------------------------------------------------------------
Fri Sep 16 19:36:33 UTC 2022 - Yogalakshmi Arunachalam
diff --git a/python-zope.testbrowser.spec b/python-zope.testbrowser.spec
index 85abe8d..bfe0458 100644
--- a/python-zope.testbrowser.spec
+++ b/python-zope.testbrowser.spec
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
@@ -26,13 +25,12 @@
%bcond_with test
%endif
Name: python-zope.testbrowser%{psuffix}
-Version: 5.6.1
+Version: 6.0
Release: 0
Summary: Programmable browser for functional black-box tests
License: ZPL-2.1
URL: https://github.com/zopefoundation/zope.testbrowser
Source: https://files.pythonhosted.org/packages/source/z/zope.testbrowser/zope.testbrowser-%{version}.tar.gz
-Patch0: zope.testbrowser-remove-bad-test.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -41,7 +39,6 @@ Requires: python-WebTest >= 2.0.30
Requires: python-beautifulsoup4
Requires: python-pytz > dev
Requires: python-setuptools
-Requires: python-six
Requires: python-soupsieve >= 1.9.0
Requires: python-zope.cachedescriptors
Requires: python-zope.interface
@@ -56,7 +53,6 @@ BuildRequires: %{python_module WebTest >= 2.0.30}
BuildRequires: %{python_module beautifulsoup4}
BuildRequires: %{python_module pytz > dev}
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
BuildRequires: %{python_module soupsieve >= 1.9.0}
BuildRequires: %{python_module zope.cachedescriptors}
BuildRequires: %{python_module zope.interface}
@@ -74,12 +70,10 @@ specific. It can be used to test or otherwise interact with any web
site.
%prep
-%setup -q -n zope.testbrowser-%{version}
-%patch0 -p1
+%autosetup -p1 -n zope.testbrowser-%{version}
%build
%if !%{with test}
-sed -i 's:import mock:import unittest.mock as mock:' src/zope/testbrowser/tests/test_wsgi.py
%python_build
%endif
@@ -100,7 +94,7 @@ cd src
%if !%{with test}
%doc CHANGES.rst README.rst
%license LICENSE.rst
-%{python_sitelib}/*
+%{python_sitelib}/zope*
%endif
%changelog
diff --git a/zope.testbrowser-5.6.1.tar.gz b/zope.testbrowser-5.6.1.tar.gz
deleted file mode 100644
index 8305e9c..0000000
--- a/zope.testbrowser-5.6.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7
-size 84534
diff --git a/zope.testbrowser-6.0.tar.gz b/zope.testbrowser-6.0.tar.gz
new file mode 100644
index 0000000..bfcd6fe
--- /dev/null
+++ b/zope.testbrowser-6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44b77a5e9037abedc36476a2ea3dc7e974d613ce5293dd77cc02f888ee31fa1a
+size 84690
diff --git a/zope.testbrowser-remove-bad-test.patch b/zope.testbrowser-remove-bad-test.patch
deleted file mode 100644
index 3389442..0000000
--- a/zope.testbrowser-remove-bad-test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: zope.testbrowser-5.3.2/src/zope/testbrowser/over_the_wire.txt
-===================================================================
---- zope.testbrowser-5.3.2.orig/src/zope/testbrowser/over_the_wire.txt
-+++ /dev/null
-@@ -1,26 +0,0 @@
--=================================
--Using testbrowser On the Internet
--=================================
--
--The ``zope.testbrowser`` module exposes a ``Browser`` class that
--simulates a web browser similar to Mozilla Firefox or IE.
--
-- >>> from zope.testbrowser.browser import Browser
-- >>> browser = Browser()
--
--It can send arbitrary headers; this is helpful for setting the language value,
--so that your tests format values the way you expect in your tests, if you rely
--on zope.i18n locale-based formatting or a similar approach.
--
-- >>> browser.addHeader('Accept-Language', 'en-US')
--
--The browser can `open` web pages:
--
-- >>> # This is tricky, since in Germany I am forwarded to google.de usually;
-- >>> # The `ncr` forces to really go to google.com.
-- >>> browser.open('http://google.com/ncr')
-- Traceback (most recent call last):
-- ...
-- RobotExclusionError: HTTP Error 403: request disallowed by robots.txt
--
--Oops! Google doesn't let robots use their search engine. Oh well.
-Index: zope.testbrowser-5.3.2/src/zope/testbrowser/tests/test_doctests.py
-===================================================================
---- zope.testbrowser-5.3.2.orig/src/zope/testbrowser/tests/test_doctests.py
-+++ zope.testbrowser-5.3.2/src/zope/testbrowser/tests/test_doctests.py
-@@ -26,12 +26,6 @@ def test_suite():
- checker=zope.testbrowser.tests.helper.checker,
- package='zope.testbrowser')
-
-- wire = doctest.DocFileSuite('over_the_wire.txt', optionflags=flags,
-- checker=zope.testbrowser.tests.helper.checker,
-- package='zope.testbrowser')
-- wire.level = 2
-- suite.addTests(wire)
--
- return suite
-
-
-Index: zope.testbrowser-5.3.2/src/zope.testbrowser.egg-info/SOURCES.txt
-===================================================================
---- zope.testbrowser-5.3.2.orig/src/zope.testbrowser.egg-info/SOURCES.txt
-+++ zope.testbrowser-5.3.2/src/zope.testbrowser.egg-info/SOURCES.txt
-@@ -32,7 +32,6 @@ src/zope/testbrowser/browser.py
- src/zope/testbrowser/cookies.py
- src/zope/testbrowser/fixed-bugs.txt
- src/zope/testbrowser/interfaces.py
--src/zope/testbrowser/over_the_wire.txt
- src/zope/testbrowser/testing.py
- src/zope/testbrowser/utils.py
- src/zope/testbrowser/wsgi.py
-@@ -56,4 +55,4 @@ src/zope/testbrowser/tests/test_bbb.py
- src/zope/testbrowser/tests/test_browser.py
- src/zope/testbrowser/tests/test_cookies.py
- src/zope/testbrowser/tests/test_doctests.py
--src/zope/testbrowser/tests/test_wsgi.py
-\ No newline at end of file
-+src/zope/testbrowser/tests/test_wsgi.py