Merge lp:~gary/launchpad/bug-491705-hack into lp:launchpad

This branch uses a hacked version of zc.buildout to work around the problem described in https://bugs.edge.launchpad.net/launchpad-foundations/+bug/491705 . The diff for this branch is below. It essentially only adds the following line to the top of generated scripts, such as bin/run:

import encodings.utf_8 # Hack to fix sys.modules approach.

This is the change that LOSAs have made manually in past deployments. It is not the right fix, which I am working on in svn://svn.zope.org/repos/main/zc.buildout/branches/gary-4 , but it gives us more breathing room.

The branch with the changes below is svn://svn.zope.org/repos/main/zc.buildout/branches/gary-8-hack-fix .

Thank you

Gary

Modified: zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.py 2010-01-20 21:08:52 UTC (rev 108340)
+++ zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.py 2010-01-20 21:09:31 UTC (rev 108341)
@@ -1287,8 +1287,8 @@
else:
    script_header = '#!%(python)s'

-script_template = script_header + '''\
-
+script_template = script_header + '''
+import encodings.utf_8 # Hack to fix sys.modules approach.
%(relative_paths_setup)s
import site
import sys
@@ -1365,8 +1365,8 @@
    generated.append(dest)
    return generated

-py_script_template = script_header + '''\
-
+py_script_template = script_header + '''
+import encodings.utf_8 # Hack to fix sys.modules approach.
# Get a clean copy of globals before import or variable definition.
globs = globals().copy()

Modified: zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt 2010-01-20 21:08:52 UTC (rev 108340)
+++ zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt 2010-01-20 21:09:31 UTC (rev 108341)
@@ -649,6 +649,7 @@

cat(bin, 'demo') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
    #!/usr/local/bin/python2.4
+ import encodings.utf_8 # Hack to fix sys.modules approach.
    <BLANKLINE>
    import site
    import sys
@@ -721,6 +722,7 @@

cat(bin, 'demo') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
    #!/usr/local/bin/python2.4
+ import encodings.utf_8 # Hack to fix sys.modules approach.
    <BLANKLINE>
    import site
    import sys
@@ -799,6 +801,7 @@

cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
    #!/usr/local/bin/python2.4
+ import encodings.utf_8 # Hack to fix sys.modules approach.
    # Get a clean copy of globals before import or variable definition.
    globs = globals().copy()
    <BLANKLINE>
@@ -969,6 +972,7 @@

cat(bin, 'run') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
    #!/usr/local/bin/python2.4
+ import encodings.utf_8 # Hack to fix sys.modules approach.
    <BLANKLINE>
    import site
    import sys
@@ -1097,6 +1101,7 @@

cat(bin, 'run') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
    #!/usr/local/bin/python2.4
+ import encodings.utf_8 # Hack to fix sys.modules approach.
    <BLANKLINE>
    import site
    import sys
@@ -1152,6 +1157,7 @@
...

On January 20, 2010, Gary Poster wrote:
> Gary Poster has proposed merging lp:~gary/launchpad/bug-491705-hack into
> lp:launchpad/devel.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
>
> This branch uses a hacked version of zc.buildout to work around the problem
> described in
> https://bugs.edge.launchpad.net/launchpad-foundations/+bug/491705 . The
> diff for this branch is below. It essentially only adds the following
> line to the top of generated scripts, such as bin/run:
>
> import encodings.utf_8 # Hack to fix sys.modules approach.
>
> This is the change that LOSAs have made manually in past deployments. It
> is not the right fix, which I am working on in
> svn://svn.zope.org/repos/main/zc.buildout/branches/gary-4 , but it gives
> us more breathing room.
>

Thanks for this safety.

 review approve
 status approved

--
Francis J. Lacoste
<email address hidden>