[#2006] Tidy up.

ckan · Nov 5, 2014 · d23523c · d23523c
1 parent b985a53
commit d23523c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ckan/lib/dictization/__init__.py b/ckan/lib/dictization/__init__.py
@@ -72,7 +72,7 @@ def obj_list_dictize(obj_list, context, sort_key=lambda x:x):
             dictized = table_dictize(obj, context, capacity=capacity)
         else:
             dictized = table_dictize(obj, context)
-        if active and obj.state not in ('active'):
+        if active and obj.state != 'active':
             continue
         result_list.append(dictized)
 

diff --git a/ckan/tests/models/test_package.py b/ckan/tests/models/test_package.py
@@ -47,7 +47,6 @@ def test_basic_revisioning(self):
         assert len(package.all_revisions) == 1
         assert package.all_revisions[0].revision_id == revision_id
         assert package.all_revisions[0].revision_timestamp == timestamp
-        assert package.all_revisions[0].expired_id is None
 
         # change it
         rev = model.repo.new_revision()
@@ -61,11 +60,9 @@ def test_basic_revisioning(self):
         assert len(package.all_revisions) == 2
         assert package.all_revisions[0].revision_id == revision_id2
         assert package.all_revisions[0].revision_timestamp == timestamp2
-        assert package.all_revisions[0].expired_id is None
 
         assert package.all_revisions[1].revision_id == revision_id
         assert package.all_revisions[1].revision_timestamp == timestamp
-        assert package.all_revisions[1].expired_id == revision_id2
 
     def test_create_package(self):
         package = model.Package.by_name(self.name)