[Checkins] SVN: zope.contenttype/trunk/ Moved to github
Stephen Richter
cvs-admin at zope.org
Wed Feb 20 13:37:38 UTC 2013
Log message for revision 129528:
Moved to github
Changed:
D zope.contenttype/trunk/CHANGES.txt
D zope.contenttype/trunk/COPYRIGHT.txt
D zope.contenttype/trunk/LICENSE.txt
D zope.contenttype/trunk/MANIFEST.in
A zope.contenttype/trunk/MOVED_TO_GITHUB
D zope.contenttype/trunk/README.txt
D zope.contenttype/trunk/bootstrap.py
D zope.contenttype/trunk/buildout.cfg
D zope.contenttype/trunk/setup.py
D zope.contenttype/trunk/src/
D zope.contenttype/trunk/tox.ini
-=-
Deleted: zope.contenttype/trunk/CHANGES.txt
===================================================================
--- zope.contenttype/trunk/CHANGES.txt 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/CHANGES.txt 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,87 +0,0 @@
-Change History
-==============
-
-4.0.2 (unreleased)
-------------------
-
-- Nothing changed yet.
-
-
-4.0.1 (2013-02-20)
-------------------
-
-- Change the file contents argument of guess_content_type from string to bytes.
- This change has no effect on Python 2.
-
-
-4.0.0 (2013-02-11)
-------------------
-
-- Added some tests for better coverage.
-
-- Added `tox.ini` and manifest.
-
-- Added support for Python 3.3 and PyPy 1.9.
-
-- Dropped support for Python 2.4 and 2.5.
-
-3.5.5 (2011-07-27)
-------------------
-
-* Properly restore the HTML snippet detection, by looking at the entire string
- and not just its start.
-
-3.5.4 (2011-07-26)
-------------------
-
-* Restore detection of HTML snippets from 3.4 series.
-
-3.5.3 (2011-03-18)
-------------------
-
-* Added new mime types for web fonts, cache manifest and new media formats.
-
-3.5.2 (2011-02-11)
-------------------
-
-* LP #717289: added 'video/x-m4v' mimetype for the '.m4v' extension.
-
-3.5.1 (2010-03-23)
-------------------
-
-* LP #242321: fix IndexError raised when testing strings consisting
- solely of leading whitespace.
-
-* Updated mime-type for .js to be application/javascript.
-
-3.5.0 (2009-10-22)
-------------------
-
-* Moved the implementation of zope.publisher.contenttype to
- zope.contenttype.parse, moved tests along.
-
-3.4.3 (2009-12-28)
-------------------
-* Updated mime-type for .js to be application/javascript.
-
-3.4.2 (2009-05-28)
-------------------
-
-* Added MS Office 12 types
- based on:
- http://www.therightstuff.de/2006/12/16/Office+2007+File+Icons+For+Windows+SharePoint+Services+20+And+SharePoint+Portal+Server+2003.aspx
-
-3.4.1 (2009-02-04)
-------------------
-
-* Improved text_type(). Based on the patch from
- http://www.zope.org/Collectors/Zope/2355/
-
-* Add missing setuptools dependency to setup.py.
-
-* Added reference documentation.
-
-3.4.0 (2007-09-13)
-------------------
-
-* First stable release as an independent package.
Deleted: zope.contenttype/trunk/COPYRIGHT.txt
===================================================================
--- zope.contenttype/trunk/COPYRIGHT.txt 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/COPYRIGHT.txt 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1 +0,0 @@
-Zope Foundation and Contributors
\ No newline at end of file
Deleted: zope.contenttype/trunk/LICENSE.txt
===================================================================
--- zope.contenttype/trunk/LICENSE.txt 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/LICENSE.txt 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,44 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that identifies the
-copyright holders.
-
-This license has been certified as open source. It has also been designated as
-GPL compatible by the Free Software Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions in source code must retain the accompanying copyright
-notice, this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying copyright
-notice, this list of conditions, and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to endorse or promote
-products derived from this software without prior written permission from the
-copyright holders.
-
-4. The right to distribute this software or to use it for any purpose does not
-give you the right to use Servicemarks (sm) or Trademarks (tm) of the
-copyright
-holders. Use of them is covered by separate agreement with the copyright
-holders.
-
-5. If any files are modified, you must cause the modified files to carry
-prominent notices stating that you changed the files and the date of any
-change.
-
-Disclaimer
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: zope.contenttype/trunk/MANIFEST.in
===================================================================
--- zope.contenttype/trunk/MANIFEST.in 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/MANIFEST.in 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,9 +0,0 @@
-include *.rst
-include *.txt
-include tox.ini
-include bootstrap.py
-include buildout.cfg
-
-recursive-include src *
-
-global-exclude *.pyc
Added: zope.contenttype/trunk/MOVED_TO_GITHUB
===================================================================
--- zope.contenttype/trunk/MOVED_TO_GITHUB (rev 0)
+++ zope.contenttype/trunk/MOVED_TO_GITHUB 2013-02-20 13:37:37 UTC (rev 129528)
@@ -0,0 +1 @@
+See https://github.com/zopefoundation/zope.contenttype
Deleted: zope.contenttype/trunk/README.txt
===================================================================
--- zope.contenttype/trunk/README.txt 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/README.txt 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,6 +0,0 @@
-zope.contenttype
-****************
-
-A utility module for content-type handling.
-
-.. contents::
Deleted: zope.contenttype/trunk/bootstrap.py
===================================================================
--- zope.contenttype/trunk/bootstrap.py 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/bootstrap.py 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,260 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
-from optparse import OptionParser
-
-if sys.platform == 'win32':
- def quote(c):
- if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
- else:
- return c
-else:
- quote = str
-
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
- [sys.executable, '-Sc',
- 'try:\n'
- ' import ConfigParser\n'
- 'except ImportError:\n'
- ' print 1\n'
- 'else:\n'
- ' print 0\n'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-has_broken_dash_S = bool(int(stdout.strip()))
-
-# In order to be more robust in the face of system Pythons, we want to
-# run without site-packages loaded. This is somewhat tricky, in
-# particular because Python 2.6's distutils imports site, so starting
-# with the -S flag is not sufficient. However, we'll start with that:
-if not has_broken_dash_S and 'site' in sys.modules:
- # We will restart with python -S.
- args = sys.argv[:]
- args[0:0] = [sys.executable, '-S']
- args = map(quote, args)
- os.execv(sys.executable, args)
-# Now we are running with -S. We'll get the clean sys.path, import site
-# because distutils will do it later, and then reset the path and clean
-# out any namespace packages from site-packages that might have been
-# loaded by .pth files.
-clean_path = sys.path[:]
-import site
-sys.path[:] = clean_path
-for k, v in sys.modules.items():
- if k in ('setuptools', 'pkg_resources') or (
- hasattr(v, '__path__') and
- len(v.__path__)==1 and
- not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
- # This is a namespace package. Remove it.
- sys.modules.pop(k)
-
-is_jython = sys.platform.startswith('java')
-
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
-
-# parsing arguments
-def normalize_to_url(option, opt_str, value, parser):
- if value:
- if '://' not in value: # It doesn't smell like a URL.
- value = 'file://%s' % (
- urllib.pathname2url(
- os.path.abspath(os.path.expanduser(value))),)
- if opt_str == '--download-base' and not value.endswith('/'):
- # Download base needs a trailing slash to make the world happy.
- value += '/'
- else:
- value = None
- name = opt_str[2:].replace('-', '_')
- setattr(parser.values, name, value)
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
- help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute", default=False,
- help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or file location for the setup file. "
- "If you use Setuptools, this will default to " +
- setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
-parser.add_option("--download-base", action="callback", dest="download_base",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or directory for downloading "
- "zc.buildout and either Setuptools or Distribute. "
- "Defaults to PyPI."))
-parser.add_option("--eggs",
- help=("Specify a directory for storing eggs. Defaults to "
- "a temporary directory that is deleted when the "
- "bootstrap script completes."))
-parser.add_option("-t", "--accept-buildout-test-releases",
- dest='accept_buildout_test_releases',
- action="store_true", default=False,
- help=("Normally, if you do not specify a --version, the "
- "bootstrap script and buildout gets the newest "
- "*final* versions of zc.buildout and its recipes and "
- "extensions for you. If you use this flag, "
- "bootstrap and buildout will get the newest releases "
- "even if they are alphas or betas."))
-parser.add_option("-c", None, action="store", dest="config_file",
- help=("Specify the path to the buildout configuration "
- "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
- args += ['-c', options.config_file]
-
-if options.eggs:
- eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
- eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
- if options.use_distribute:
- options.setup_source = distribute_source
- else:
- options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
-try:
- import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
- if not hasattr(pkg_resources, '_distribute'):
- raise ImportError
-except ImportError:
- ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n', '\n')
- ez = {}
- exec ez_code in ez
- setup_args = dict(to_dir=eggs_dir, download_delay=0)
- if options.download_base:
- setup_args['download_base'] = options.download_base
- if options.use_distribute:
- setup_args['no_fake'] = True
- ez['use_setuptools'](**setup_args)
- if 'pkg_resources' in sys.modules:
- reload(sys.modules['pkg_resources'])
- import pkg_resources
- # This does not (always?) update the default working set. We will
- # do it.
- for path in sys.path:
- if path not in pkg_resources.working_set.entries:
- pkg_resources.working_set.add_entry(path)
-
-cmd = [quote(sys.executable),
- '-c',
- quote('from setuptools.command.easy_install import main; main()'),
- '-mqNxd',
- quote(eggs_dir)]
-
-if not has_broken_dash_S:
- cmd.insert(1, '-S')
-
-find_links = options.download_base
-if not find_links:
- find_links = os.environ.get('bootstrap-testing-find-links')
-if find_links:
- cmd.extend(['-f', quote(find_links)])
-
-if options.use_distribute:
- setup_requirement = 'distribute'
-else:
- setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
- pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
- os.environ,
- PYTHONPATH=setup_requirement_path)
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
- # Figure out the most recent final version of zc.buildout.
- import setuptools.package_index
- _final_parts = '*final-', '*final'
- def _final_version(parsed_version):
- for part in parsed_version:
- if (part[:1] == '*') and (part not in _final_parts):
- return False
- return True
- index = setuptools.package_index.PackageIndex(
- search_path=[setup_requirement_path])
- if find_links:
- index.add_find_links((find_links,))
- req = pkg_resources.Requirement.parse(requirement)
- if index.obtain(req) is not None:
- best = []
- bestv = None
- for dist in index[req.project_name]:
- distv = dist.parsed_version
- if _final_version(distv):
- if bestv is None or distv > bestv:
- best = [dist]
- bestv = distv
- elif distv == bestv:
- best.append(dist)
- if best:
- best.sort()
- version = best[-1].version
-if version:
- requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-if is_jython:
- import subprocess
- exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
- exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
- sys.stdout.flush()
- sys.stderr.flush()
- print ("An error occurred when trying to install zc.buildout. "
- "Look above this message for any errors that "
- "were output by easy_install.")
- sys.exit(exitcode)
-
-ws.add_entry(eggs_dir)
-ws.require(requirement)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
- shutil.rmtree(eggs_dir)
Deleted: zope.contenttype/trunk/buildout.cfg
===================================================================
--- zope.contenttype/trunk/buildout.cfg 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/buildout.cfg 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,9 +0,0 @@
-[buildout]
-develop = .
-parts = test
-
-find-links = http://download.zope.org/distribution/
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = zope.contenttype
Deleted: zope.contenttype/trunk/setup.py
===================================================================
--- zope.contenttype/trunk/setup.py 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/setup.py 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,70 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-# This package is developed by the Zope Toolkit project, documented here:
-# http://docs.zope.org/zopetoolkit
-# When developing and releasing this package, please follow the documented
-# Zope Toolkit policies as described by this documentation.
-##############################################################################
-"""Setup for zope.contenttype package
-"""
-
-import os
-
-from setuptools import setup, find_packages
-
-def read(*rnames):
- return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-long_description = (
- read('README.txt')
- + '\n' +
- read('CHANGES.txt')
- + '\n' +
- 'Download\n'
- '********\n'
- )
-
-setup(
- name='zope.contenttype',
- version='4.0.2.dev0',
- url='http://pypi.python.org/pypi/zope.contenttype',
- author='Zope Foundation and Contributors',
- author_email='zope-dev at zope.org',
- license='ZPL 2.1',
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: Zope Public License',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: Implementation :: CPython',
- 'Programming Language :: Python :: Implementation :: PyPy',
- 'Operating System :: OS Independent',
- 'Topic :: Internet :: WWW/HTTP',
- 'Topic :: Software Development',
- ],
- description='Zope contenttype',
- long_description=long_description,
- packages=find_packages('src'),
- package_dir={'': 'src'},
- namespace_packages=['zope',],
- install_requires=['setuptools'],
- test_suite='zope.contenttype',
- include_package_data=True,
- zip_safe=False,
- )
Deleted: zope.contenttype/trunk/tox.ini
===================================================================
--- zope.contenttype/trunk/tox.ini 2013-02-20 13:37:19 UTC (rev 129527)
+++ zope.contenttype/trunk/tox.ini 2013-02-20 13:37:37 UTC (rev 129528)
@@ -1,24 +0,0 @@
-[tox]
-envlist =
- py26,py27,py33,pypy
-
-[testenv]
-commands =
- python setup.py test -q
-# without explicit deps, setup.py test will download a bunch of eggs into $PWD
-deps =
-
-[testenv:coverage]
-basepython =
- python2.7
-commands =
-# The installed version messes up nose's test discovery / coverage reporting
-# So, we uninstall that from the environment, and then install the editable
-# version, before running nosetests.
- pip uninstall -y zope.contenttype
- pip install -e .
- nosetests --with-xunit --with-xcoverage
-deps =
- nose
- coverage
- nosexcover
More information about the checkins
mailing list