Mercurial > hg > decoupage
comparison decoupage/formats.py @ 55:47acf12d01e1
merge commit
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Thu, 18 Nov 2010 08:19:06 -0800 |
parents | 0e2b9e0507c5 a2f09d749a3f |
children | 884e6c805208 |
comparison
equal
deleted
inserted
replaced
54:0e2b9e0507c5 | 55:47acf12d01e1 |
---|---|
10 # TODO: convert this to a class | 10 # TODO: convert this to a class |
11 def format_json(data): | 11 def format_json(data): |
12 | 12 |
13 # fix datetime | 13 # fix datetime |
14 for f in data['files']: | 14 for f in data['files']: |
15 f['modified'] = f['modified'].ctime() | 15 if 'modified' in f: |
16 f['modified'] = f['modified'].ctime() | |
16 | 17 |
17 return 'application/json', json.dumps(data['files']) | 18 return 'application/json', json.dumps(data['files']) |
18 | 19 |
19 class RSS(object): | 20 class RSS(object): |
20 | 21 |