summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Fladischer <fladi@debian.org>2024-01-12 13:31:04 +0000
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2024-01-12 22:34:29 +0000
commit490e3c5ce7d22f7f7e4c1c44548fb2869ed454f3 (patch)
tree0dba1cbe11b25da7a6e2e2f3871562ac9a6e89f9
parent6782c6b5214dcdc4b0bc09704f3543feb08bf579 (diff)
parentbfb9fc234c50cd532c5496a39f1c0b20efc16553 (diff)
Imported using git-ubuntu import.
-rw-r--r--debian/changelog8
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/0001-Replace-assertRaisesRegexp-with-assertRaisesRegex.patch38
-rw-r--r--debian/patches/series1
-rw-r--r--tests/test_ocsp_response_builder.py8
5 files changed, 52 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index cb4b4c5..f80db0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-ocspbuilder (0.10.2-3) unstable; urgency=low
+
+ * Add patch to replace assertRaisesRegexp with assertRaisesRegex (Closes:
+ #1056489).
+ * Update year in d/copyright.
+
+ -- Michael Fladischer <fladi@debian.org> Fri, 12 Jan 2024 13:31:04 +0000
+
python-ocspbuilder (0.10.2-2) unstable; urgency=medium
* Source-only upload to allow migration to testing.
diff --git a/debian/copyright b/debian/copyright
index fab43bc..8f0325f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: 2015-2018, Will Bond <will@wbond.net>
License: Expat
Files: debian/*
-Copyright: 2023, Michael Fladischer <fladi@debian.org>
+Copyright: 2023-2024, Michael Fladischer <fladi@debian.org>
License: Expat
License: Expat
diff --git a/debian/patches/0001-Replace-assertRaisesRegexp-with-assertRaisesRegex.patch b/debian/patches/0001-Replace-assertRaisesRegexp-with-assertRaisesRegex.patch
new file mode 100644
index 0000000..49077e6
--- /dev/null
+++ b/debian/patches/0001-Replace-assertRaisesRegexp-with-assertRaisesRegex.patch
@@ -0,0 +1,38 @@
+From: Michael Fladischer <FladischerMichael@fladi.at>
+Date: Fri, 12 Jan 2024 13:16:21 +0000
+Subject: Replace assertRaisesRegexp with assertRaisesRegex.
+
+---
+ tests/test_ocsp_response_builder.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_ocsp_response_builder.py b/tests/test_ocsp_response_builder.py
+index 89fa604..238b8e6 100644
+--- a/tests/test_ocsp_response_builder.py
++++ b/tests/test_ocsp_response_builder.py
+@@ -62,21 +62,21 @@ class OCSPResponseBuilderTests(unittest.TestCase):
+ issuer_cert = asymmetric.load_certificate(os.path.join(fixtures_dir, 'test.crt'))
+ subject_cert = asymmetric.load_certificate(os.path.join(fixtures_dir, 'test-inter.crt'))
+
+- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
++ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
+ builder = OCSPResponseBuilder('successful', subject_cert, 'good')
+ builder.certificate = None
+ ocsp_response = builder.build(issuer_key, issuer_cert)
+
+- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
++ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
+ builder = OCSPResponseBuilder('successful', subject_cert, 'good')
+ builder.certificate_status = None
+ ocsp_response = builder.build(issuer_key, issuer_cert)
+
+- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
++ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
+ builder = OCSPResponseBuilder('successful', subject_cert)
+ ocsp_response = builder.build(issuer_key, issuer_cert)
+
+- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
++ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
+ builder = OCSPResponseBuilder('successful', None, 'good')
+ ocsp_response = builder.build(issuer_key, issuer_cert)
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..30811c7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Replace-assertRaisesRegexp-with-assertRaisesRegex.patch
diff --git a/tests/test_ocsp_response_builder.py b/tests/test_ocsp_response_builder.py
index 89fa604..238b8e6 100644
--- a/tests/test_ocsp_response_builder.py
+++ b/tests/test_ocsp_response_builder.py
@@ -62,21 +62,21 @@ class OCSPResponseBuilderTests(unittest.TestCase):
issuer_cert = asymmetric.load_certificate(os.path.join(fixtures_dir, 'test.crt'))
subject_cert = asymmetric.load_certificate(os.path.join(fixtures_dir, 'test-inter.crt'))
- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
+ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
builder = OCSPResponseBuilder('successful', subject_cert, 'good')
builder.certificate = None
ocsp_response = builder.build(issuer_key, issuer_cert)
- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
+ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
builder = OCSPResponseBuilder('successful', subject_cert, 'good')
builder.certificate_status = None
ocsp_response = builder.build(issuer_key, issuer_cert)
- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
+ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
builder = OCSPResponseBuilder('successful', subject_cert)
ocsp_response = builder.build(issuer_key, issuer_cert)
- with self.assertRaisesRegexp(ValueError, 'must be set if the response_status is "successful"'):
+ with self.assertRaisesRegex(ValueError, 'must be set if the response_status is "successful"'):
builder = OCSPResponseBuilder('successful', None, 'good')
ocsp_response = builder.build(issuer_key, issuer_cert)