Commit abf58c24 by rfkelly0

use errno constants instead of raw integers

parent 47a1fee6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import os import os
import sys import sys
import errno
from fs.base import * from fs.base import *
from fs.path import * from fs.path import *
...@@ -76,12 +77,12 @@ class OSFS(FS): ...@@ -76,12 +77,12 @@ class OSFS(FS):
else: else:
os.mkdir(sys_path, self.dir_mode) os.mkdir(sys_path, self.dir_mode)
except OSError, e: except OSError, e:
if e.errno == 17 or e.errno == 183: if e.errno == errno.EEXIST or e.errno == 183:
if self.isfile(path): if self.isfile(path):
raise ResourceInvalidError(path,msg="Cannot create directory, there's already a file of that name: %(path)s") raise ResourceInvalidError(path,msg="Cannot create directory, there's already a file of that name: %(path)s")
if not allow_recreate: if not allow_recreate:
raise DestinationExistsError(path,msg="Can not create a directory that already exists (try allow_recreate=True): %(path)s") raise DestinationExistsError(path,msg="Can not create a directory that already exists (try allow_recreate=True): %(path)s")
elif e.errno == 2: elif e.errno == errno.ENOENT:
raise ParentDirectoryMissingError(path) raise ParentDirectoryMissingError(path)
else: else:
raise raise
...@@ -92,7 +93,7 @@ class OSFS(FS): ...@@ -92,7 +93,7 @@ class OSFS(FS):
try: try:
os.remove(sys_path) os.remove(sys_path)
except OSError, e: except OSError, e:
if e.errno == 13 and sys.platform == "win32": if e.errno == errno.EACCES and sys.platform == "win32":
# sometimes windows says this for attempts to remove a dir # sometimes windows says this for attempts to remove a dir
if os.path.isdir(sys_path): if os.path.isdir(sys_path):
raise ResourceInvalidError(path) raise ResourceInvalidError(path)
......
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