summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-03-17 09:37:03 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-03-17 09:52:27 -0700
commit99870bfa02f1ba490da6a59b1499f0f1578c9825 (patch)
tree669777f96498aaa3844f33cb40fece7298db9751
parent4977769caf5372e33f57808ad73e18cb700cb516 (diff)
downloadlockfile-99870bfa02f1ba490da6a59b1499f0f1578c9825.tar.gz
Remove oslo.concurrency from replacement recommendation
Oslo libraries (especially those prefixed with oslo) are really better suited for usage inside openstack, while libraries from oslo without that prefix are better suited for all around general usage so to avoid confusion take off the recommendation to replace pylockfile with oslo.concurrency and just leave the better matched fasteners as its replacement. Also fixes a very tiny flake8 warning that was stopping the pep8/flake8 job from working. Change-Id: I1ec1cbfb4c7e371ed93627cffa2b32dbe0401069
-rw-r--r--doc/source/index.rst3
-rw-r--r--lockfile/symlinklockfile.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 5f1f2dd..0b43c48 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -10,7 +10,7 @@
.. warning::
This package is **deprecated**. It is highly preferred that instead of
- using this code base that instead `fasteners`_ or `oslo.concurrency`_ is
+ using this code base (where appropriate) that instead `fasteners`_ is
used instead. For any questions or comments or further help needed
please email `openstack-dev`_ and prefix your email subject
with ``[oslo][pylockfile]`` (for a faster response).
@@ -284,4 +284,3 @@ submit a patch, check http://launchpad.net/pylockfile
.. _fasteners: http://fasteners.readthedocs.org/
.. _openstack-dev: mailto:openstack-dev@lists.openstack.org
-.. _oslo.concurrency: http://docs.openstack.org/developer/oslo.concurrency/
diff --git a/lockfile/symlinklockfile.py b/lockfile/symlinklockfile.py
index 23b41f5..915cf19 100644
--- a/lockfile/symlinklockfile.py
+++ b/lockfile/symlinklockfile.py
@@ -62,8 +62,8 @@ class SymlinkLockFile(LockBase):
return os.path.islink(self.lock_file)
def i_am_locking(self):
- return (os.path.islink(self.lock_file)
- and os.readlink(self.lock_file) == self.unique_name)
+ return (os.path.islink(self.lock_file) and
+ os.readlink(self.lock_file) == self.unique_name)
def break_lock(self):
if os.path.islink(self.lock_file): # exists && link