[#669] PEP8

ckan · Mar 20, 2013 · e7ae872 · e7ae872
1 parent 077f71a
commit e7ae872
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 35 deletions.
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -269,8 +269,8 @@ def member_list(context, data_dict=None):
     _check_access('group_show', context, data_dict)
 
     q = model.Session.query(model.Member).\
-            filter(model.Member.group_id == group.id).\
-            filter(model.Member.state    == "active")
+        filter(model.Member.group_id == group.id).\
+        filter(model.Member.state == "active")
 
     if obj_type:
         q = q.filter(model.Member.table_name == obj_type)

diff --git a/ckan/tests/logic/test_member.py b/ckan/tests/logic/test_member.py
@@ -2,6 +2,7 @@
 from ckan.logic import get_action
 from ckan.lib.create_test_data import CreateTestData
 
+
 class TestMemberLogic(object):
 
     @classmethod
@@ -11,62 +12,57 @@ def setup_class(cls):
 
         model.repo.new_revision()
         CreateTestData.create()
-        cls.pkgs = [
-            model.Package.by_name('warandpeace'),
-            model.Package.by_name('annakarenina'),
-        ]
+        cls.pkgs = [model.Package.by_name('warandpeace'),
+                    model.Package.by_name('annakarenina')]
 
     @classmethod
     def teardown_class(cls):
         model.repo.rebuild_db()
 
-    def _build_context( self, obj, obj_type, capacity='public'):
-        ctx = { 'model': model,
-                'session': model.Session,
-                'user':self.username
-        }
-        dd = {
-            'id': self.groupname,
-            'object': obj,
-            'object_type': obj_type,
-            'capacity': capacity }
+    def _build_context(self, obj, obj_type, capacity='public'):
+        ctx = {'model': model,
+               'session': model.Session,
+               'user': self.username}
+        dd = {'id': self.groupname,
+              'object': obj,
+              'object_type': obj_type,
+              'capacity': capacity}
         return ctx, dd
 
-    def _add_member( self, obj, obj_type, capacity):
-        ctx, dd = self._build_context(obj,obj_type,capacity)
-        return get_action('member_create')(ctx,dd)
+    def _add_member(self, obj, obj_type, capacity):
+        ctx, dd = self._build_context(obj, obj_type, capacity)
+        return get_action('member_create')(ctx, dd)
 
     def test_member_add(self):
-        res = self._add_member( self.pkgs[0].id, 'package', 'public')
+        res = self._add_member(self.pkgs[0].id, 'package', 'public')
         assert 'capacity' in res and res['capacity'] == u'public'
 
     def test_member_list(self):
-        _ = self._add_member( self.pkgs[0].id, 'package', 'public')
-        _ = self._add_member( self.pkgs[1].id, 'package', 'public')
-        ctx, dd = self._build_context('','package')
-        res = get_action('member_list')(ctx,dd)
+        self._add_member(self.pkgs[0].id, 'package', 'public')
+        self._add_member(self.pkgs[1].id, 'package', 'public')
+        ctx, dd = self._build_context('', 'package')
+        res = get_action('member_list')(ctx, dd)
         assert len(res) == 2, res
         assert (self.pkgs[0].id, 'package', 'public') in res
         assert (self.pkgs[1].id, 'package', 'public') in res
 
-        ctx, dd = self._build_context('','user', 'admin')
-        res = get_action('member_list')(ctx,dd)
+        ctx, dd = self._build_context('', 'user', 'admin')
+        res = get_action('member_list')(ctx, dd)
         assert len(res) == 0, res
 
-        _ = self._add_member( self.username, 'user', 'admin')
-        ctx, dd = self._build_context('','user', 'admin')
-        res = get_action('member_list')(ctx,dd)
+        self._add_member(self.username, 'user', 'admin')
+        ctx, dd = self._build_context('', 'user', 'admin')
+        res = get_action('member_list')(ctx, dd)
         assert len(res) == 1, res
         assert (self.username, 'user', 'Admin') in res
 
-
     def test_member_delete(self):
-        _ = self._add_member( self.username, 'user', 'admin')
-        ctx, dd = self._build_context(self.username,'user', 'admin')
-        res = get_action('member_list')(ctx,dd)
+        self._add_member(self.username, 'user', 'admin')
+        ctx, dd = self._build_context(self.username, 'user', 'admin')
+        res = get_action('member_list')(ctx, dd)
         assert len(res) == 1, res
 
-        get_action('member_delete')(ctx,dd)
+        get_action('member_delete')(ctx, dd)
 
-        res = get_action('member_list')(ctx,dd)
+        res = get_action('member_list')(ctx, dd)
         assert len(res) == 0, res