diff --git a/.python-paste.metadata b/.python-paste.metadata
index b8d5c3d..ba2c283 100644
--- a/.python-paste.metadata
+++ b/.python-paste.metadata
@@ -1 +1 @@
-4c614ee0aa05a8269ca4be193f215b0c725aca15 SOURCES/Paste-1.7.5.1.tar.gz
+2f64a1d68a92f686a2fe26082354250c00e5ac72 SOURCES/Paste-3.5.3.tar.gz
diff --git a/SOURCES/python37.patch b/SOURCES/python37.patch
new file mode 100644
index 0000000..03a2495
--- /dev/null
+++ b/SOURCES/python37.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Miro Hrončok <miro@hroncok.cz>
+# Date 1528476582 -7200
+# Fri Jun 08 18:49:42 2018 +0200
+# Branch py37
+# Node ID c5a2c7e3191cdcebf3fa5f0e52f55910ed2120b9
+# Parent 0e5a48796ab969d874c6b772c5c33561ac2d1b0d
+Don't raise StopIteration from generator, return instead
+
+See https://www.python.org/dev/peps/pep-0479/
+
+diff -r 0e5a48796ab9 -r c5a2c7e3191c paste/auth/digest.py
+--- a/paste/auth/digest.py Tue Mar 08 16:29:31 2016 -0800
++++ b/paste/auth/digest.py Fri Jun 08 18:49:42 2018 +0200
+@@ -57,7 +57,7 @@
+ prev = item
+
+ yield prev.strip()
+- raise StopIteration
++ return
+
+ def _auth_to_kv_pairs(auth_string):
+ """ split a digest auth string into key, value pairs """
diff --git a/SPECS/python-paste.spec b/SPECS/python-paste.spec
index f216dd5..1d8a97b 100644
--- a/SPECS/python-paste.spec
+++ b/SPECS/python-paste.spec
@@ -1,92 +1,58 @@
-%if 0%{?fedora} || 0%{?rhel} > 6
-#global with_python3 1
-# paste is not python3 compatible at this time
-%else
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
+%global desc These provide several pieces of "middleware" (or filters) that can be nested\
+to build web applications. Each piece of middleware uses the WSGI (PEP 333)\
+interface, and should be compatible with other middleware based on those\
+interfaces.
+%global sum Tools for using a Web Server Gateway Interface stack
Name: python-paste
-Version: 1.7.5.1
-Release: 9.20111221hg1498%{?dist}
-Summary: Tools for using a Web Server Gateway Interface stack
-Group: System Environment/Libraries
+Version: 3.5.3
+Release: 3%{?dist}
+BuildArch: noarch
+
# Most of the code is MIT
# paste/exceptions/collector.py is ZPLv2.0
-# paste/evalexception/mochikit/MochiKit.js AFL or MIT
+# paste/evalexception/media/MochiKit.packed.js AFL (2.1) or MIT
# paste/lint.py MIT or Apache v2
-# subproccess24.py PySourceColor.py, Python
-# doctest24.py, Public Domain
-License: MIT and ZPLv2.0 and Python and Public Domain and (AFL or MIT) and (MIT or ASL 2.0)
-URL: http://pythonpaste.org
-# All files arent included in the 0.7.5.1 release. Take a snapshot to get
-# unittests working and pick up three bugfixes as well
-# hg clone -r 1498 https://bitbucket.org/ianb/paste
-# cd paste
-# patch -p1 < ../paste-manifest.patch
-# python setup.py sdist
-# Source is in dist/Paste-1.7.5.1.tar.gz
-Source0: Paste-%{version}.tar.gz
-#Source0: http://pypi.python.org/pypi/packages/source/P/Paste/Paste-%{version}.tar.gz
-# In one remaining place, make sure we check for string in the stdlib before we use our copy
-Patch0: paste-unbundle-stdlib.patch
-# Use a system version of python-tempita before our bundled copy
-Patch1: paste-unbundle-tempita.patch
-Patch2: paste-27-lambda.patch
-# Fix parsing of digest key value pairs
-# Submitted upstream pull request
-Patch3: paste-digest-snap.patch
-# Submitted upstream pull request with this change.
-# This patch is needed when creating the tarball, not during rpm build
-Patch100: paste-manifest.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+# PySourceColor.py, Python
+License: MIT and ZPLv2.0 and Python and (AFL or MIT) and (MIT or ASL 2.0)
+Summary: %sum
+URL: https://github.com/cdent/paste
+Source0: https://files.pythonhosted.org/packages/source/P/Paste/Paste-%{version}.tar.gz
+
+
+BuildRequires: python3-devel
+BuildRequires: python3-pyOpenSSL
+BuildRequires: python3-pytest
+BuildRequires: python3-setuptools
+BuildRequires: python3-six >= 1.4.0
+BuildRequires: python3-tempita
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: python-nose
-BuildRequires: python-tempita
-BuildRequires: pyOpenSSL
-Requires: python-tempita
-Requires: pyOpenSSL
-Requires: python-setuptools
-
-%if 0%{?with_python3}
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-nose
-BuildRequires: python3-tempita
-BuildRequires: /usr/bin/2to3
-%endif # if with_python3
%description
-These provide several pieces of "middleware" (or filters) that can be nested
-to build web applications. Each piece of middleware uses the WSGI (PEP 333)
-interface, and should be compatible with other middleware based on those
-interfaces.
+%desc
+
-%if 0%{?with_python3}
%package -n python3-paste
Summary: Tools for using a Web Server Gateway Interface stack
-Group: System Environment/Libraries
-Requires: python3-tempita
+
+%{?python_provide:%python_provide python3-paste}
+
+Requires: python3-pyOpenSSL
Requires: python3-setuptools
-# TODO is there a pyOpenSSL for python3
+Requires: python3-six
+Requires: python3-tempita
+
%description -n python3-paste
-These provide several pieces of "middleware" (or filters) that can be nested
-to build web applications. Each piece of middleware uses the WSGI (PEP 333)
-interface, and should be compatible with other middleware based on those
-interfaces.
-%endif # with_python3
+%{desc}
%prep
-%setup -q -n Paste-%{version}
-%patch0 -p1 -b .stdlib
-rm paste/util/subprocess24.py
-%patch1 -p1 -b .tmpta
-%patch2 -p1 -b .27lambda
-%patch3 -p1 -b .digest
+%autosetup -n Paste-%{version} -p1
+
+# Paste-2.0.3 seems to have a few .py.orig files that don't appear in upstream scm. Let's drop them.
+find . -name "*.orig" -delete
+
# Strip #! lines that make these seem like scripts
%{__sed} -i -e '/^#!.*/,1 d' paste/util/scgiserver.py paste/debug/doctest_webapp.py
@@ -95,176 +61,133 @@ pushd docs
rm StyleGuide.txt
popd
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-2to3 --write --nobackups %{py3dir}
-%endif # with_python3
%build
-%{__python} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
%{__python3} setup.py build
-popd
-%endif # with_python3
%install
-rm -rf %{buildroot}
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python3} setup.py install --skip-build --root %{buildroot}
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif # with_python3
%check
export PYTHONPATH=$(pwd)
+export PYTHONWARNINGS="ignore:'cgi':DeprecationWarning"
# We don't have access to the wider internet in the buildsystem
-nosetests -e '.*test_paste_website'
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-export PYTHONPATH=$(pwd)
-nosetests-%{python3_version}
-popd
-%endif # with_python3
+py.test-3 -k "not test_paste_website and not test_proxy_to_website and not test_modified"
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc docs/*
-%{python_sitelib}/*
-
-%if 0%{?with_python3}
%files -n python3-paste
-%defattr(-,root,root,-)
-%{python3_sitelib}/*
-%endif
+%license docs/license.txt
+%doc docs/*
+%{python3_sitelib}/paste
+%{python3_sitelib}/Paste-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/Paste-%{version}-py%{python3_version}-nspkg.pth
%changelog
-* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.7.5.1-9.20111221hg1498
-- Mass rebuild 2013-12-27
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5.1-8.20111221hg1498
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5.1-7.20111221hg1498
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jan 23 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.5.1-6.20111221hg1498
-- Disable python3 subpackage as paste is not python3 compatible at this time
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5.1-5.20111221hg1498
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 3.5.3-2
+- Rebuilt for Python 3.12
-* Wed Dec 21 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.5.1-4.20111221hg1498
-- Tarball is missing files, use a snapshot to get those files and also pick up
- several bug fixes (one related to serving CGI scripts, another for http
- Continue requests, and a third regarding digest authentication and internet
- explorer)
+* Tue May 02 2023 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 3.5.3-1
+- Update to upstream.
-* Tue Dec 20 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.5.1-3
-- Ugh. Enable unittests and make a note that the python3 module is totally
- non-functional. Open a bug for that for the actual package maintainers to
- make a decision on.
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sat Jan 07 2023 Kevin Fenzi <kevin@scrye.com> - 3.5.2-1
+- Update to 3.5.2. Fixes rhbz#2100061
-* Wed Sep 22 2010 Luke Macken <lmacken@redhat.com> - 1.7.5.1-1
-- 1.7.5.1 upstream release
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-* Wed Sep 15 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.5-1
-- New upstream bugfix
+* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.5.0-7
+- Rebuilt for Python 3.11
-* Mon Aug 23 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.4-8
-- Rebuild for python3-3.2
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-* Mon Aug 2 2010 Kyle VanderBeek <kylev@kylev.com> - 1.7.4-7
-- Add python3 version.
-- Fix python 2.7/3 incompatible lambda syntax.
-- Unbundle stdlib (2.4+) subprocess module (removed because it isn't even 3.x legal).
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-* Fri Jul 30 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.4-6
-- Include another function from tempita that is used by paste-script.
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.5.0-4
+- Rebuilt for Python 3.10
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.7.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Mon Feb 08 2021 Charalampos Stratakis <cstratak@redhat.com> - 3.5.0-3
+- Remove redundant nose dependency
-* Fri Jul 9 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.4-4
-- Actually apply the patches :-(
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-* Fri Jul 2 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.4-3
-- Require pyOpenSSL so that we get SSL capabilities
+* Mon Nov 02 2020 Joel Capitao <jcapitao@redhat.com> - 3.5.0-1
+- Update to 3.5.0 (#1882460)
-* Thu Jul 1 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.7.4-2
-- Unbundle tempita and don't rely on utils.string24
+* Thu Sep 10 2020 Yatin Karel <ykarel@redhat.com> - 3.4.4-1
+- Update to 3.4.4 (#1844011)
-* Thu Jun 24 2010 Luke Macken <lmacken@redhat.com> - 1.7.4-1
-- 1.7.4 security release
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-2
+- Rebuilt for Python 3.9
-* Mon Jun 22 2009 Kyle VanderBeek <kylev@kylev.com> - 1.7.2-3
-- Package formerly ghost'ed .pyo files
-- Update to current python package methods
+* Wed Feb 19 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.4.0-1
+- Update to 3.4.0 (#1789359).
+- https://github.com/cdent/paste/blob/3.4.0/docs/news.txt
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-* Tue Jan 06 2009 Luke Macken <lmacken@redhat.com> - 1.7.2-1
-- Update to 1.7.2
+* Tue Jan 07 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.2.4-1
+- Update to 3.2.4 (#1776547).
+- https://github.com/cdent/paste/blob/3.2.4/docs/news.txt
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.7.1-2
-- Rebuild for Python 2.6
+* Mon Oct 14 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.2.2-1
+- Update to 3.2.2 (#1761382).
+- https://github.com/cdent/paste/blob/3.2.2/docs/news.txt
-* Sat Jun 14 2008 Luke Macken <lmacken@redhat.com> - 1.7.1-1
-- Update to Paste 1.7.1
+* Fri Sep 27 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.2.1-1
+- Update to 3.2.1 (#1755413).
-* Thu Feb 28 2008 Luke Macken <lmacken@redhat.com> - 1.6-1
-- Update to 1.6
+* Tue Sep 17 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.2.0-1
+- Update to 3.2.0 (#1749324).
+- https://github.com/cdent/paste/blob/3.2.0/docs/news.txt
-* Wed Oct 3 2007 Luke Macken <lmacken@redhat.com> - 1.4.2-1
-- 1.4.2
+* Tue Sep 17 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.1.1-2
+- Drop python2-paste (#1751087).
-* Sun Sep 2 2007 Luke Macken <lmacken@redhat.com> - 1.4-2
-- Update for python-setuptools changes in rawhide
+* Tue Sep 03 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1 (#1742275).
+- https://github.com/cdent/paste/blob/master/docs/news.txt
-* Sat Jul 8 2007 Luke Macken <lmacken@redhat.com> - 1.4-1
-- 1.4
+* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.8-3
+- Rebuilt for Python 3.8
-* Sat Mar 3 2007 Luke Macken <lmacken@redhat.com> - 1.2.1-1
-- 1.2.1
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-* Sat Dec 9 2006 Luke Macken <lmacken@redhat.com> - 1.0-2
-- Add python-devel to BuildRequires
-- 1.0
+* Thu Mar 28 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.0.8-1
+- Update to 3.0.8 (#1684199).
+- Update the URL to the new home on GitHub.
-* Sun Sep 17 2006 Luke Macken <lmacken@redhat.com> - 0.9.8.1-1
-- 0.9.8.1
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-* Sun Sep 3 2006 Luke Macken <lmacken@redhat.com> - 0.9.3-5
-- Rebuild for FC6
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-* Wed Jul 19 2006 Luke Macken <lmacken@redhat.com> - 0.9.3-4
-- Use a smarter shebang removal expression
+* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-7
+- Rebuilt for Python 3.7
-* Wed Jul 19 2006 Luke Macken <lmacken@redhat.com> - 0.9.3-3
-- Fix doc inclusion
+* Fri Jun 08 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-6
+- Fix build on Python 3.7 (#1583818)
-* Sat Jul 15 2006 Luke Macken <lmacken@redhat.com> - 0.9.3-2
-- Clean up docs directory
-- Remove shebang from from non-executable scripts
-- Use consistent build root variables
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-* Mon Jul 10 2006 Luke Macken <lmacken@redhat.com> - 0.9.3-1
-- Initial package
+* Fri Jan 26 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.0.3-4
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)