Revision 82482e2c pithos/api/functions.py

b/pithos/api/functions.py
166 166 
        if x == request.user_uniq:
167 167 
            continue
168 168 
        try:
169 
            meta = request.backend.get_account_meta(request.user_uniq, x, 'pithos')
169 
            meta = request.backend.get_account_meta(request.user_uniq, x, 'pithos', include_user_defined=False)
170 170 
            groups = request.backend.get_account_groups(request.user_uniq, x)
171 171 
        except NotAllowedError:
172 172 
            raise Forbidden('Not allowed')
173 173 
        else:
174 174 
            rename_meta_key(meta, 'modified', 'last_modified')
175 175 
            rename_meta_key(meta, 'until_timestamp', 'x_account_until_timestamp')
176 
            m = dict([(k[15:], v) for k, v in meta.iteritems() if k.startswith('X-Account-Meta-')])
177 
            for k in m:
178 
                del(meta['X-Account-Meta-' + k])
179 
            if m:
180 
                meta['X-Account-Meta'] = printable_header_dict(m)
181 176 
            if groups:
182 177 
                meta['X-Account-Group'] = printable_header_dict(dict([(k, ','.join(v)) for k, v in groups.iteritems()]))
183 178 
            account_meta.append(printable_header_dict(meta))
......
288 283 
    for x in containers:
289 284 
        try:
290 285 
            meta = request.backend.get_container_meta(request.user_uniq, v_account,
291 
                                                        x, 'pithos', until)
286 
                                                        x, 'pithos', until, include_user_defined=False)
292 287 
            policy = request.backend.get_container_policy(request.user_uniq,
293 288 
                                                            v_account, x)
294 289 
        except NotAllowedError:
......
298 293 
        else:
299 294 
            rename_meta_key(meta, 'modified', 'last_modified')
300 295 
            rename_meta_key(meta, 'until_timestamp', 'x_container_until_timestamp')
301 
            m = dict([(k[17:], v) for k, v in meta.iteritems() if k.startswith('X-Container-Meta-')])
302 
            for k in m:
303 
                del(meta['X-Container-Meta-' + k])
304 
            if m:
305 
                meta['X-Container-Meta'] = printable_header_dict(m)
306 296 
            if policy:
307 297 
                meta['X-Container-Policy'] = printable_header_dict(dict([(k, v) for k, v in policy.iteritems()]))
308 298 
            container_meta.append(printable_header_dict(meta))

Also available in: Unified diff