cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python3 fix: make sure file name is a string (not bytes) object

Browse source
This commit is contained in:
Helmut Merz 2026-08-19 14:22:35 +02:00 • committed by hamipl
parent d64dee25f6
commit 78af641b05
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cybertools/storage/filesystem.py
View file

@ -28,13 +28,14 @@ class FileSystemStorage(object):
self.subDir = subDir self.subDir = subDir
def getDir(self, address, subDir=None): def getDir(self, address, subDir=None):
if isinstance(address, bytes):
address = address.decode('UTF-8')
subDir = subDir or self.subDir subDir = subDir or self.subDir
subDir = str(subDir)
if self.rootDir is None: if self.rootDir is None:
if subDir: if subDir:
return os.path.join(subDir, address) return os.path.join(subDir, address)
return address return address
return os.path.join(str(self.rootDir), subDir, address) return os.path.join(self.rootDir, subDir, address)
def setData(self, address, data, params={}): def setData(self, address, data, params={}):
subDir = params.get('subdirectory') subDir = params.get('subdirectory')