Skip to content
Snippets Groups Projects

code refactor

Merged Florian Obersteiner requested to merge (removed):master into master
1 file
+ 4
3
Compare changes
  • Side-by-side
  • Inline
+ 4
3
@@ -710,10 +710,10 @@ class Dataset:
def isAsciiAlpha(x):
return re.match("[a-zA-Z0-9-_.]", x)
allAsciiAlpha = all([isAsciiAlpha(x) for x in name])
allAsciiAlpha = all(isAsciiAlpha(x) for x in name)
lessThan128Characters = len(name) < 128
return allAsciiAlpha and lessThan128Characters
return allAsciiAlpha and lessThan128Characters and name.endswith('.ict')
def writeHeader(self, f=sys.stdout, delimiter=DEFAULT_FIELD_DELIM):
"""Write header
@@ -914,7 +914,8 @@ class Dataset:
else:
self.inputFhandle = f
# TODO should we add a filename characters check, as we have it for the variable names?
if not self.isValidFileName(pathlib.Path(f).name):
warnings.warn(f"{pathlib.Path(f).name} is not a valid ICARTT filename")
self.readHeader(splitChar)
if loadData:
Loading