Support for etcd v0.2.0 final

Author: lavagetto

.travis.yml

@@ -4,7 +4,7 @@ python:
   - "3.3"
 
 before_install:
-  - ./build_etcd.sh v0.2.0-rc1
+  - ./build_etcd.sh v0.2.0
 
 # command to install dependencies
 install: 

src/etcd/__init__.py

@@ -47,6 +47,21 @@ def children(self):
                 yield child
         return
 
+    def __eq__(self, other):
+        if not (type(self) is type(other)):
+            return False
+        for k in self._node_props.keys():
+            try:
+                a = getattr(self, k)
+                b = getattr(other, k)
+                if a != b:
+                    return False
+            except:
+                return False
+        return True
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
 
 class EtcdException(Exception):

src/etcd/client.py

@@ -247,11 +247,11 @@ def write(self, key, value, ttl=None, dir=False, append = False, **kwdargs):
                 else:
                     params[k] = v
 
-        method = append and self._MPOST or self.MPUT
+        method = append and self._MPOST or self._MPUT
         if '_endpoint' in kwdargs:
             path = kwdargs['_endpoint'] + key
         else:
-            path = self.key_endpoint + key)
+            path = self.key_endpoint + key
         response = self.api_execute(path, method, params)
         return self._result_from_response(response)
 
@@ -316,7 +316,7 @@ def delete(self, key, recursive=None, dir=None):
         if recursive is not None:
             kwds['recursive'] = recursive and "true" or "false"
         if dir is not None:
-            kwds['dir'] = dir and "true" on "false"
+            kwds['dir'] = dir and "true" or "false"
 
         response = self.api_execute(
             self.key_endpoint + key, self._MDELETE, kwds)
@@ -440,9 +440,10 @@ def _result_from_response(self, response):
         #TODO: add headers we obtained from the http respose to the etcd result.
         try:
             res = json.loads(response.data.decode('utf-8'))
+            r = etcd.EtcdResult(**res)
             if response.status == 201:
-                res['newKey'] = True
-            return etcd.EtcdResult(**res)
+                r.newKey = True
+            return r
         except Exception as e:
             raise etcd.EtcdException(
                 'Unable to decode server response: %s' % e)