summaryrefslogtreecommitdiffstats
path: root/gluster
diff options
context:
space:
mode:
Diffstat (limited to 'gluster')
-rw-r--r--gluster/swift/common/fs_utils.py13
-rw-r--r--gluster/swift/common/utils.py1
2 files changed, 0 insertions, 14 deletions
diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py
index b3f58b7..4de58e4 100644
--- a/gluster/swift/common/fs_utils.py
+++ b/gluster/swift/common/fs_utils.py
@@ -137,19 +137,6 @@ def do_unlink(path, log=True):
return True
-def do_rmdir(path):
- try:
- os.rmdir(path)
- except OSError as err:
- if err.errno != errno.ENOENT:
- logging.exception("Rmdir failed on %s err: %s", path, err.strerror)
- raise
- res = False
- else:
- res = True
- return res
-
-
def do_rename(old_path, new_path):
try:
os.rename(old_path, new_path)
diff --git a/gluster/swift/common/utils.py b/gluster/swift/common/utils.py
index c943777..40ede7e 100644
--- a/gluster/swift/common/utils.py
+++ b/gluster/swift/common/utils.py
@@ -49,7 +49,6 @@ ASYNCDIR = 'async_pending' # Keep in sync with swift.obj.server.ASYNCDIR
FILE = 'file'
FILE_TYPE = 'application/octet-stream'
OBJECT = 'Object'
-OBJECT_TYPE = 'application/octet-stream'
DEFAULT_UID = -1
DEFAULT_GID = -1
PICKLE_PROTOCOL = 2