[Python-checkins] CVS: python/dist/src setup.py,1.81,1.82

[Neal Norwitz]

Was the if 1: meant to be left in (around line 178)?

Neal
--

"M.-A. Lemburg" wrote:

> Index: setup.py
> ===================================================================
> RCS file: /cvsroot/python/python/dist/src/setup.py,v
> retrieving revision 1.81
> retrieving revision 1.82
> diff -C2 -d -r1.81 -r1.82
> *** setup.py    14 Feb 2002 01:25:37 -0000      1.81
> --- setup.py    16 Feb 2002 18:23:29 -0000      1.82
> ***************
> *** 174,192 ****
>           try:
>               imp.load_dynamic(ext.name, ext_filename)
> !         except ImportError:
> !             self.announce('WARNING: removing "%s" since importing it failed' %
> !                           ext.name)
> !             assert not self.inplace
> !             fullname = self.get_ext_fullname(ext.name)
> !             ext_filename = os.path.join(self.build_lib,
> !                                         self.get_ext_filename(fullname))
> !             os.remove(ext_filename)
> 
> !             # XXX -- This relies on a Vile HACK in
> !             # distutils.command.build_ext.build_extension().  The
> !             # _built_objects attribute is stored there strictly for
> !             # use here.
> !             for filename in self._built_objects:
> !                 os.remove(filename)
> 
>       def get_platform (self):
> --- 174,197 ----
>           try:
>               imp.load_dynamic(ext.name, ext_filename)
> !         except ImportError, why:
> 
> !             if 1:
> !                 self.announce('*** WARNING: removing "%s" since importing it'
> !                               ' failed: %s' % (ext.name, why))
> !                 assert not self.inplace
> !                 fullname = self.get_ext_fullname(ext.name)
> !                 ext_filename = os.path.join(self.build_lib,
> !                                             self.get_ext_filename(fullname))
> !                 os.remove(ext_filename)
> !
> !                 # XXX -- This relies on a Vile HACK in
> !                 # distutils.command.build_ext.build_extension().  The
> !                 # _built_objects attribute is stored there strictly for
> !                 # use here.
> !                 for filename in self._built_objects:
> !                     os.remove(filename)
> !             else:
> !                 self.announce('*** WARNING: importing extension "%s" '
> !                               'failed: %s' % (ext.name, why))
>