Fix locking docs, bump version

Author: lavagetto

README.rst

@@ -108,41 +108,25 @@ Locking module
     # Initialize the lock object:
     # NOTE: this does not acquire a lock yet
     client = etcd.Client()
-    lock = client.get_lock('/customer1', ttl=60)
+    lock = etcd.Lock(client, 'my_lock_name')
 
     # Use the lock object:
-    lock.acquire(timeout=30) #returns if lock could not be acquired within 30 seconds
-    lock.is_locked()  # True
-    lock.renew(60)
-    lock.release()
-    lock.is_locked()  # False
+    lock.acquire(blocking=True, # will block until the lock is acquired
+          lock_ttl=None) # lock will live until we release it
+    lock.is_acquired()  #
+    lock.acquire(lock_ttl=60) # renew a lock
+    lock.release() # release an existing lock
+    lock.is_acquired()  # False
 
     # The lock object may also be used as a context manager:
     client = etcd.Client()
-    lock = client.get_lock('/customer1', ttl=60)
-    with lock as my_lock:
+    with etcd.Lock('customer1') as my_lock:
         do_stuff()
-        lock.is_locked()  # True
-        lock.renew(60)
-    lock.is_locked()  # False
+        my_lock.is_acquired()  # True
+        my_lock.acquire(lock_ttl = 60)
+    my_lock.is_acquired() # False
 
 
-Leader Election module
-~~~~~~~~~~~~~~~~~~~~~~
-
-.. code:: python
-
-    # Set a leader object with a name; if no name is given, the local hostname
-    # is used.
-    # Zero or no ttl means the leader object is persistent.
-    client = etcd.Client()
-    client.election.set('/mysql', name='foo.example.com', ttl=120, timeout=30) # returns the etcd index
-
-    # Get the name
-    print(client.election.get('/mysql')) # 'foo.example.com'
-    # Delete it!
-    print(client.election.delete('/mysql', name='foo.example.com'))
-
 Get machines in the cluster
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

setup.py

@@ -6,7 +6,7 @@
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.3.3'
+version = '0.4.0'
 
 install_requires = [
     'urllib3>=1.7'