Changed the version number in setup.py and imported find_packages and used it.

Removed setup.cfg.in, INSTALL.txt, develop.py, CHANGES.txt, test.py,
MANIFEST.in andn README.txt because they are no longer needed. 
The try, except statement in __init__.py was altered.

9 files changed, 9 insertions, 239 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index a86899a..0000000
--- a/CHANGES.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-zope.i18nmessageid Package Changelog
-====================================
-
-zope.i18nmessageid version 3.2.0 (2006/01/05)
----------------------------------------------
-
-- Corresponds to the verison of the zope.i18nmessageid package shipped as
-  part of the Zope 3.2.0 release.
-
-- Implemented 'zope.i18nmessageid.message' as a C extension.
-
-- Deprecated 'zope.i18nmessageid.messageid' APIs ('MessageID',
-  'MessageIDFactory') in favor of replacements in 'zope.i18nmessageid.message'
-  ('Message', 'MessageFactory').  Deprecated items are scheduled for removal
-  in Zope 3.3.
-
-zope.i18nmessageid version 3.0.0 (2004/11/07)
----------------------------------------------
-
-- Corresponds to the verison of the zope.i18nmessageid package shipped as
-  part of the Zope X3.0.0 release.
diff --git a/INSTALL.txt b/INSTALL.txt
deleted file mode 100644
index f22afd5..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.i18nmessageid/trunk \
-    src/zope.i18nmessageid
-  $ cd src/zope.i18nmessageid
-
-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-i18nmessageid
-  $ cd src/zope.i18nmessageid
-  $ /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-i18nmessageid
-
-
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 4c8e3e9..0000000
--- a/README.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-zope.i18nmessageid Package Readme
-=================================
-
-Overview
---------
-
-To translate any text, we must be able to discover the source domain
-of the text.  A source domain is an identifier that identifies a
-project that produces program source strings.  Source strings occur as
-literals in python programs, text in templates, and some text in XML
-data.  The project implies a source language and an application
-context.
-
-We can think of a source domain as a collection of messages and
-associated translation strings.
-
-We often need to create unicode strings that will be displayed by
-separate views.  The view cannot translate the string without knowing
-its source domain.  A string or unicode literal carries no domain
-information, therefore we use messages.  Messages are unicode strings
-which carry a translation source domain and possibly a default
-translation.  They are created by a message factory. The message
-factory is created by calling ``MessageFactory`` with the source
-domain.
-
-This package provides facilities for *delaring* such messages within
-program source text;  translation of the messages is the responsiblitiy
-of the 'zope.i18n' package.
-
-Changes
--------
-
-See CHANGES.txt.
-
-Installation
-------------
-
-See INSTALL.txt.
-
-
-Developer Resources
--------------------
-
-- Subversion browser:
-
-  http://svn.zope.org/zope.i18nmessageid/
-
-- Read-only Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.i18nmessageid/trunk
-
-- Writable Subversion checkout:
-
-  $ svn co svn://svn.zope.org/repos/main/zope.i18nmessageid/trunk
-
-- Note that the 'src/zope/i18nmessageid' 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 1196682..0000000
--- a/setup.cfg.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[development]
-depends = zope.testing
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
diff --git a/setup.py b/setup.py
index 0bb31d5..c0c7497 100644
--- a/setup.py
+++ b/setup.py
@@ -18,15 +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.i18nmessageid',
-      version='3.0',
+      version='3.4dev',
 
       url='http://svn.zope.org/zope.i18nmessageid',
       license='ZPL 2.1',
@@ -35,7 +30,7 @@ setup(name='zope.i18nmessageid',
       author_email='zope3-dev@zope.org',
       long_description='',
 
-      packages=['zope', 'zope.i18nmessageid'],
+      packages=find_packages('src'),
       package_dir = {'': 'src'},
 
       ext_modules=[Extension("zope.i18nmessageid._zope_i18nmessageid_message",
diff --git a/src/zope/__init__.py b/src/zope/__init__.py
index f60ff1b..bf99a9d 100644
--- a/src/zope/__init__.py
+++ b/src/zope/__init__.py
@@ -1,7 +1,8 @@
-# namespace package boilerplate
+# this is a namespace package
 try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError, e:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
 
diff --git a/test.py b/test.py
deleted file mode 100644
index b16c6ce..0000000
--- a/test.py
+++ /dev/null
@@ -1,36 +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.i18nmessageid',
-    '--tests-pattern', '^tests$',
-    ]
-
-sys.exit(testrunner.run(defaults))
-