- Tracebacks are now printed for internal errors (as opposed to user

  errors) even without the -D option.

- pyc and pyo files are regenerated for installed eggs so that the
  stored path in code objects matches the the install location.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@88584 62d5b8a3-27da-0310-9561-8e5933582275

CHANGES.txt

@@ -4,12 +4,18 @@ Status
 Change History
 **************
 
-1.1 (unreleased)
-==================
+1.1 (2008-07-19)
+================
 
 - Added a buildout-level unzip option tp change the default policy for
   unzipping zip-safe eggs.
 
+- Tracebacks are now printed for internal errors (as opposed to user
+  errors) even without the -D option.
+
+- pyc and pyo files are regenerated for installed eggs so that the
+  stored path in code objects matches the the install location.
+
 1.0.6 (2008-06-13)
 ==================
 

src/zc/buildout/buildout.py

@@ -1256,9 +1256,6 @@ def _error(*message):
 _internal_error_template = """
 An internal error occured due to a bug in either zc.buildout or in a
 recipe being used:
-
-%s:
-%s
 """
 
 def _check_for_unused_options_in_section(buildout, section):
@@ -1269,11 +1266,6 @@ def _check_for_unused_options_in_section(buildout, section):
                               % (section, ' '.join(map(repr, unused)))
                               )
 
-def _internal_error(v):
-    sys.stderr.write(_internal_error_template % (v.__class__.__name__, v))
-    sys.exit(1)
-    
-
 _usage = """\
 Usage: buildout [options] [assignments] [command [command arguments]]
 
@@ -1482,9 +1474,9 @@ def main(args=None):
             pass
         except Exception, v:
             _doing()
+            exc_info = sys.exc_info()
+            import pdb, traceback
             if debug:
-                exc_info = sys.exc_info()
-                import pdb, traceback
                 traceback.print_exception(*exc_info)
                 sys.stderr.write('\nStarting pdb:\n')
                 pdb.post_mortem(exc_info[2])
@@ -1495,7 +1487,10 @@ def main(args=None):
                               ):
                     _error(str(v))
                 else:
-                    _internal_error(v)
+                    sys.stderr.write(_internal_error_template)
+                    traceback.print_exception(*exc_info)
+                    sys.exit(1)
+    
             
     finally:
             logging.shutdown()

src/zc/buildout/buildout.txt

@@ -449,7 +449,7 @@ leave previously created paths in place:
     ... path = foo bin
     ... """)
 
-    >>> print system(buildout),
+    >>> print system(buildout), # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     Uninstalling data-dir.
     Installing data-dir.
@@ -460,9 +460,9 @@ leave previously created paths in place:
     <BLANKLINE>
     An internal error occured due to a bug in either zc.buildout or in a
     recipe being used:
-    <BLANKLINE>
-    OSError:
-    [Errno 17] File exists: '/sample-buildout/bin'
+    Traceback (most recent call last):
+      ...
+    OSError: [Errno 17] File exists: '/sample-buildout/bin'
 
 We meant to create a directory bins, but typed bin.  Now foo was
 left behind.
