comparison uploader/handlers.py @ 22:a60cf57d6628

hopefully fix unicode issue
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 29 Aug 2011 22:54:21 -0700
parents 183224756ded
children
comparison
equal deleted inserted replaced
21:183224756ded 22:a60cf57d6628
41 form += self.form 41 form += self.form
42 if self.app.display_contents: 42 if self.app.display_contents:
43 contents = os.listdir(self.app.directory) 43 contents = os.listdir(self.app.directory)
44 if contents: 44 if contents:
45 contents.sort() 45 contents.sort()
46 form += '<div><i>Currently uploaded:<ul><li>' + '</li><li>'.join(contents) + '</li></ul></i></div>' 46 form += '<div><i>Currently uploaded:<ul><li>' + '</li><li>'.join([i.decode('utf-8', 'ignore') for i in contents]) + '</li></ul></i></div>'
47 else: 47 else:
48 form += '<div><i>No files in upload directory</i></div>' 48 form += '<div><i>No files in upload directory</i></div>'
49 log_file = self.app.log_file 49 log_file = self.app.log_file
50 if log_file and os.path.exists(log_file): 50 if log_file and os.path.exists(log_file):
51 log_contents = ''.join(reversed(file(log_file).readlines())) 51 log_contents = ''.join(reversed(file(log_file).readlines()))