Changed the version number in setup.py. Changed the file to use find_packages

to find packages.
Removed setup.cfg.in, INSTALL.txt, develop.py, CHANGES.txt, test.py,
MANIFEST.in and README.txt

8 files changed, 4 insertions, 252 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index 889a46d..0000000
--- a/CHANGES.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-zope.security Package Changelog
-===============================
-
-zope.security version 3.2.0 (2006/01/05)
-----------------------------------------
-
-- Corresponds to the verison of the zope.security package shipped as part of
-  the Zope 3.2.0 release.
-
-- Removed deprecated helper functions, 'proxy.trustedRemoveSecurityProxy'
-  and 'proxy.getProxiedObject'.
-
-- Made handling of 'management.{end,restore}Interaction' more careful
-  w.r.t. edge cases.
-
-- Made behavior of 'canWrite' consistent with 'canAccess':  if 'canAccess'
-  does not raise 'ForbiddenAttribute', then neither will 'canWrite'.  See:
-  http://www.zope.org/Collectors/Zope3-dev/506
-
-- Code style / documentation / test fixes.
-
-zope.security version 3.1.0 (2005/10/03)
-----------------------------------------
-
-- Added support for use of the new Python 2.4 datatypes, 'set' and
-  'frozenset', within checked code.
-
-- C security proxy acquired a dependency on the 'proxy.h' header from the
-  'zope.proxy' package.
-  
-  XXX: the spelling of the '#include' is bizarre!  It seems to be related
-       to 'zpkg'-based builds, and should likely be revisited.  For the
-       moment, I have linked in the 'zope.proxy' package into our own
-       'include' directory.  See the subversion checkin:
-       http://svn.zope.org/Zope3/?rev=37882&view=rev
-
-- Updated checker to avoid re-proxying objects which have and explicit
-  '__Security_checker__' assigned.
-
-- Corresponds to the verison of the zope.security package shipped as part of
-  the Zope 3.1.0 release.
-
-- Clarified contract of 'IChecker' to indicate that its 'check*' methods
-  may raise only 'Forbidden' or 'Unauthorized' exceptions.
-
-- Added interfaces, ('IPrincipal', 'IGroupAwarePrincipal', 'IGroup', and
-  'IPermission') specifying contracts of components in the security framework.
-
-- Code style / documentation / test fixes.
-
-zope.security version 3.0.0 (2004/11/07)
-----------------------------------------
-
-- Corresponds to the verison of the zope.security package shipped as part of
-  the Zope X3.0.0 release.
diff --git a/INSTALL.txt b/INSTALL.txt
deleted file mode 100644
index 19c5d26..0000000
--- a/INSTALL.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-Installing This Package
-=======================
-
-Prerequisites
--------------
-
-The installation steps below assume that you have the cool new 'setuptools'
-package installed in your Python.  Here is where to get it:
-
-  $ wget http://peak.telecommunity.com/dist/ez_setup.py
-  $ /path/to/your/python ez_setup.py # req. write access to 'site-packages'
-
-
-  - Docs for EasyInstall:
-    http://peak.telecommunity.com/DevCenter/EasyInstall
-
-  - Docs for setuptools:
-    http://peak.telecommunity.com/DevCenter/setuptools
-
-  - Docs for eggs:
-    http://peak.telecommunity.com/DevCenter/PythonEggs
-
-
-Installing a Development Checkout
----------------------------------
-
-Check out the package from subversion:
-
-  $ svn co svn+ssh://svn.zope.org/repos/main/zope.security/trunk \
-    src/zope.security
-  $ cd src/zope.security
-
-Install it as a "devlopment egg" (which also installs its "hard"
-dependencies):
-
-  $ /path/to/your/python setup.py devel
-
-The installation of dependency eggs uses the 'setup.cfg' file in
-the checkout.  You can supply '--find-links' on the command line to
-point it at a non-standard package repository.
-
-
-Running the Tests
------------------
-
-To test the package, you will also need the 'zope.testing' package, which
-can't (yet) be automatically installed.  Eventually, you should be able to
-type:
-
-  $ /path/to/your/python setup.py test
-
-and have it install the "testing dependencies."  Today, the workaround
-is to install it manually:
-
-  $ /path/to/easy_install --find-links="...." zope.testing
-
-You can then run the tests (finally) from the checkout directory:
-
-  $ /path/to/your/python test.py
-    Running:
-      .............
-    Ran 13 tests with 0 failures and 0 errors in 0.094 seconds.
-
-
-Installing a Source Distribution
---------------------------------
-
-You can also install it from a source distribution:
-
-  $ /path/to/easy_install --find-links="...." -eb src zope.security
-  $ cd src/zope.security
-  $ /path/to/your/python setup.py devel
-
-
-Installing a Binary Egg
------------------------
-
-Install the package as a "binary egg" (which also installs its "hard"
-dependencies):
-
-  $ /path/to/easy_install --find-links="...." zope.security
-
-
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 1cdc4fd..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-exclude setup.cfg
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 4aafed1..0000000
--- a/README.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-zope.security Package Readme
-=======================
-
-Overview
---------
-
-The Security framework provides a generic mechanism to implement security
-policies on Python objects.
-
-See 'src/zope/security/README.txt'.
-
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
-  http://svn.zope.org/zope.security/
-
-- Read-only Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.security/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.security/trunk
-
-- Note that the 'src/zope/security' package is acutally a 'svn:externals' link
-  to the corresponding package in the Zope3 trunk (or to a specific tag,
-  for released versions of the package).
diff --git a/develop.py b/develop.py
deleted file mode 100644
index f267763..0000000
--- a/develop.py
+++ /dev/null
@@ -1,21 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation 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.
-#
-##############################################################################
-"""Workspace configuration wrapper script
-
-$Id$
-"""
-
-import workspace.develop
-
-workspace.develop.main()
diff --git a/setup.cfg.in b/setup.cfg.in
deleted file mode 100644
index bdfcfcc..0000000
--- a/setup.cfg.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
diff --git a/setup.py b/setup.py
index 2148f57..d988218 100644
--- a/setup.py
+++ b/setup.py
@@ -18,13 +18,10 @@ $Id$
 
 import os
 
