- if slice_filter <> None and isinstance(slice_filter, dict) and \
- slice_filter.has_key('slice_attribute_ids') and \
- not slice_filter.has_key('slice_tag_ids'):
- slice_filter['slice_tag_ids']=slice_filter['slice_attribute_ids']
+ if isinstance(slice_filter, dict):
+ if slice_filter.has_key('slice_attribute_ids'):
+ slice_tag_ids = slice_filter.pop('slice_attribute_ids')
+ if not slice_filter.has_key('slice_tag_ids'):
+ slice_filter['slice_tag_ids']=slice_tag_ids
+ if isinstance(return_fields, list):
+ if 'slice_attribute_ids' in return_fields:
+ return_fields.remove('slice_attribute_ids')
+ if 'slice_tag_ids' not in return_fields:
+ return_fields.append('slice_tag_ids')