From a737372032874dba4dcc4dcb45d20ba400b328f7 Mon Sep 17 00:00:00 2001
From: Luis Pabon <lpabon@redhat.com>
Date: Mon, 8 Jul 2013 15:47:46 -0400
Subject: Removed unused metadata key and do_rmdir func

Change-Id: Ibcef5d817390a11d85cf125bb9addfbfded1b019
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5301
Reviewed-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
---
 gluster/swift/common/fs_utils.py  | 13 -------------
 gluster/swift/common/utils.py     |  1 -
 test/unit/common/test_fs_utils.py | 18 ------------------
 3 files changed, 32 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
diff --git a/test/unit/common/test_fs_utils.py b/test/unit/common/test_fs_utils.py
index 175a362..b31a9a2 100644
--- a/test/unit/common/test_fs_utils.py
+++ b/test/unit/common/test_fs_utils.py
@@ -237,24 +237,6 @@ class TestFsUtils(unittest.TestCase):
         finally:
             os.rmdir(tmpdir)
 
-    def test_do_rmdir(self):
-        tmpdir = mkdtemp()
-        fs.do_rmdir(tmpdir)
-        assert not os.path.exists(tmpdir)
-        assert not fs.do_rmdir(os.path.join('/tmp', str(random.random())))
-
-    def test_do_rmdir_err(self):
-        fd, tmpfile = mkstemp()
-        try:
-            fs.do_rmdir(tmpfile)
-        except OSError:
-            pass
-        else:
-            self.fail('OSError expected')
-        finally:
-            os.close(fd)
-            os.remove(tmpfile)
-
     def test_do_rename(self):
         srcpath = mkdtemp()
         try:
-- 
cgit