-try:
-    from setuptools import setup, Extension
-except ImportError, e:
-    from distutils.core import setup, Extension
+from setuptools import setup, find_packages, Extension
 
 setup(name='zope.security',
-      version='3.3-dev',
+      version='3.3dev',
       url='http://svn.zope.org/zope.security',
       license='ZPL 2.1',
       description='Zope3 Security Architecture',
@@ -33,11 +30,8 @@ setup(name='zope.security',
       long_description='The Security framework provides a generic mechanism '
                        'to implement security policies on Python objects.',
       
-      packages=['zope',
-                'zope.security',
-                'zope.security.untrustedpython',
-               ],
-      package_dir = {'': 'src'},
+	  packages=find_packages('src'),
+	  package_dir = {'': 'src'},
 
       ext_modules=[Extension("zope.security._proxy",
                              [os.path.join('src', 'zope', 'security',
diff --git a/test.py b/test.py
deleted file mode 100644
index b2611bf..0000000
--- a/test.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (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.
-#
-##############################################################################
-"""Sample test script using zope.testing.testrunner
-
-see zope.testing testrunner.txt
-
-$Id$
-"""
-
-import os, sys
-
-src = os.path.join(os.path.split(sys.argv[0])[0], 'src')
-sys.path.insert(0, src) # put at beginning to avoid one in site_packages
-
-from zope.testing import testrunner
-
-defaults = [
-    '--path', src,
-    '--package', 'zope.security',
-    '--tests-pattern', '^tests$',
-    ]
-
-# Tests of 'untrusted' stuff require RestrictedPython.
-sys.exit(testrunner.run(defaults))
-