Ticket #4138: sdist-support-4138-2.patch

File sdist-support-4138-2.patch, 2.0 KB (added by TimAllen, 12 years ago)

Address review comments; patch against latest branch

  • twisted/python/_release.py

    diff --git a/twisted/python/_release.py b/twisted/python/_release.py
    index b96762d..e9dada6 100644
    a b import textwrap 
    1616from datetime import date
    1717import sys
    1818import os
    19 import tarfile
    20 import errno
    21 import shutil
    2219from tempfile import mkdtemp
    2320
    2421from subprocess import PIPE, STDOUT, Popen
    from twisted.python.versions import Version 
    2724from twisted.python.filepath import FilePath
    2825from twisted.python._dist import LoreBuilderMixin, DistributionBuilder
    2926from twisted.python._dist import makeAPIBaseURL, twisted_subprojects
    30 from twisted.python._dist import ManBuilder, DocBuilder, NoDocumentsFound
    31 from twisted.python._dist import isDistributable
    3227
    3328# The offset between a year and the corresponding major version number.
    3429VERSION_OFFSET = 2000
  • twisted/python/test/test_dist.py

    diff --git a/twisted/python/test/test_dist.py b/twisted/python/test/test_dist.py
    index 6d887e4..00b819d 100644
    a b class GetDataFilesTests(TestCase): 
    264264            results,
    265265            [(os.path.join(rawBaseDir, "foo"),
    266266              [os.path.join(rawBaseDir, "foo", "bar.txt")]),
    267              (os.path.join(rawBaseDir, "foo/baz"),
    268               [os.path.join(rawBaseDir, "foo/baz", "qux.txt")])])
     267             (os.path.join(rawBaseDir, "foo", "baz"),
     268              [os.path.join(rawBaseDir, "foo", "baz", "qux.txt")])])
    269269
    270270
    271271    def test_ignoreVCSMetadata(self):
  • twisted/python/test/test_release.py

    diff --git a/twisted/python/test/test_release.py b/twisted/python/test/test_release.py
    index c6b1e96..2d0ce1d 100644
    a b else: 
    5858
    5959
    6060try:
    61     from popen2 import Popen4
    62 except ImportError:
    63     popen4Skip = "popen2.Popen4 is not available."
    64 else:
    65     popen4Skip = skip
    66 
    67 try:
    6861    import pydoctor.driver
    6962    # it might not be installed, or it might use syntax not available in
    7063    # this version of Python.