From 38382e59140a4dc50d45c6fbd52efc9d0641862057d7dcad7ecac09fd452dcbf Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 20 Apr 2020 09:20:05 +0000
Subject: [PATCH] - Eliminate complicated py2k constructs

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-colander?expand=0&rev=16
---
 fix-tests.patch.txt     | 47 +++++++++++++++++++++++++++++++++++++++++
 python-colander.changes |  5 +++++
 python-colander.spec    | 17 ++-------------
 3 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 fix-tests.patch.txt

diff --git a/fix-tests.patch.txt b/fix-tests.patch.txt
new file mode 100644
index 0000000..d423d05
--- /dev/null
+++ b/fix-tests.patch.txt
@@ -0,0 +1,47 @@
+--- a/colander/tests/test_colander.py
++++ b/colander/tests/test_colander.py
+@@ -4156,7 +4156,7 @@ class TestTupleSchema(unittest.TestCase)
+         self.assertEqual(schema.children[0], node)
+ 
+ 
+-class TestFunctional(object):
++class FunctionalBase(object):
+     def test_deserialize_ok(self):
+         import colander.tests
+ 
+@@ -4433,7 +4433,7 @@ class TestFunctional(object):
+         self.assertEqual(errors, expected)
+ 
+ 
+-class TestImperative(unittest.TestCase, TestFunctional):
++class TestImperative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4472,7 +4472,7 @@ class TestImperative(unittest.TestCase,
+         return schema
+ 
+ 
+-class TestDeclarative(unittest.TestCase, TestFunctional):
++class TestDeclarative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4503,7 +4503,7 @@ class TestDeclarative(unittest.TestCase,
+         return schema
+ 
+ 
+-class TestUltraDeclarative(unittest.TestCase, TestFunctional):
++class TestUltraDeclarative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4547,7 +4547,7 @@ class TestUltraDeclarative(unittest.Test
+         return schema
+ 
+ 
+-class TestDeclarativeWithInstantiate(unittest.TestCase, TestFunctional):
++class TestDeclarativeWithInstantiate(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
diff --git a/python-colander.changes b/python-colander.changes
index 8907915..42224d3 100644
--- a/python-colander.changes
+++ b/python-colander.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 20 09:19:56 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Eliminate complicated py2k constructs
+
 -------------------------------------------------------------------
 Fri Apr 17 08:10:18 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-colander.spec b/python-colander.spec
index 577296f..775d762 100644
--- a/python-colander.spec
+++ b/python-colander.spec
@@ -100,23 +100,10 @@ Provides translations for the "%{name}" package.
 %check
 %pytest
 
-%files %{python_files}
+%files %{python_files} -f colander_%{python_bin_suffix}.lang
 %license LICENSE.txt
 %doc CHANGES.rst README.rst
-%{python_sitelib}/*
-%exclude %{python_sitelib}/colander/locale
-
-%if %{have_python2} && ! 0%{?skip_python2}
-%files -n %{python2_prefix}-colander-lang -f colander_%{python2_bin_suffix}.lang
-%license LICENSE.txt
-%{python2_sitelib}/colander/locale
-%endif
-
-%if %{have_python2} && ! 0%{?skip_python3}
-%files -n %{python3_prefix}-colander-lang -f colander_%{python3_bin_suffix}.lang
-%license LICENSE.txt
-%{python3_sitelib}/colander/locale
-%endif
+%{python_sitelib}/colander*
 
 %files %{python_files doc}
 %license LICENSE.txt