diff options
author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-11-30 12:20:57 +0100 |
---|---|---|
committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-11-30 12:20:57 +0100 |
commit | 8a9d19eef193507910546e04656b36f99e8cebe9 (patch) | |
tree | 19e217cf83173688521744131e53e0d572ef239c | |
parent | 67bdb3616e326030a8a4d00ce70ebf6a8a87c9d6 (diff) |
Drop a no longer necessary patchdebian/2.8.1-1
-rw-r--r-- | debian/patches/pyasn1-compat.patch | 27 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/pyasn1-compat.patch b/debian/patches/pyasn1-compat.patch deleted file mode 100644 index 9b38abd..0000000 --- a/debian/patches/pyasn1-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Andrej Shadura <andrewsh@debian.org> -Date: Fri, 24 Apr 2020 07:38:00 +0200 -Subject: Try to import an old exception name - -pyasn1 0.4.6 started throwing PyAsn1UnicodeDecodeError instead of a generic PyAsn1Error - -This patch needs to be dropped when pyasn1 is updated in Debian. ---- - ldap3/operation/search.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ldap3/operation/search.py b/ldap3/operation/search.py -index b78d86d..d7cb50d 100644 ---- a/ldap3/operation/search.py -+++ b/ldap3/operation/search.py -@@ -38,7 +38,10 @@ from ..operation.bind import referrals_to_list - from ..protocol.convert import ava_to_dict, attributes_to_list, search_refs_to_list, validate_assertion_value, prepare_filter_for_sending, search_refs_to_list_fast
- from ..protocol.formatters.standard import format_attribute_values
- from ..utils.conv import to_unicode, to_raw
--from pyasn1.error import PyAsn1UnicodeDecodeError
-+try:
-+ from pyasn1.error import PyAsn1UnicodeDecodeError
-+except ImportError:
-+ from pyasn1.error import PyAsn1Error as PyAsn1UnicodeDecodeError
-
- ROOT = 0
- AND = 1
diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 5fd49ff..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -pyasn1-compat.patch |