[Python-checkins] r54965 - sandbox/trunk/emailpkg/4_0/MANIFEST sandbox/trunk/emailpkg/4_0/README.txt sandbox/trunk/emailpkg/4_0/ez_setup.py sandbox/trunk/emailpkg/4_0/setup.py
barry.warsaw
python-checkins at python.org
Wed Apr 25 21:49:04 CEST 2007
Author: barry.warsaw
Date: Wed Apr 25 21:48:57 2007
New Revision: 54965
Added:
sandbox/trunk/emailpkg/4_0/ez_setup.py
Removed:
sandbox/trunk/emailpkg/4_0/MANIFEST
Modified:
sandbox/trunk/emailpkg/4_0/README.txt
sandbox/trunk/emailpkg/4_0/setup.py
Log:
Use setuptools so that we can create eggs.
Updates for email 4.0.2.
Deleted: /sandbox/trunk/emailpkg/4_0/MANIFEST
==============================================================================
--- /sandbox/trunk/emailpkg/4_0/MANIFEST Wed Apr 25 21:48:57 2007
+++ (empty file)
@@ -1,133 +0,0 @@
-setup.py
-testall.py
-README.txt
-email/__init__.py
-email/_parseaddr.py
-email/base64mime.py
-email/charset.py
-email/encoders.py
-email/errors.py
-email/feedparser.py
-email/generator.py
-email/header.py
-email/iterators.py
-email/message.py
-email/parser.py
-email/quoprimime.py
-email/utils.py
-email/mime/__init__.py
-email/mime/application.py
-email/mime/audio.py
-email/mime/base.py
-email/mime/image.py
-email/mime/message.py
-email/mime/multipart.py
-email/mime/nonmultipart.py
-email/mime/text.py
-email/test/__init__.py
-email/test/test_email.py
-email/test/test_email_codecs.py
-email/test/test_email_renamed.py
-email/test/test_email_codecs_renamed.py
-email/test/test_email_torture.py
-email/test/data/PyBanner048.gif
-email/test/data/audiotest.au
-email/test/data/msg_01.txt
-email/test/data/msg_02.txt
-email/test/data/msg_03.txt
-email/test/data/msg_04.txt
-email/test/data/msg_05.txt
-email/test/data/msg_06.txt
-email/test/data/msg_07.txt
-email/test/data/msg_08.txt
-email/test/data/msg_09.txt
-email/test/data/msg_10.txt
-email/test/data/msg_11.txt
-email/test/data/msg_12.txt
-email/test/data/msg_12a.txt
-email/test/data/msg_13.txt
-email/test/data/msg_14.txt
-email/test/data/msg_15.txt
-email/test/data/msg_16.txt
-email/test/data/msg_17.txt
-email/test/data/msg_19.txt
-email/test/data/msg_20.txt
-email/test/data/msg_21.txt
-email/test/data/msg_22.txt
-email/test/data/msg_23.txt
-email/test/data/msg_24.txt
-email/test/data/msg_25.txt
-email/test/data/msg_26.txt
-email/test/data/msg_27.txt
-email/test/data/msg_28.txt
-email/test/data/msg_29.txt
-email/test/data/msg_30.txt
-email/test/data/msg_31.txt
-email/test/data/msg_32.txt
-email/test/data/msg_33.txt
-email/test/data/msg_34.txt
-email/test/data/msg_35.txt
-email/test/data/msg_35.txt
-email/test/data/msg_36.txt
-email/test/data/msg_37.txt
-email/test/data/msg_38.txt
-email/test/data/msg_39.txt
-email/test/data/msg_40.txt
-email/test/data/msg_41.txt
-email/test/data/msg_42.txt
-email/test/data/msg_43.txt
-email/test/data/msg_44.txt
-moredata/crispin-torture.txt
-docs/about.html
-docs/blank.png
-docs/contents.png
-docs/email-dir.txt
-docs/email-mime.txt
-docs/email-pkg-history.html
-docs/email-simple.txt
-docs/email-unpack.txt
-docs/index.html
-docs/index.png
-docs/mimelib.css
-docs/mimelib.html
-docs/mimelib.pdf
-docs/module-email.charset.html
-docs/module-email.encoders.html
-docs/module-email.errors.html
-docs/module-email.generator.html
-docs/module-email.header.html
-docs/module-email.html
-docs/module-email.iterators.html
-docs/module-email.message.html
-docs/module-email.mime.text.html
-docs/module-email.parser.html
-docs/module-email.utils.html
-docs/modules.png
-docs/next.png
-docs/node1.html
-docs/node16.html
-docs/node17.html
-docs/node18.html
-docs/node5.html
-docs/node6.html
-docs/node7.html
-docs/previous.png
-docs/pyfav.png
-docs/up.png
-manual/Makefile
-manual/email-dir.py
-manual/email-mime.py
-manual/email-simple.py
-manual/email-unpack.py
-manual/email.tex
-manual/emailcharsets.tex
-manual/emailencoders.tex
-manual/emailexc.tex
-manual/emailgenerator.tex
-manual/emailheaders.tex
-manual/emailiter.tex
-manual/emailmessage.tex
-manual/emailmimebase.tex
-manual/emailparser.tex
-manual/emailutil.tex
-manual/mimelib.tex
Modified: sandbox/trunk/emailpkg/4_0/README.txt
==============================================================================
--- sandbox/trunk/emailpkg/4_0/README.txt (original)
+++ sandbox/trunk/emailpkg/4_0/README.txt Wed Apr 25 21:48:57 2007
@@ -1,5 +1,5 @@
email -- a mail and MIME handling package
-Copyright (C) 2001-2006 Python Software Foundation
+Copyright (C) 2001-2007 Python Software Foundation
Introduction
@@ -12,9 +12,9 @@
email related RFCs such as 2045-2047 (the MIME RFCs) and 2231.
This version is identical to the package available in Python 2.5. It is
- being made available as a standalone distutils package for use in older
- Python releases. A minimum of Python 2.3 is required. Because the email
- package is part of Python, it is covered by the PSF license for Python, as
+ being made available as a standalone package for use in older Python
+ releases. A minimum of Python 2.3 is required. Because the email package
+ is part of Python, it is covered by the PSF license for Python, as
described in the LICENSE.txt file.
Added: sandbox/trunk/emailpkg/4_0/ez_setup.py
==============================================================================
--- (empty file)
+++ sandbox/trunk/emailpkg/4_0/ez_setup.py Wed Apr 25 21:48:57 2007
@@ -0,0 +1,228 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c5"
+DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+}
+
+import sys, os
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ from md5 import md5
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ try:
+ import setuptools
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+ except ImportError:
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+
+ import pkg_resources
+ try:
+ pkg_resources.require("setuptools>="+version)
+
+ except pkg_resources.VersionConflict, e:
+ # XXX could we install in a subprocess here?
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first.\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+
+ try:
+ import setuptools
+ except ImportError:
+ egg = None
+ try:
+ egg = download_setuptools(version, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ if egg and os.path.exists(egg):
+ os.unlink(egg)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ # tell the user to uninstall obsolete version
+ use_setuptools(version)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+ from md5 import md5
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
Modified: sandbox/trunk/emailpkg/4_0/setup.py
==============================================================================
--- sandbox/trunk/emailpkg/4_0/setup.py (original)
+++ sandbox/trunk/emailpkg/4_0/setup.py Wed Apr 25 21:48:57 2007
@@ -1,26 +1,23 @@
-#! /usr/bin/env python
-#
-# Copyright (C) 2001-2006 Python Software Foundation
-
-# Standard distutils setup.py install script for the `mimelib' library, a next
-# generation MIME library for Python. To install into your existing Python
-# distribution, run the following at the command line:
-#
-# % python setup.py install
-
-import sys
-from os.path import basename
-
-from distutils.core import setup
-from distutils.command.install_lib import install_lib
+# Copyright (C) 2001-2007 Python Software Foundation
+import ez_setup
+ez_setup.use_setuptools()
import email
-setup(name='email',
- version=email.__version__,
- description='Standalone email package',
- author='Barry Warsaw',
- author_email='barry at python.org',
- url='http://www.python.org/sigs/email-sig',
- packages=['email', 'email.mime'],
- )
+from setuptools import setup, find_packages
+
+setup(
+ name = 'email',
+ version = email.__version__,
+ description = 'Standalone email package',
+ long_description = """\
+This is the standalone email package. This is a copy of what's available in
+Python but you may want to use the standalone version if you want the latest
+and greatest email package, even in older Pythons.""",
+ author = 'Email SIG',
+ author_email = 'email-sig at python.org',
+ url = 'http://www.python.org/sigs/email-sig',
+ keywords = 'email',
+ license = 'Python software Foundation',
+ packages = find_packages(),
+ )
More information about the Python-checkins
mailing list