diff options
| author | Hernan Grecco <hernan.grecco@gmail.com> | 2015-07-23 12:42:03 -0300 |
|---|---|---|
| committer | Hernan Grecco <hernan.grecco@gmail.com> | 2015-07-23 12:42:03 -0300 |
| commit | ccf755f5a4985da79d841fa97994e02beab94ae3 (patch) | |
| tree | b5c68692744ec424be950b474adcec52b163d62e /pyvisa-py | |
| parent | aa854b9441bbae83b912de64c62c824ede2bdf0f (diff) | |
Implemented query in list_resources using rname.filter
Diffstat (limited to 'pyvisa-py')
| -rw-r--r-- | pyvisa-py/highlevel.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pyvisa-py/highlevel.py b/pyvisa-py/highlevel.py index 7c4b3bc..1753e01 100644 --- a/pyvisa-py/highlevel.py +++ b/pyvisa-py/highlevel.py @@ -15,7 +15,6 @@ from __future__ import division, unicode_literals, print_function, absolute_impo import warnings import random -import re from pyvisa import constants, errors, highlevel, rname from pyvisa.compat import integer_types, OrderedDict @@ -231,10 +230,7 @@ class PyVisaLibrary(highlevel.VisaLibraryBase): resources = sum([st.list_resources() for key, st in sessions.Session.iter_valid_session_classes()], []) - query = query.replace('?*', '.*') - matcher = re.compile(query, re.IGNORECASE) - - resources = tuple(res for res in resources if matcher.match(res)) + resources = rname.filter(resources, query) if resources: return resources |