summaryrefslogtreecommitdiff
path: root/src/etcd
diff options
context:
space:
mode:
authorJose Plana <jplana@gmail.com>2013-10-16 23:58:37 +0200
committerJose Plana <jplana@gmail.com>2013-10-16 23:58:37 +0200
commit3d167d8a6a27efce658871c6d74bec48cd5c164b (patch)
tree3a5b55e7ffebb41e6f44f49b7170b5b2a247e49f /src/etcd
parentfed0d364f2a31ed100f4c30a74b05e553ebc5290 (diff)
Fix pep8
Diffstat (limited to 'src/etcd')
-rw-r--r--src/etcd/__init__.py21
-rw-r--r--src/etcd/tests/unit/test_request.py20
2 files changed, 19 insertions, 22 deletions
diff --git a/src/etcd/__init__.py b/src/etcd/__init__.py
index 8d3cd57..710dccf 100644
--- a/src/etcd/__init__.py
+++ b/src/etcd/__init__.py
@@ -4,17 +4,16 @@ from client import Client
class EtcdResult(collections.namedtuple(
'EtcdResult',
- [
- 'action',
- 'index',
- 'key',
- 'prevValue',
- 'value',
- 'expiration',
- 'ttl',
- 'newKey',
- 'dir'
- ])):
+ ['action',
+ 'index',
+ 'key',
+ 'prevValue',
+ 'value',
+ 'expiration',
+ 'ttl',
+ 'newKey',
+ 'dir',
+ ])):
def __new__(
cls,
diff --git a/src/etcd/tests/unit/test_request.py b/src/etcd/tests/unit/test_request.py
index e8b89f1..7b8503d 100644
--- a/src/etcd/tests/unit/test_request.py
+++ b/src/etcd/tests/unit/test_request.py
@@ -162,12 +162,11 @@ class TestClientRequest(unittest.TestCase):
u'value': u'test2'})
], result)
-
def test_get_subdirs(self):
""" Can understand dirs in results """
client = etcd.Client()
client.api_execute = mock.Mock(
- return_value =
+ return_value=
'[{"action":"GET",'
'"key":"/testdir/key1",'
'"value":"test1",'
@@ -180,18 +179,17 @@ class TestClientRequest(unittest.TestCase):
result = client.get('/testdir')
self.assertEquals([
etcd.EtcdResult(
- **{u'action': u'GET',
- u'index': 190,
- u'key': u'/testdir/key1',
- u'value': u'test1'}),
+ **{u'action': u'GET',
+ u'index': 190,
+ u'key': u'/testdir/key1',
+ u'value': u'test1'}),
etcd.EtcdResult(
- **{u'action': u'GET',
- u'index': 191,
- u'key': u'/testdir/key2',
- u'dir': True})
+ **{u'action': u'GET',
+ u'index': 191,
+ u'key': u'/testdir/key2',
+ u'dir': True})
], result)
-
def test_not_in(self):
""" Can check if key is not in client """
client = etcd.Client()