@@ -483,7 +483,7 @@ If we fix the typo:
     ... path = foo bins
     ... """)
 
-    >>> print system(buildout),
+    >>> print system(buildout), # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     Installing data-dir.
     data-dir: Creating directory foo
@@ -492,9 +492,9 @@ If we fix the typo:
     <BLANKLINE>
     An internal error occured due to a bug in either zc.buildout or in a
     recipe being used:
-    <BLANKLINE>
-    OSError:
-    [Errno 17] File exists: '/sample-buildout/foo'
+    Traceback (most recent call last):
+    ...
+    OSError: [Errno 17] File exists: '/sample-buildout/foo'
 
 Now they fail because foo exists, because it was left behind.
 
@@ -559,7 +559,7 @@ And put back the typo:
 
 When we rerun the buildout:
 
-    >>> print system(buildout),
+    >>> print system(buildout), # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     Installing data-dir.
     data-dir: Creating directory foo
@@ -569,9 +569,9 @@ When we rerun the buildout:
     <BLANKLINE>
     An internal error occured due to a bug in either zc.buildout or in a
     recipe being used:
-    <BLANKLINE>
-    OSError:
-    [Errno 17] File exists: '/sample-buildout/bin'
+    Traceback (most recent call last):
+    ...
+    OSError: [Errno 17] File exists: '/sample-buildout/bin'
 
 we get the same error, but we don't get the directory left behind:
 
@@ -635,7 +635,7 @@ It would be simpler just to return the paths as before.
 If we rerun the buildout, again, we'll get the error and no
 directories will be created:
 
-    >>> print system(buildout),
+    >>> print system(buildout), # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     Installing data-dir.
     data-dir: Creating directory foo
@@ -645,9 +645,9 @@ directories will be created:
     <BLANKLINE>
     An internal error occured due to a bug in either zc.buildout or in a
     recipe being used:
-    <BLANKLINE>
-    OSError:
-    [Errno 17] File exists: '/sample-buildout/bin'
+    Traceback (most recent call last):
+    ...
+    OSError: [Errno 17] File exists: '/sample-buildout/bin'
 
     >>> os.path.exists('foo')
     False

src/zc/buildout/easy_install.py

@@ -20,13 +20,22 @@ installed.
 $Id$
 """
 
-import glob, logging, os, re, shutil, sys, tempfile, urlparse, zipimport
 import distutils.errors
+import glob
+import logging
+import os
 import pkg_resources
+import py_compile
+import re
+import setuptools.archive_util
 import setuptools.command.setopt
 import setuptools.package_index
-import setuptools.archive_util
+import shutil
+import sys
+import tempfile
+import urlparse
 import zc.buildout
+import zipimport
 
 _oprp = getattr(os.path, 'realpath', lambda path: path)
 def realpath(path):
@@ -570,6 +579,7 @@ class Installer:
                 if ws.find(requirement) is None:
                     for dist in self._get_dist(requirement, ws, False):
                         ws.add(dist)
+                        redo_pyc(dist.location)
 
 
     def _constrain(self, requirement):
@@ -607,6 +617,7 @@ class Installer:
         for requirement in requirements:
             for dist in self._get_dist(requirement, ws, self._always_unzip):
                 ws.add(dist)
+                redo_pyc(dist.location)
                 self._maybe_add_setuptools(ws, dist)
 
         # OK, we have the requested distributions and they're in the working
@@ -633,6 +644,7 @@ class Installer:
                                            ):
                         
                     ws.add(dist)
+                    redo_pyc(dist.location)
                     self._maybe_add_setuptools(ws, dist)
             except pkg_resources.VersionConflict, err:
                 raise VersionConflict(err, ws)
@@ -696,6 +708,9 @@ class Installer:
                     base, pkg_resources.WorkingSet(),
                     self._dest, dist)
 
+                for dist in dists:
+                    redo_pyc(dist.location)
+
                 return [dist.location for dist in dists]
             finally:
                 shutil.rmtree(build_tmp)
@@ -1087,3 +1102,37 @@ def _final_version(parsed_version):
         if (part[:1] == '*') and (part not in _final_parts):
             return False
     return True
+
+def redo_pyc(egg):
+    if not os.path.isdir(egg):
+        return
+    for dirpath, dirnames, filenames in os.walk(egg):
+        for filename in filenames:
+            if not filename.endswith('.py'):
+                continue
+            filepath = os.path.join(dirpath, filename)
+            if not (os.path.exists(filepath+'c')
+                    or os.path.exists(filepath+'o')):
+                # If it wasn't compiled, it may not be compilable 
+                continue
+
+            # OK, it looks like we should try to compile.
+
+            # Remove old files.
+            for suffix in 'co':
+                if os.path.exists(filepath+suffix):
+                    os.remove(filepath+suffix)
+
+            # Compile under current optimization
+            try:
+                py_compile.compile(filepath)
+            except py_compile.PyCompileError:
+                logger.warning("Couldn't compile %s", filepath)
+            else:
+                # Recompile under other optimization. :)
+                args = [sys.executable]
+                if __debug__:
+                    args.append('-O')
+                args.extend(['-m', 'py_compile', filepath])
+                os.spawnv(os.P_WAIT, sys.executable, args)
+                      

