Skip to content

Commit

Permalink
Merge branch 'mordoror-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hgrecco committed Jan 21, 2015
2 parents 0ab79b9 + 4e433a7 commit 117cf59
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pyvisa/resources/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def interface_type(self):
"""The interface type of the resource as a number.
"""
return self.visalib.parse_resource(self._resource_manager.session,
self.resource_name).interface_type
self.resource_name)[0].interface_type

def ignore_warning(self, *warnings_constants):
"""Ignoring warnings context manager for the current resource.
Expand Down

0 comments on commit 117cf59

Please sign in to comment.