From 4829cc7b6f9b53ab7c6dae09d4d136845e787760 Mon Sep 17 00:00:00 2001 From: helmutm Date: Tue, 17 Jun 2008 09:53:43 +0000 Subject: [PATCH] read binary files with b flag on import git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2712 fd906abe-77d9-0310-91a1-e0d9ade77398 --- external/element.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/external/element.py b/external/element.py index 48a96ae..0afbd47 100644 --- a/external/element.py +++ b/external/element.py @@ -143,9 +143,11 @@ class ResourceElement(Element): if k not in self.posArgs) dataPath = os.path.join(loader.resourceDirectory, self['name']) if os.path.exists(dataPath): - f = open(dataPath, 'r') + ct = self.get('contentType', '') + flag = ct.startswith('text/') and 'r' or 'rb' + f = open(dataPath, flag) content = f.read() - if self.get('contentType', '').startswith('text/'): + if ct.startswith('text/'): content = content.decode('UTF-8') kw['data'] = content f.close()