Skip to content

Commit

Permalink
Drop zope212 setuptools extra.
Browse files Browse the repository at this point in the history
  • Loading branch information
hannosch committed Apr 3, 2016
1 parent 6767bc5 commit af3ddd4
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 20 deletions.
9 changes: 7 additions & 2 deletions CHANGES.txt
@@ -1,5 +1,10 @@
2.13.3 (unreleased)
-------------------
Changelog
=========

3.0 (unreleased)
----------------

- Drop zope212 setuptools extra.

- Add error event

Expand Down
3 changes: 0 additions & 3 deletions MANIFEST.in
Expand Up @@ -4,6 +4,3 @@ recursive-include src *

global-exclude *.pyc
global-exclude *.pyo
include *.py
include .travis.yml
include buildout.cfg
9 changes: 6 additions & 3 deletions buildout.cfg
@@ -1,13 +1,16 @@
[buildout]
extends = http://download.zope.org/Zope2/index/2.13.19/versions.cfg
extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
develop = .
parts = interpreter test

[versions]
Products.SiteErrorLog =

[interpreter]
recipe = zc.recipe.egg
interpreter = py
interpreter = python
eggs = Products.SiteErrorLog

[test]
recipe = zc.recipe.testrunner
eggs = Products.SiteErrorLog[test,zope212]
eggs = Products.SiteErrorLog[test]
19 changes: 12 additions & 7 deletions setup.py
Expand Up @@ -17,35 +17,40 @@

setup(
name='Products.SiteErrorLog',
version='2.13.3.dev0',
version='3.0.dev0',
url='http://pypi.python.org/pypi/Products.SiteErrorLog',
license='ZPL 2.1',
description="error log for Zope 2.",
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
long_description=open('README.rst').read() + '\n' +
open('CHANGES.txt').read(),
long_description=(open('README.rst').read() + '\n' +
open('CHANGES.txt').read()),
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2 :: Only",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Framework :: Zope2",
"Topic :: Software Development :: Libraries :: Python Modules",
],
],
packages=find_packages('src'),
namespace_packages=['Products'],
package_dir={'': 'src'},
extras_require=dict(
test=['transaction'],
zope212=['AccessControl',
'Zope2']),
),
install_requires=[
'setuptools',
'AccessControl',
'Acquisition',
'zExceptions',
'Zope2',
'zope.component',
'zope.interface',
'zope.event',
],
include_package_data=True,
zip_safe=False,
Expand Down
11 changes: 6 additions & 5 deletions src/Products/SiteErrorLog/SiteErrorLog.py
Expand Up @@ -72,13 +72,14 @@
cleanup_lock = allocate_lock()

try:
# Python 2
bstr = basestring
# Python 2
bstr = basestring
except NameError:
# Python 3
bstr = str
# Python 3
bstr = str


class SiteErrorLog (SimpleItem):
class SiteErrorLog(SimpleItem):
"""Site error log class. You can put an error log anywhere in the tree
and exceptions in that area will be posted to the site error log.
"""
Expand Down

0 comments on commit af3ddd4

Please sign in to comment.