[Checkins] SVN: lovely.memcached/trunk/ Use zope.intid, zope.keyreference, zope.site, zope component instead
Nikolay Kim
fafhrd91 at gmail.com
Fri Dec 11 01:41:18 EST 2009
Log message for revision 106418:
Use zope.intid, zope.keyreference, zope.site, zope component instead
of zope.app.intid, zope.app.keyreference, zope.app.component
Changed:
U lovely.memcached/trunk/CHANGES.txt
U lovely.memcached/trunk/bootstrap.py
U lovely.memcached/trunk/buildout.cfg
U lovely.memcached/trunk/setup.py
U lovely.memcached/trunk/src/lovely/memcached/browser/README.txt
U lovely.memcached/trunk/src/lovely/memcached/browser/tests.py
U lovely.memcached/trunk/src/lovely/memcached/configurator.py
U lovely.memcached/trunk/src/lovely/memcached/event.py
U lovely.memcached/trunk/src/lovely/memcached/interfaces.py
U lovely.memcached/trunk/src/lovely/memcached/testing/__init__.py
U lovely.memcached/trunk/src/lovely/memcached/testing/memcache.py
U lovely.memcached/trunk/src/lovely/memcached/tests.py
U lovely.memcached/trunk/src/lovely/memcached/utility.py
-=-
Modified: lovely.memcached/trunk/CHANGES.txt
===================================================================
--- lovely.memcached/trunk/CHANGES.txt 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/CHANGES.txt 2009-12-11 06:41:17 UTC (rev 106418)
@@ -2,17 +2,22 @@
Changes in lovely.memcached
===========================
-After:
-======
+0.2.0 (Unreleased)
+------------------
+- Use zope.intid, zope.keyreference, zope.site, zope component instead
+ of zope.app.intid, zope.app.keyreference, zope.app.component
+
- Make testing.README sleep a tad longer so the buildbot is happy.
-- added find-links to buildout
+ added find-links to buildout
+
2008/04/27 0.1.4:
==================
- tagging current trunk (unchanged since 8 month) as 0.1.4
+
2007/08/13 0.1.3:
=================
Modified: lovely.memcached/trunk/bootstrap.py
===================================================================
--- lovely.memcached/trunk/bootstrap.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/bootstrap.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -24,6 +24,8 @@
tmpeggs = tempfile.mkdtemp()
+is_jython = sys.platform.startswith('java')
+
try:
import pkg_resources
except ImportError:
@@ -34,23 +36,42 @@
import pkg_resources
-cmd = 'from setuptools.command.easy_install import main; main()'
if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ def quote (c):
+ return c
-ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws = pkg_resources.working_set
+if is_jython:
+ import subprocess
+
+ assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+ quote(tmpeggs), 'zc.buildout'],
+ env=dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse('setuptools')).location
+ ),
+ ).wait() == 0
+
+else:
+ assert os.spawnle(
+ os.P_WAIT, sys.executable, quote (sys.executable),
+ '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
+ dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse('setuptools')).location
+ ),
+ ) == 0
+
ws.add_entry(tmpeggs)
ws.require('zc.buildout')
import zc.buildout.buildout
zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
shutil.rmtree(tmpeggs)
-
Modified: lovely.memcached/trunk/buildout.cfg
===================================================================
--- lovely.memcached/trunk/buildout.cfg 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/buildout.cfg 2009-12-11 06:41:17 UTC (rev 106418)
@@ -2,8 +2,6 @@
develop = .
parts = test
-find-links = http://download.zope.org/distribution
-
[test]
recipe = zc.recipe.testrunner
eggs = lovely.memcached [test]
Modified: lovely.memcached/trunk/setup.py
===================================================================
--- lovely.memcached/trunk/setup.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/setup.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -21,18 +21,15 @@
package_dir = {'':'src'},
namespace_packages = ['lovely'],
extras_require = dict(test = ['z3c.configurator',
- 'z3c.testing',
- 'zope.app.keyreference',
- 'zope.app.securitypolicy',
+ 'zope.keyreference',
+ 'zope.securitypolicy',
'zope.app.testing',
- 'zope.app.zcmlfiles',
- 'z3c.testing',
'zope.testbrowser',
]),
install_requires = ['setuptools',
'python-memcached',
- 'zope.app.component',
- 'zope.app.intid',
+ 'zope.site',
+ 'zope.intid',
'zope.event',
'zope.interface',
'zope.lifecycleevent',
Modified: lovely.memcached/trunk/src/lovely/memcached/browser/README.txt
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/browser/README.txt 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/browser/README.txt 2009-12-11 06:41:17 UTC (rev 106418)
@@ -4,6 +4,10 @@
Let us add a memcached utility.
+ >>> from z3c.configurator import configurator
+ >>> configurator.configure(
+ ... getRootFolder(), {}, names = ['lovely.memcachedclient'])
+
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
>>> browser.addHeader('Authorization','Basic mgr:mgrpw')
Modified: lovely.memcached/trunk/src/lovely/memcached/browser/tests.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/browser/tests.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/browser/tests.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -16,24 +16,20 @@
"""
__docformat__ = "reStructuredText"
+import os.path
import unittest
from zope.testing import doctest
from zope.app.testing import functional
-from z3c.testing import layer
-from z3c.configurator import configurator
+from zope.app.testing.functional import ZCMLLayer
-def appSetUp(app):
- configurator.configure(app, {},
- names = ['lovely.memcachedclient'])
+memcachedLayer = ZCMLLayer(
+ os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
+ __name__, 'memcachedLayer', allow_teardown=True)
-layer.defineLayer('MemcachedLayer', zcml='ftesting.zcml',
- appSetUp=appSetUp,
- clean=True)
-
def test_suite():
suite = functional.FunctionalDocFileSuite('README.txt')
- suite.layer = MemcachedLayer
+ suite.layer = memcachedLayer
suite.level = 2
return unittest.TestSuite((suite,))
Modified: lovely.memcached/trunk/src/lovely/memcached/configurator.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/configurator.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/configurator.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -22,7 +22,7 @@
from zope.interface.interfaces import IMethod
from zope import schema
from z3c.configurator import configurator
-from zope.app.component.interfaces import ISite
+from zope.component.interfaces import ISite
from zope.lifecycleevent import ObjectCreatedEvent
import zope.event
from zope.security.proxy import removeSecurityProxy
@@ -32,11 +32,11 @@
name = schema.TextLine(title=u'Name',
required=False,
default=u'')
-
+
class SetUpMemcachedClient(configurator.SchemaConfigurationPluginBase):
component.adapts(ISite)
schema = IMemcachedClientProperties
-
+
def __call__(self, data):
for name in self.schema:
Modified: lovely.memcached/trunk/src/lovely/memcached/event.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/event.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/event.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -20,7 +20,7 @@
from zope import component
from zope import event
-from zope.app.intid.interfaces import IIntIds
+from zope.intid.interfaces import IIntIds
from interfaces import IInvalidateCacheEvent, IMemcachedClient
@@ -52,4 +52,3 @@
else:
cache.invalidate(event.key, event.ns, True, event.dependencies)
cache.invalidate(event.key, event.ns, False, event.dependencies)
-
Modified: lovely.memcached/trunk/src/lovely/memcached/interfaces.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/interfaces.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/interfaces.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -124,4 +124,3 @@
title = u'Dependencies',
required = False,
)
-
Modified: lovely.memcached/trunk/src/lovely/memcached/testing/__init__.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/testing/__init__.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/testing/__init__.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -17,4 +17,3 @@
__docformat__ = "reStructuredText"
from memcache import TestMemcachedClient
-
Modified: lovely.memcached/trunk/src/lovely/memcached/testing/memcache.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/testing/memcache.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/testing/memcache.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -101,4 +101,3 @@
def resetCounts(self):
self._hits = 0
self._misses = 0
-
Modified: lovely.memcached/trunk/src/lovely/memcached/tests.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/tests.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/tests.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -21,9 +21,9 @@
from zope.testing import doctest
from zope.testing.doctestunit import DocTestSuite, DocFileSuite
-from zope.app.keyreference import testing
-from zope.app.intid.interfaces import IIntIds
-from zope.app.intid import IntIds
+from zope.keyreference import testing
+from zope.intid.interfaces import IIntIds
+from zope.intid import IntIds
from zope.app.testing import setup
Modified: lovely.memcached/trunk/src/lovely/memcached/utility.py
===================================================================
--- lovely.memcached/trunk/src/lovely/memcached/utility.py 2009-12-10 16:44:03 UTC (rev 106417)
+++ lovely.memcached/trunk/src/lovely/memcached/utility.py 2009-12-11 06:41:17 UTC (rev 106418)
@@ -314,4 +314,3 @@
self.set(keys, (s.uid, ns), lifetime=0, ns=NS)
s.dirtyKeys.discard(ns)
s.lastUpdates[ns] = t
-
More information about the checkins
mailing list