From a2055b6d3192c421c24230da96385c09a569a248 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 20 Dec 2010 20:17:24 +0100
Subject: [PATCH] [FIX] addons.zip_directory: ZipFile.write() still expects
 binary strings for filenames in python 2.5

lp bug: https://launchpad.net/bugs/690559 fixed

bzr revid: odo@openerp.com-20101220191724-mvu1rsf3sup19s9m
---
 bin/addons/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 18cf1890094..82bab896fbf 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -225,6 +225,10 @@ def zip_directory(directory, b64enc=True, src=True):
 
     archname = StringIO()
     archive = PyZipFile(archname, "w", ZIP_DEFLATED)
+
+    # for Python 2.5, ZipFile.write() still expects 8-bit strings (2.6 converts to utf-8)
+    directory = tools.ustr(directory).encode('utf-8')
+
     archive.writepy(directory)
     _zippy(archive, directory, src=src)
     archive.close()