From 0df7092e052ebee38c8958761eaafa8e68ff63f1 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 15 Dec 2013 12:10:19 +0100
Subject: [PATCH] [entropy.locks] drop "_lock", just "acquire" or "release",
 it's cleaner

---
 lib/entropy/locks.py                     |  4 ++--
 lib/tests/locks.py                       | 10 +++++-----
 magneto/src/magneto_app.py               |  4 ++--
 services/entropy-pkgdelta-generator      |  4 ++--
 services/portage-repository-converter    |  4 ++--
 services/repository-webinstall-generator |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/entropy/locks.py b/lib/entropy/locks.py
index 10adfc1f1..c92e8730f 100644
--- a/lib/entropy/locks.py
+++ b/lib/entropy/locks.py
@@ -29,7 +29,7 @@ class SimpleFileLock(object):
     """
 
     @classmethod
-    def acquire_lock(cls, lock_file, lock_map):
+    def acquire(cls, lock_file, lock_map):
         """
         Make possible to protect a code region using an EXCLUSIVE, non-blocking
         file lock. A lock map (dict) is required in order to register the lock
@@ -62,7 +62,7 @@ class SimpleFileLock(object):
             raise
 
     @classmethod
-    def release_lock(cls, lock_file, lock_map):
+    def release(cls, lock_file, lock_map):
         """
         Release a previously acquired lock through acquire_lock().
 
diff --git a/lib/tests/locks.py b/lib/tests/locks.py
index f331d3b2f..fbd9af1e4 100644
--- a/lib/tests/locks.py
+++ b/lib/tests/locks.py
@@ -22,22 +22,22 @@ class EntropyLocksTest(unittest.TestCase):
             tmp_fd, tmp_path = const_mkstemp(prefix="test_simple_lock")
 
             lock_map = {}
-            self.assertEquals(True, sfl.acquire_lock(tmp_path, lock_map))
+            self.assertEquals(True, sfl.acquire(tmp_path, lock_map))
             self.assertIn(tmp_path, lock_map)
             self.assertTrue(lock_map[tmp_path] is not None)
 
             lock_map_new = {}
-            self.assertEquals(False, sfl.acquire_lock(tmp_path, lock_map_new))
+            self.assertEquals(False, sfl.acquire(tmp_path, lock_map_new))
             self.assertNotIn(tmp_path, lock_map_new)
             self.assertIn(tmp_path, lock_map)
 
-            sfl.release_lock(tmp_path, lock_map)
+            sfl.release(tmp_path, lock_map)
 
-            self.assertEquals(True, sfl.acquire_lock(tmp_path, lock_map_new))
+            self.assertEquals(True, sfl.acquire(tmp_path, lock_map_new))
             self.assertIn(tmp_path, lock_map_new)
             self.assertTrue(lock_map_new[tmp_path] is not None)
 
-            sfl.release_lock(tmp_path, lock_map_new)
+            sfl.release(tmp_path, lock_map_new)
 
         finally:
             if tmp_fd is not None:
diff --git a/magneto/src/magneto_app.py b/magneto/src/magneto_app.py
index 03a87b6f5..63957b128 100755
--- a/magneto/src/magneto_app.py
+++ b/magneto/src/magneto_app.py
@@ -104,9 +104,9 @@ if __name__ == "__main__":
     from entropy.locks import SimpleFileLock
     lock_map = {}
     magneto_lock = os.path.join(magneto_lock_dir, magneto_lock_file)
-    acquired = SimpleFileLock.acquire_lock(magneto_lock, lock_map)
+    acquired = SimpleFileLock.acquire(magneto_lock, lock_map)
     def _unlock_func():
-        SimpleFileLock.release_lock(magneto_lock, lock_map)
+        SimpleFileLock.release(magneto_lock, lock_map)
 
     try:
         if acquired:
diff --git a/services/entropy-pkgdelta-generator b/services/entropy-pkgdelta-generator
index 2c3b4be8d..12f640468 100755
--- a/services/entropy-pkgdelta-generator
+++ b/services/entropy-pkgdelta-generator
@@ -277,7 +277,7 @@ if __name__ == "__main__":
         lock_map = {}
         acquired = False
         if lock_file:
-            acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
+            acquired = SimpleFileLock.acquire(lock_file, lock_map)
             if not acquired:
                 sys.stdout.write("cannot acquire lock on " + lock_file + "\n")
                 raise SystemExit(5)
@@ -285,7 +285,7 @@ if __name__ == "__main__":
             rc = func(argv, quiet)
         finally:
             if acquired:
-                SimpleFileLock.release_lock(lock_file, lock_map)
+                SimpleFileLock.release(lock_file, lock_map)
     else:
         _print_help()
         rc = 1
diff --git a/services/portage-repository-converter b/services/portage-repository-converter
index 33b09a708..db592c09a 100755
--- a/services/portage-repository-converter
+++ b/services/portage-repository-converter
@@ -342,7 +342,7 @@ def _sync_tree(args):
     acquired = False
     try:
 
-        acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
+        acquired = SimpleFileLock.acquire(lock_file, lock_map)
 
         if not acquired:
             print_error(brown(_("Another instance is running.")))
@@ -377,7 +377,7 @@ def _sync_tree(args):
 
     finally:
         if acquired:
-            SimpleFileLock.release_lock(lock_file, lock_map)
+            SimpleFileLock.release(lock_file, lock_map)
 
 
 if __name__ == "__main__":
diff --git a/services/repository-webinstall-generator b/services/repository-webinstall-generator
index 59d0392ce..ad8aad291 100755
--- a/services/repository-webinstall-generator
+++ b/services/repository-webinstall-generator
@@ -528,7 +528,7 @@ def _generate(args):
     acquired = False
     try:
 
-        acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
+        acquired = SimpleFileLock.acquire(lock_file, lock_map)
         if not acquired:
             print_error(brown(_("Another instance is running.")))
             return 1
@@ -560,7 +560,7 @@ def _generate(args):
 
     finally:
         if acquired:
-            SimpleFileLock.release_lock(lock_file, lock_map)
+            SimpleFileLock.release(lock_file, lock_map)
 
 
 if __name__ == "__main__":