Changeset 104
- Timestamp:
- 01/02/06 16:48:20 (3 years ago)
- Files:
-
- branches/timadditionaltypes/pyramid/flatteners.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/timadditionaltypes/pyramid/flatteners.py
r101 r104 58 58 class RestFileFlattener(components.Adapter): 59 59 def flatten(self, ctx, dir): 60 return T.xml(restParser.html_fragment(file(os.path.join(dir,self.original)).read())) 60 try: 61 restfile = os.path.join(dir,self.original) 62 fp = open(restfile) 63 except IOError: 64 print 'IOError whilst trying to open "restfile" %s'%(restfile) 65 66 return T.xml(restParser.html_fragment(fp.read())) 61 67 62 68 class HtmlFileFlattener(components.Adapter): 63 69 def flatten(self, ctx, dir): 64 return T.xml(file(os.path.join(dir,self.original)).read()) 70 try: 71 htmlfile = os.path.join(dir,self.original) 72 fp = open(htmlfile) 73 except IOError: 74 print 'IOError whilst trying to open "htmlfile" %s'%(htmlfile) 75 76 return T.xml(fp.read()) 65 77 66 78 class HtmlFlattener(components.Adapter): … … 70 82 class HtFileFlattener(components.Adapter): 71 83 def flatten(self, ctx, dir): 72 message = rfc822.Message(open(os.path.join(dir,self.original))) 84 try: 85 htfile = os.path.join(dir,self.original) 86 fp = open(htfile) 87 except IOError: 88 print 'IOError whilst trying to open "htfile" %s'%(htfile) 89 message = rfc822.Message(fp) 73 90 data = dict(message) 74 91 body = message.fp.read() … … 82 99 message = rfc822.Message(open(os.path.join(dir,self.original.file))) 83 100 data = dict(message) 101 # add lower case keys 102 for k,v in data.items(): 103 data[k.lower()] = data[k] 84 104 if self.original.key is not None: 85 105 return data[self.original.key] … … 174 194 # Search for the template in this directory and above 175 195 template = acquireTemplate(ctx,self.original.template) 176 return T.xml(page.Fragment(os.path.join(dir,template), flattenedMergedData).generate()) 196 try: 197 htmlfragment = page.Fragment(os.path.join(dir,template), flattenedMergedData).generate() 198 except KeyError: 199 print '*'*80 200 print 'problem filling slot for template fragment %s using template file %s'% (name,file) 201 print '*'*80 202 print '%s %s %s'%('*'*4,'template','*'*30) 203 pprint(template) 204 print '%s %s %s'%('*'*4,'data','*'*30) 205 pprint(data) 206 print '*'*80 207 raise 208 return T.xml(htmlfragment) 177 209 178 210 class FragmentFlattener(components.Adapter): … … 217 249 else: 218 250 try: 219 yaml = file(os.path.join(dir,name)).read() 251 yamlfile = os.path.join(dir,name) 252 fp = open(yamlfile) 253 yaml = fp.read() 220 254 return syck.load(yaml,Loader=Y.Loader, implicit_typing=False) 221 except :255 except IOError: 222 256 # if the file can't be read. fall back to the parent data 223 257 return copy.deepcopy(parentdata)
