Python3 fix: make sure file name is a string (not bytes) object
This commit is contained in:
parent
d64dee25f6
commit
78af641b05
1 changed files with 3 additions and 2 deletions
|
|
@ -28,13 +28,14 @@ class FileSystemStorage(object):
|
|||
self.subDir = subDir
|
||||
|
||||
def getDir(self, address, subDir=None):
|
||||
if isinstance(address, bytes):
|
||||
address = address.decode('UTF-8')
|
||||
subDir = subDir or self.subDir
|
||||
subDir = str(subDir)
|
||||
if self.rootDir is None:
|
||||
if subDir:
|
||||
return os.path.join(subDir, 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={}):
|
||||
subDir = params.get('subdirectory')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue