[Repoze-checkins] r1227 - in repoze.zodbconn/trunk: . repoze/zodbconn repoze/zodbconn/resolvers repoze/zodbconn/tests

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Fri Jul  4 02:20:18 2008
New Revision: 1227

Log:
Prep for dev release.


Added:
   repoze.zodbconn/trunk/setup.cfg   (contents, props changed)
Modified:
   repoze.zodbconn/trunk/COPYRIGHT.txt
   repoze.zodbconn/trunk/repoze/zodbconn/resolvers/zeo.py
   repoze.zodbconn/trunk/repoze/zodbconn/tests/test_zeo_resolver.py
   repoze.zodbconn/trunk/repoze/zodbconn/utils.py
   repoze.zodbconn/trunk/setup.py

Modified: repoze.zodbconn/trunk/COPYRIGHT.txt
==============================================================================
--- repoze.zodbconn/trunk/COPYRIGHT.txt	(original)
+++ repoze.zodbconn/trunk/COPYRIGHT.txt	Fri Jul  4 02:20:18 2008
@@ -1,3 +1,3 @@
-Copyright (c) 2007 Agendaless Consulting and Contributors.
+Copyright (c) 2008 Agendaless Consulting and Contributors.
 (http://www.agendaless.com), All Rights Reserved
 

Modified: repoze.zodbconn/trunk/repoze/zodbconn/resolvers/zeo.py
==============================================================================
--- repoze.zodbconn/trunk/repoze/zodbconn/resolvers/zeo.py	(original)
+++ repoze.zodbconn/trunk/repoze/zodbconn/resolvers/zeo.py	Fri Jul  4 02:20:18 2008
@@ -50,9 +50,10 @@
             # TCP URL
             if ':' in netloc:
                 host, port = netloc.split(':')
+                port = int(port)
             else:
                 host = netloc
-                port = '9991'
+                port = 9991
             args = ((host, port),)
         else:
             # Unix domain socket URL
@@ -74,5 +75,3 @@
 
 resolve_zeo_uri = ZEOURIResolver()
 
-from repoze.zodbconn.utils import register_uri_resolver
-register_uri_resolver('zeo', resolve_zeo_uri)

Modified: repoze.zodbconn/trunk/repoze/zodbconn/tests/test_zeo_resolver.py
==============================================================================
--- repoze.zodbconn/trunk/repoze/zodbconn/tests/test_zeo_resolver.py	(original)
+++ repoze.zodbconn/trunk/repoze/zodbconn/tests/test_zeo_resolver.py	Fri Jul  4 02:20:18 2008
@@ -59,9 +59,9 @@
     def test_prepare_tcp(self):
         resolver = self._makeOne()
         k, args, kw = resolver.prepare('zeo://localhost:8080?debug=true')
-        self.assertEqual(args, (('localhost', '8080'),))
+        self.assertEqual(args, (('localhost', 8080),))
         self.assertEqual(kw, {'debug':1})
-        self.assertEqual(k, ((('localhost', '8080'),), (('debug', 1),)))
+        self.assertEqual(k, ((('localhost', 8080),), (('debug', 1),)))
 
     def test_prepare_unix(self):
         resolver = self._makeOne()

Modified: repoze.zodbconn/trunk/repoze/zodbconn/utils.py
==============================================================================
--- repoze.zodbconn/trunk/repoze/zodbconn/utils.py	(original)
+++ repoze.zodbconn/trunk/repoze/zodbconn/utils.py	Fri Jul  4 02:20:18 2008
@@ -14,3 +14,6 @@
     if resolver is None:
         raise ValueError('Unresolveable URI %s' % uri)
     return resolver(uri)
+
+from repoze.zodbconn.resolvers.zeo import resolve_zeo_uri
+register_uri_resolver('zeo', resolve_zeo_uri)

Added: repoze.zodbconn/trunk/setup.cfg
==============================================================================
--- (empty file)
+++ repoze.zodbconn/trunk/setup.cfg	Fri Jul  4 02:20:18 2008
@@ -0,0 +1,3 @@
+[easy_install]
+index = http://dist.repoze.org/bfg/dev/simple
+

Modified: repoze.zodbconn/trunk/setup.py
==============================================================================
--- repoze.zodbconn/trunk/setup.py	(original)
+++ repoze.zodbconn/trunk/setup.py	Fri Jul  4 02:20:18 2008
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007 Agendaless Consulting and Contributors.
+# Copyright (c) 2008 Agendaless Consulting and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the BSD-like license at
@@ -23,25 +23,25 @@
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
+CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 setup(name='repoze.zodbconn',
       version=__version__,
       description=('Middleware which makes ZODB connections available to'
                    'downstream applications'),
-      long_description=README,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
-        "Development Status :: 1 - Planning",
+        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware",
         ],
-      keywords='web application server wsgi zope',
+      keywords='wsgi middleware zope zodb',
       author="Agendaless Consulting",
       author_email="repoze-dev at lists.repoze.org",
-      dependency_links=['http://dist.repoze.org'],
       url="http://www.repoze.org",
       license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
       packages=find_packages(),
@@ -52,14 +52,6 @@
       install_requires=['ZODB3'],
       test_suite="repoze.zodbconn.tests",
       entry_points = """\
-        #[console_scripts]
-        #addzope2user = repoze.atemplate.scripts.adduser:main
-
-        #[repoze.project]
-        #initialize = repoze.atemplate.instance:mkinstance
-
-        #[paste.filter_app_factory]
-        #middleware = repoze.atemplate:constructor
       """
       )