src/zc/buildout/tests.py

@@ -1359,7 +1359,7 @@ def internal_errors():
     ... recipe = recipes:mkdir
     ... ''')
 
-    >>> print system(buildout),
+    >>> print system(buildout), # doctest: +ELLIPSIS
     Develop: '/sample-buildout/recipes'
     While:
       Installing.
@@ -1368,9 +1368,9 @@ def internal_errors():
     <BLANKLINE>
     An internal error occured due to a bug in either zc.buildout or in a
     recipe being used:
-    <BLANKLINE>
-    NameError:
-    global name 'os' is not defined
+    Traceback (most recent call last):
+    ...
+    NameError: global name 'os' is not defined
     """
 
 def whine_about_unused_options():
@@ -1812,7 +1812,7 @@ if sys.version_info > (2, 4):
         ... recipe = zc.buildout.testexit
         ... ''')
 
-        >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE
+        >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
         Develop: '/sample-buildout/.'
         While:
           Installing.
@@ -1822,12 +1822,13 @@ if sys.version_info > (2, 4):
         <BLANKLINE>
         An internal error occured due to a bug in either zc.buildout or in a
         recipe being used:
-        <BLANKLINE>
-        SyntaxError:
-        invalid syntax (testexitrecipe.py, line 2)
+        Traceback (most recent call last):
+        ...
+             x y
+               ^
+         SyntaxError: invalid syntax
         <BLANKLINE>
         Exit: True
-
         """
 
 def bug_59270_recipes_always_start_in_buildout_dir():
@@ -2403,6 +2404,43 @@ honoring our version specification.
     
     """
 
+def pyc_and_pyo_files_have_correct_paths():
+    r"""
+
+    >>> write('buildout.cfg',
+    ... '''
+    ... [buildout]
+    ... parts = eggs
+    ... find-links = %(link_server)s
+    ... unzip = true
+    ...
+    ... [eggs]
+    ... recipe = zc.recipe.egg
+    ... eggs = demo
+    ... interpreter = py
+    ... ''' % globals())
+
+    >>> _ = system(buildout)
+
+    >>> write('t.py',
+    ... '''
+    ... import eggrecipedemo, eggrecipedemoneeded
+    ... print eggrecipedemo.main.func_code.co_filename
+    ... print eggrecipedemoneeded.f.func_code.co_filename
+    ... ''')
+
+    >>> print system(join('bin', 'py')+ ' t.py'),
+    /sample-buildout/eggs/demo-0.4c1-py2.4.egg/eggrecipedemo.py
+    /sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg/eggrecipedemoneeded.py
+
+    >>> ls('eggs', 'demoneeded-1.2c1-py2.4.egg')
+    d  EGG-INFO
+    -  eggrecipedemoneeded.py
+    -  eggrecipedemoneeded.pyc
+    -  eggrecipedemoneeded.pyo
+
+    """
+
 ######################################################################
     
 def create_sample_eggs(test, executable=sys.executable):
@@ -2413,7 +2451,7 @@ def create_sample_eggs(test, executable=sys.executable):
         write(tmp, 'README.txt', '')
 
         for i in (0, 1, 2):
-            write(tmp, 'eggrecipedemoneeded.py', 'y=%s\n' % i)
+            write(tmp, 'eggrecipedemoneeded.py', 'y=%s\ndef f():\n  pass' % i)
             c1 = i==2 and 'c1' or ''
             write(
                 tmp, 'setup.py',