comparison setup.py @ 42174:bd92dd3eff42 stable

setup: remove set and dict comprehensions

Yuya observed in a recent review that it is worthwhile to keep
setup.py parseable with Python 2.6 so a useful error message is
seen when attempting to run with Python 2.6.

This commit removes a set and dict comprehension so setup.py
is parseable with Python 2.6.

42173:07faf5c65190

                                 '\n'.join([out, err]))

            normalizecrlf('doc/%s.html' % root)

        # This logic is duplicated in doc/Makefile.
        sources = {f for f in os.listdir('mercurial/help')
                   if re.search(r'[0-9]\.txt$', f)}

        # common.txt is a one-off.
        gentxt('common')

        for source in sorted(sources):

    class hgbuildpy2exe(buildpy2exe):
        def find_needed_modules(self, mf, files, modules):
            res = buildpy2exe.find_needed_modules(self, mf, files, modules)

            # Replace virtualenv's distutils modules with the real ones.
            res.modules = {
                k: v for k, v in res.modules.items()
                if k != 'distutils' and not k.startswith('distutils.')}

            import opcode
            distutilsreal = os.path.join(os.path.dirname(opcode.__file__),
                                         'distutils')

42174:bd92dd3eff42

                                 '\n'.join([out, err]))

            normalizecrlf('doc/%s.html' % root)

        # This logic is duplicated in doc/Makefile.
        sources = set(f for f in os.listdir('mercurial/help')
                      if re.search(r'[0-9]\.txt$', f))

        # common.txt is a one-off.
        gentxt('common')

        for source in sorted(sources):

    class hgbuildpy2exe(buildpy2exe):
        def find_needed_modules(self, mf, files, modules):
            res = buildpy2exe.find_needed_modules(self, mf, files, modules)

            # Replace virtualenv's distutils modules with the real ones.
            modules = {}
            for k, v in res.modules.items():
                if k != 'distutils' and not k.startswith('distutils.'):
                    modules[k] = v

            res.modules = modules

            import opcode
            distutilsreal = os.path.join(os.path.dirname(opcode.__file__),
                                         'distutils')