Added the session parameter to list_resources

pyvisa · Apr 16, 2015 · 3a713eb · 3a713eb
1 parent c4e6663
commit 3a713eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pyvisa/ctwrapper/highlevel.py b/pyvisa/ctwrapper/highlevel.py
@@ -185,7 +185,7 @@ def _return_handler(self, ret_value, func, arguments):
 
         return ret_value
 
-    def list_resources(self, query='?*::INSTR'):
+    def list_resources(self, session, query='?*::INSTR'):
         """Returns a tuple of all connected devices matching query.
 
         :param query: regular expression used to match devices.
@@ -196,7 +196,7 @@ def list_resources(self, query='?*::INSTR'):
         resources = []
 
         try:
-            find_list, return_counter, instrument_description, err = lib.find_resources(self.session, query)
+            find_list, return_counter, instrument_description, err = lib.find_resources(session, query)
         except errors.VisaIOError as e:
             if e.error_code == constants.StatusCode.error_resource_not_found:
                 return tuple()

diff --git a/pyvisa/highlevel.py b/pyvisa/highlevel.py
@@ -665,7 +665,7 @@ def install_handler(self, session, event_type, handler, user_handle):
         """
         raise NotImplementedError
 
-    def list_resources(self, query='?*::INSTR'):
+    def list_resources(self, session, query='?*::INSTR'):
         """Returns a tuple of all connected devices matching query.
 
         :param query: regular expression used to match devices.
@@ -1553,7 +1553,7 @@ def list_resources(self, query='?*::INSTR'):
         :param query: regular expression used to match devices.
         """
 
-        return self.visalib.list_resources(query)
+        return self.visalib.list_resources(self.session, query)
 
     def list_resources_info(self, query='?*::INSTR'):
         """Returns a dictionary mapping resource names to resource extended