Commit 6d4f362a authored by Patrik Marschalik's avatar Patrik Marschalik
Browse files

Fix extraction of file name extensions

parent 91b76e63
...@@ -56,11 +56,12 @@ class NanonisFile(object): ...@@ -56,11 +56,12 @@ class NanonisFile(object):
'sxm', or 'dat'. 'sxm', or 'dat'.
""" """
if self.fname[-3:] == '3ds': _, fname_ext = os.path.splitext(self.fname)
if fname_ext == '.3ds':
return 'grid' return 'grid'
elif self.fname[-3:] == 'sxm': elif self.fname[-3:] == '.sxm':
return 'scan' return 'scan'
elif self.fname[-3:] == 'dat': elif self.fname[-3:] == '.dat':
return 'spec' return 'spec'
else: else:
raise UnhandledFileError( raise UnhandledFileError(
...@@ -760,5 +761,6 @@ def _is_valid_file(fname, ext): ...@@ -760,5 +761,6 @@ def _is_valid_file(fname, ext):
""" """
Detect if invalid file is being initialized by class. Detect if invalid file is being initialized by class.
""" """
if fname[-3:] != ext: _, fname_ext = os.path.splitext(fname)
if fname_ext[1:] != ext:
raise UnhandledFileError('{} is not a {} file'.format(fname, ext)) raise UnhandledFileError('{} is not a {} file'.format(fname, ext))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment