summaryrefslogtreecommitdiff
path: root/ldap3/operation/search.py
diff options
context:
space:
mode:
authorAndrej Shadura <andrew.shadura@collabora.co.uk>2020-11-30 12:16:10 +0100
committerAndrej Shadura <andrew.shadura@collabora.co.uk>2020-11-30 12:16:10 +0100
commitd7ea1d4c872a0ef39cce7a6bb6d2b9c9fd6c205e (patch)
tree509fcc27647de80e229c24babd4685ba04b45802 /ldap3/operation/search.py
parent2bcee5c91d65796532aef1b15f6c8c0c16197aee (diff)
parent96fb2df0e33b34a4dbb75577de8589a8611759c4 (diff)
Update upstream source from tag 'upstream/2.8.1'
Update to upstream version '2.8.1' with Debian dir 4d1ac29b7ae225ca99fb367a07e2e8183bc94036
Diffstat (limited to 'ldap3/operation/search.py')
-rw-r--r--ldap3/operation/search.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ldap3/operation/search.py b/ldap3/operation/search.py
index b78d86d..e12c13c 100644
--- a/ldap3/operation/search.py
+++ b/ldap3/operation/search.py
@@ -38,7 +38,6 @@ 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
ROOT = 0
AND = 1
@@ -381,7 +380,7 @@ def search_operation(search_base,
def decode_vals(vals):
try:
return [str(val) for val in vals if val] if vals else None
- except PyAsn1UnicodeDecodeError:
+ except UnicodeDecodeError:
return decode_raw_vals(vals)
def decode_vals_fast(vals):