--- OSAS/OSA_system/OSAS_add.py 2004/10/29 14:24:32 1.38 +++ OSAS/OSA_system/OSAS_add.py 2004/11/24 17:22:47 1.39 @@ -52,7 +52,7 @@ def getISO(): ret={} for lineraw in f: - line=lineraw.encode('ascii','replace') + line=lineraw.encode('ascii','replace').strip() value=string.split(line,'\t')[0].encode('ascii','replace') key=string.split(line,'\t')[1].encode('ascii','replace') ret[key]=value @@ -205,7 +205,7 @@ def add6(self): metapath=self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']+"/index.meta" f=open(metapath,'w') - f.write(renderxml) + f.write(renderxml.encode('utf-8')) f.close() os.chmod(metapath,0664) os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name'])