r184 - ZopeChinaPak/trunk

[czug-checkins]

Author: panjy
Date: Thu Mar 9 15:33:09 2006
New Revision: 184

Modified:
ZopeChinaPak/trunk/at_pak.py

Log:
merged patch from Tianpeng Wang

Modified: ZopeChinaPak/trunk/at_pak.py
==============================================================================
--- ZopeChinaPak/trunk/at_pak.py (original)
+++ ZopeChinaPak/trunk/at_pak.py Thu Mar 9 15:33:09 2006
@@ -3,6 +3,8 @@

# 暂时未启用

+from types import UnicodeType
+
def download(self, instance, REQUEST=None, RESPONSE=None):
file = self.get(instance)
if not REQUEST:
@@ -13,9 +15,9 @@
filename = self.getFilename(instance, fromBaseUnit=False)
if REQUEST.HTTP_USER_AGENT.find('MSIE') != -1:
if type(filename) is UnicodeType:
- filename = filename.encode('gb18030')
- else:
- filename = filename.decode('utf8').encode('gb18030')
+ filename = filename.encode('gb18030')
+ else:
+ filename = filename.decode('utf8').encode('gb18030')
RESPONSE.setHeader('Content-Disposition',
'attachment; filename="%s"' % filename)
RESPONSE.setHeader('Content-Length', self.get_size(instance))