Merge from trunk

This commit is contained in:
Charles Haley 2011-03-03 18:33:39 +00:00
commit 9dcdff65d5
2 changed files with 2 additions and 2 deletions

View File

@ -346,7 +346,7 @@ class BrowseServer(object):
for category in sorted(categories, key=lambda x: sort_key(getter(x))):
if len(categories[category]) == 0:
continue
if category == 'formats' or category == 'identifiers':
if category in ('formats', 'identifiers'):
continue
meta = category_meta.get(category, None)
if meta is None:

View File

@ -580,7 +580,7 @@ class OPDSServer(object):
for category in sorted(categories, key=lambda x: sort_key(getter(x))):
if len(categories[category]) == 0:
continue
if category == 'formats' or category == 'identifiers':
if category in ('formats', 'identifiers'):
continue
meta = category_meta.get(category, None)
if meta is None: