|
|
|
@ -891,8 +891,8 @@ class ServeFile(): |
|
|
|
|
try: |
|
|
|
|
testit = open(self.target, 'r') |
|
|
|
|
testit.close() |
|
|
|
|
except IOError: |
|
|
|
|
raise ServeFileException("Error: Could not open file!") |
|
|
|
|
except IOError as e: |
|
|
|
|
raise ServeFileException("Error: Could not open file, %r" % e) |
|
|
|
|
FileHandler.filePath = self.target |
|
|
|
|
FileHandler.fileName = os.path.basename(self.target) |
|
|
|
|
FileHandler.fileLength = os.stat(self.target).st_size |
|
|
|
@ -912,8 +912,8 @@ class ServeFile(): |
|
|
|
|
self.dirCreated = True |
|
|
|
|
try: |
|
|
|
|
os.mkdir(self.target) |
|
|
|
|
except (IOError, OSError): |
|
|
|
|
raise ServeFileException("Error: Could not create directory '%s' for uploads." % (self.target,)) |
|
|
|
|
except (IOError, OSError) as e: |
|
|
|
|
raise ServeFileException("Error: Could not create directory '%s' for uploads, %r" % (self.target, e)) |
|
|
|
|
else: |
|
|
|
|
raise ServeFileException("Error: Upload directory already exists and is a file.") |
|
|
|
|
FilePutter.targetDir = self.target |
|
|
|
|