<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e19e4250b9f294a1d6234e8cb710f3a51d5f2bf9">https://github.com/macports/macports-ports/commit/e19e4250b9f294a1d6234e8cb710f3a51d5f2bf9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e19e4250b9f294a1d6234e8cb710f3a51d5f2bf9
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Fri Mar 8 22:43:01 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-meld3: update to 1.0.2, add py37
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove unused patch files
</span><span style='display:block; white-space:pre;color:#404040;'> - use python.rootname, default PyPI livecheck
</span><span style='display:block; white-space:pre;color:#404040;'> - install files in post-destroot
</span>---
python/py-meld3/Portfile | 34 +++--
python/py-meld3/files/patch-ez_setup.py | 237 --------------------------------
python/py-meld3/files/patch-setup.py | 8 --
3 files changed, 21 insertions(+), 258 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meld3/Portfile b/python/py-meld3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5751f1..108edcf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meld3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meld3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-meld3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set real_name meld3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license ZPL-2.1
maintainers nomaintainer
description SGML template system
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,21 +15,29 @@ long_description meld3 is an HTML/XML templating system for Python 2.3+ \
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.plope.com/software/meld3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites pypi:m/${real_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${real_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://github.com/supervisor/meld3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites pypi:m/${python.rootname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${python.rootname}-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 079742bd8829507272c75a78c90e26dd05dc811b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5d8fc6e2d07e860d04aac7b78e74b87916bf1e77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7b754a0fde7a4429b2ebe49409db240b5699385a572501bb0d5627d299f9558 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 36478
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 34 35 36 37
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} TODO.txt LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPYRIGHT.txt CONTRIBUTORS.txt README.txt CHANGES.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex ${real_name}-(\[0-9.\]+)${extract.suffix}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meld3/files/patch-ez_setup.py b/python/py-meld3/files/patch-ez_setup.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4312a5c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meld3/files/patch-ez_setup.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,237 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null 2007-10-16 12:27:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ez_setup.py 2007-10-16 12:34:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,234 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"""Bootstrap setuptools installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+If you want to use setuptools in your package's setup.py, just include this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file in the same directory with it, and add this to the top of your setup.py::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from ez_setup import use_setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_setuptools()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+If you want to require a specific version of setuptools, set a download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mirror, or use an alternate download directory, you can do so by supplying
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+the appropriate options to ``use_setuptools()``.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This file can also be run as a script to install or upgrade setuptools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFAULT_VERSION = "0.6c7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+md5_data = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import sys, os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def _validate_md5(egg_name, data):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if egg_name in md5_data:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from md5 import md5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ digest = md5(data).hexdigest()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if digest != md5_data[egg_name]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print >>sys.stderr, (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "md5 validation of %s failed! (Possible download problem?)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ % egg_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def use_setuptools(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ download_delay=15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Automatically find/download setuptools and make it available on sys.path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ `version` should be a valid setuptools version number that is available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ as an egg for download under the `download_base` URL (which should end with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ it is not already available. If `download_delay` is specified, it should
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ be the number of seconds that will be paused before initiating a download,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ should one be required. If an older version of setuptools is installed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ an attempt to abort the calling script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if setuptools.__version__ == '0.0.1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print >>sys.stderr, (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "You have an obsolete version of setuptools installed. Please\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "remove it from your system entirely before rerunning this script."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ egg = download_setuptools(version, download_base, to_dir, download_delay)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.path.insert(0, egg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import setuptools; setuptools.bootstrap_install_from = egg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import pkg_resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pkg_resources.require("setuptools>="+version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except pkg_resources.VersionConflict, e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # XXX could we install in a subprocess here?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print >>sys.stderr, (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "The required version of setuptools (>=%s) is not available, and\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "can't be installed while this script is running. Please install\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " a more recent version first.\n\n(Currently using %r)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ) % (version, e.args[0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def download_setuptools(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delay = 15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Download setuptools from a specified location and return its filename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ `version` should be a valid setuptools version number that is available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ as an egg for download under the `download_base` URL (which should end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ `delay` is the number of seconds to pause before an actual download attempt.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import urllib2, shutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ url = download_base + egg_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ saveto = os.path.join(to_dir, egg_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = dst = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not os.path.exists(saveto): # Avoid repeated downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from distutils import log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if delay:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.warn("""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This script requires setuptools version %s to run (even to display
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+help). I will attempt to download it for you (from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%s), but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+you may need to enable firewall access for this script first.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+I will start the download in %d seconds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(Note: if this machine does not have network access, please obtain the file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+and place it in this directory before rerunning this script.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+---------------------------------------------------------------------------""",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ version, download_base, delay, url
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ); from time import sleep; sleep(delay)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.warn("Downloading %s", url)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = urllib2.urlopen(url)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Read/write all in one block, so we don't create a corrupt file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # if the download is interrupted.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ data = _validate_md5(egg_name, src.read())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dst = open(saveto,"wb"); dst.write(data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finally:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if src: src.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if dst: dst.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return os.path.realpath(saveto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def main(argv, version=DEFAULT_VERSION):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Install or upgrade setuptools and EasyInstall"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ egg = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ egg = download_setuptools(version, delay=0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.path.insert(0,egg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from setuptools.command.easy_install import main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return main(list(argv)+[egg]) # we're done here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finally:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if egg and os.path.exists(egg):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.unlink(egg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if setuptools.__version__ == '0.0.1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # tell the user to uninstall obsolete version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_setuptools(version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ req = "setuptools>="+version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import pkg_resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pkg_resources.require(req)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except pkg_resources.VersionConflict:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from setuptools.command.easy_install import main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from easy_install import main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ main(list(argv)+[download_setuptools(delay=0)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(0) # try to force an exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if argv:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from setuptools.command.easy_install import main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ main(argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "Setuptools version",version,"or greater has been installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def update_md5(filenames):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """Update our built-in md5 registry"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import re
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from md5 import md5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for name in filenames:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base = os.path.basename(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f = open(name,'rb')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ md5_data[base] = md5(f.read()).hexdigest()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ data = [" %r: %r,\n" % it for it in md5_data.items()]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ data.sort()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ repl = "".join(data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import inspect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ srcfile = inspect.getsourcefile(sys.modules[__name__])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f = open(srcfile, 'rb'); src = f.read(); f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not match:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print >>sys.stderr, "Internal error!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = src[:match.start(1)] + repl + src[match.end(1):]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f = open(srcfile,'w')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f.write(src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if __name__=='__main__':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ update_md5(sys.argv[2:])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ main(sys.argv[1:])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meld3/files/patch-setup.py b/python/py-meld3/files/patch-setup.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4e661aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meld3/files/patch-setup.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2007-10-16 16:08:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2007-10-16 16:09:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from ez_setup import use_setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use_setuptools()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils.core import setup, Extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>