Updated code generator and moved to distribute 0.6.15

2 files changed, 3 insertions, 4 deletions

diff --git a/bin/rebuild-script.py b/bin/rebuild-script.py
index 4244add..ab1663b 100755
--- a/bin/rebuild-script.py
+++ b/bin/rebuild-script.py
@@ -11,10 +11,9 @@ here = os.path.dirname(__file__)
 script = os.path.join(here, '..', 'virtualenv.py')
 
 file_regex = re.compile(
-    r'##file (.*?)\n([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*"""\n(.*?)"""\.decode\("base64"\)\.decode\("zlib"\)\n',
+    r'##file (.*?)\n([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*convert\("""(.*?)"""\)',
     re.S)
-
-file_template = '##file %(filename)s\n%(varname)s = """\n%(data)s""".decode("base64").decode("zlib")\n'
+file_template = '##file %(filename)s\n%(varname)s = convert("""\n%(data)s""")\n'
 
 def rebuild():
     f = open(script, 'rb')
diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py
index f7ac7e8..988d2d0 100755
--- a/bin/refresh-support-files.py
+++ b/bin/refresh-support-files.py
@@ -19,7 +19,7 @@ files = [
     ('http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c11-py2.5.egg', 'setuptools-0.6c11-py2.5.egg'),
     ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'),
     ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'),
-    ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'distribute-0.6.14.tar.gz'),
+    ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.15.tar.gz', 'distribute-0.6.15.tar.gz'),
     ('http://pypi.python.org/packages/source/p/pip/pip-0.8.2.tar.gz', 'pip-0.8.2.tar.gz'),
     ]