[Checkins] SVN: grokcore.json/trunk/ Tests need paths changed.
Souheil CHELFOUH
souheil at chelfouh.com
Tue Nov 2 22:17:58 EDT 2010
Log message for revision 118132:
Tests need paths changed.
Changed:
U grokcore.json/trunk/buildout.cfg
U grokcore.json/trunk/setup.py
A grokcore.json/trunk/src/grokcore/__init__.py
U grokcore.json/trunk/src/grokcore/json/__init__.py
U grokcore.json/trunk/src/grokcore/json/components.py
U grokcore.json/trunk/src/grokcore/json/ftesting.zcml
U grokcore.json/trunk/src/grokcore/json/ftests/json/json.py
U grokcore.json/trunk/src/grokcore/json/meta.py
U grokcore.json/trunk/src/grokcore/json/tests/json/json_layers.py
U grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission.py
U grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission2.py
U grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission3.py
U grokcore.json/trunk/src/grokcore/json/tests/json/multiple_require.py
U grokcore.json/trunk/src/grokcore/json/tests/json/nocontext.py
U grokcore.json/trunk/src/grokcore/json/tests/json/nomethods.py
U grokcore.json/trunk/src/grokcore/json/tests/json/view_lookup.py
-=-
Modified: grokcore.json/trunk/buildout.cfg
===================================================================
--- grokcore.json/trunk/buildout.cfg 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/buildout.cfg 2010-11-03 02:17:55 UTC (rev 118132)
@@ -1,80 +1,18 @@
[buildout]
extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
parts =
- docs
- interpreter
- grokwiki
- mkdirs
test
- zpasswd
- zope_conf site_zcml deploy_ini debug_ini
develop =
.
- grokdocs
- grokwiki
versions = versions
extensions = buildout.dumppickedversions
[versions]
-grok =
+grokcore.json =
-[docs]
-recipe = z3c.recipe.scripts
-eggs = grokdocs
-
-[interpreter]
-recipe = z3c.recipe.scripts
-eggs = grokwiki
- zest.releaser
-interpreter = grokpy
-
-[grokwiki]
-recipe = z3c.recipe.scripts
-eggs = grokwiki
- z3c.evalexception>=2.0
- Paste
- PasteScript
- PasteDeploy
-
-[mkdirs]
-recipe = z3c.recipe.mkdir
-paths =
- ${zope_conf:filestorage}
- ${zope_conf:logfiles}
-
[test]
recipe = zc.recipe.testrunner
eggs =
- grok
- grok[test]
+ grokcore.json
+ grokcore.json[test]
defaults = ['--tests-pattern', '^f?tests$', '-v']
-
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = grokwiki
-module = zope.app.server.zpasswd
-method = main
-
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-filestorage = ${buildout:directory}/var/filestorage
-logfiles = ${buildout:directory}/var/log
-
-[site_zcml]
-recipe = z3c.recipe.template
-input = etc/site.zcml.in
-output = ${buildout:parts-directory}/etc/site.zcml
-
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
Modified: grokcore.json/trunk/setup.py
===================================================================
--- grokcore.json/trunk/setup.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/setup.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -8,82 +8,44 @@
read('README.txt')
+ '\n' +
read('CHANGES.txt')
- + '\n' +
- 'Download\n'
- '********\n'
)
tests_require = [
- 'zope.app.wsgi',
- 'zope.configuration',
'zope.testing',
+ 'zope.app.wsgi',
]
setup(
- name='grok',
- version='1.2.2dev',
+ name='grokcore.json',
+ version='1.0dev',
author='Grok Team',
author_email='grok-dev at zope.org',
url='http://grok.zope.org',
- download_url='http://cheeseshop.python.org/pypi/grok/',
- description='Grok: Now even cavemen can use Zope 3!',
+ download_url='http://pypi.python.org/pypi/grokcore.json/',
+ description='JSON View component for Grok.',
long_description=long_description,
license='ZPL',
- classifiers=['Environment :: Web Environment',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: Zope Public License',
- 'Programming Language :: Python',
- 'Framework :: Zope3',
- ],
-
+ classifiers=[
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Framework :: Zope3',
+ ],
packages=find_packages('src'),
package_dir = {'': 'src'},
include_package_data = True,
zip_safe=False,
install_requires=[
- 'ZODB3',
- 'grokcore.annotation >= 1.1',
- 'grokcore.component >= 1.5, < 2.0',
- 'grokcore.content',
- 'grokcore.formlib >= 1.4',
- 'grokcore.message',
- 'grokcore.security >= 1.1',
- 'grokcore.site',
- 'grokcore.view >= 1.12',
- 'grokcore.viewlet >= 1.3',
- 'martian >= 0.10, < 0.12',
- 'pytz',
'setuptools',
+ 'grokcore.component',
+ 'grokcore.security',
+ 'grokcore.view',
+ 'martian',
'simplejson',
- 'z3c.autoinclude',
- 'zc.catalog',
- 'zope.annotation',
- 'zope.app.appsetup',
- 'zope.app.http',
- 'zope.app.publication',
- 'zope.browserpage',
- 'zope.catalog',
'zope.component',
- 'zope.container',
- 'zope.contentprovider',
- 'zope.event',
- 'zope.exceptions',
- 'zope.i18n',
- 'zope.i18nmessageid',
'zope.interface',
- 'zope.intid',
- 'zope.keyreference',
- 'zope.lifecycleevent',
- 'zope.location',
- 'zope.login',
- 'zope.password',
- 'zope.principalregistry',
'zope.publisher',
- 'zope.schema',
- 'zope.security',
- 'zope.securitypolicy',
- 'zope.site',
- 'zope.traversing',
],
tests_require=tests_require,
extras_require={'test': tests_require},
Added: grokcore.json/trunk/src/grokcore/__init__.py
===================================================================
--- grokcore.json/trunk/src/grokcore/__init__.py (rev 0)
+++ grokcore.json/trunk/src/grokcore/__init__.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -0,0 +1,7 @@
+# this is a namespace package
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
Modified: grokcore.json/trunk/src/grokcore/json/__init__.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/__init__.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/__init__.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -12,10 +12,14 @@
#
##############################################################################
+from grokcore.component import *
+from grokcore.security import *
+from grokcore.view import *
+
+
from grokcore.json.components import JSON
-# Our __init__ provides the grok API directly so using 'import grok' is enough.
-from grok.interfaces import IGrokAPI
+from grokcore.json.interfaces import IGrokcoreJSONAPI
from zope.interface import moduleProvides
-moduleProvides(IGrokAPI)
-__all__ = list(IGrokAPI)
+moduleProvides(IGrokcoreJSONAPI)
+__all__ = list(IGrokcoreJSONAPI)
Modified: grokcore.json/trunk/src/grokcore/json/components.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/components.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/components.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -19,14 +19,11 @@
"""
-from zope import interface
from zope.publisher.browser import BrowserPage
from zope.publisher.publish import mapply
import simplejson
import grokcore.view
-import grokcore.site
-import grokcore.message
from zope.interface import implements
Modified: grokcore.json/trunk/src/grokcore/json/ftesting.zcml
===================================================================
--- grokcore.json/trunk/src/grokcore/json/ftesting.zcml 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/ftesting.zcml 2010-11-03 02:17:55 UTC (rev 118132)
@@ -2,9 +2,10 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok"
xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="grok"
- package="grok">
+ i18n_domain="grokcore.json"
+ package="grokcore.json">
<include package="grokcore.json" />
+ <grok:grok package="grok.ftests" />
</configure>
Modified: grokcore.json/trunk/src/grokcore/json/ftests/json/json.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/ftests/json/json.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/ftests/json/json.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -12,11 +12,13 @@
"""
-import grok
+import grokcore.json as grok
-class Cave(grok.Model):
+
+class Cave(grok.Context):
pass
+
class CaveJSON(grok.JSON):
def show(self):
return 'A Cavemans cave'
Modified: grokcore.json/trunk/src/grokcore/json/meta.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/meta.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/meta.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -14,7 +14,8 @@
"""JSON Grokking elements.
"""
import martian
-import grok
+from grokcore.component import context
+from grokcore.security import require
from grokcore.json import JSON
from grokcore.view import layer, make_checker
from zope.component import provideAdapter
@@ -37,8 +38,8 @@
"""
martian.component(JSON)
- martian.directive(grok.context)
- martian.directive(grok.require, name='permission')
+ martian.directive(context)
+ martian.directive(require, name='permission')
martian.directive(layer, default=IDefaultBrowserLayer)
def execute(
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/json_layers.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/json_layers.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/json_layers.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -68,14 +68,18 @@
"""
-import grok
+import grokcore.json as grok
+from zope.publisher.interfaces.browser import IBrowserRequest
-class IMyJSONLayer(grok.IBrowserRequest):
+
+class IMyJSONLayer(IBrowserRequest):
grok.skin('my_json')
-class Mammoth(grok.Model):
+
+class Mammoth(grok.Context):
pass
+
class MammothView(grok.JSON):
grok.context(Mammoth)
@@ -85,6 +89,7 @@
def public(self):
return {'public': 'only availble on the default layer'}
+
class AnotherMammothView(grok.JSON):
grok.context(Mammoth)
grok.layer(IMyJSONLayer)
@@ -95,10 +100,12 @@
def another(self):
return {'another': 'only available on my json layer'}
+
class IMySecondJSONLayer(IMyJSONLayer):
# Aggregates views on the first layer and adds more.
grok.skin('my_second_json')
+
class YetAnotherMammothView(grok.JSON):
grok.context(Mammoth)
grok.layer(IMySecondJSONLayer)
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -9,13 +9,13 @@
"""
-import grok
import zope.interface
+import grokcore.json as grok
+
class MissingPermission(grok.JSON):
grok.context(zope.interface.Interface)
grok.require('doesnt.exist')
def foo(self):
pass
-
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission2.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission2.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission2.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -9,13 +9,13 @@
"""
-import grok
+import grokcore.json as grok
import zope.interface
+
class MissingPermission(grok.JSON):
grok.context(zope.interface.Interface)
@grok.require('doesnt.exist')
def foo(self):
pass
-
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission3.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission3.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/missing_permission3.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -6,12 +6,14 @@
"""
-import grok
+import grokcore.json as grok
import zope.interface
+
class Permission(grok.Permission):
grok.name('json.exists')
+
class MissingPermission(grok.JSON):
grok.context(zope.interface.Interface)
@@ -20,4 +22,3 @@
@grok.require(Permission)
def foo(self):
pass
-
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/multiple_require.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/multiple_require.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/multiple_require.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -7,15 +7,18 @@
GrokError: grok.require was called multiple times in <class 'grok.tests.json.multiple_require.MultipleJSON'>. It may only be set once for a class.
"""
-import grok
+import grokcore.json as grok
import zope.interface
+
class One(grok.Permission):
grok.name('permission.1')
+
class Two(grok.Permission):
grok.name('permission.2')
+
class MultipleJSON(grok.JSON):
grok.context(zope.interface.Interface)
grok.require(One)
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/nocontext.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/nocontext.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/nocontext.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -11,8 +11,9 @@
'context' directive.
"""
-import grok
+import grokcore.json as grok
+
class TestJSON(grok.JSON):
def foo(self):
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/nomethods.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/nomethods.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/nomethods.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -7,10 +7,12 @@
its registration.
"""
-import grok
+import grokcore.json as grok
-class Caveman(grok.Model):
+
+class Caveman(grok.Context):
pass
+
class RemoteCaveman(grok.JSON):
pass
Modified: grokcore.json/trunk/src/grokcore/json/tests/json/view_lookup.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/json/view_lookup.py 2010-11-03 01:56:09 UTC (rev 118131)
+++ grokcore.json/trunk/src/grokcore/json/tests/json/view_lookup.py 2010-11-03 02:17:55 UTC (rev 118132)
@@ -60,11 +60,13 @@
<InterfaceClass zope.interface.Interface>, 'publishTraverse')
"""
-import grok
+import grokcore.json as grok
-class Mammoth(grok.Model):
+
+class Mammoth(grok.Context):
pass
+
class MammothView(grok.JSON):
grok.context(Mammoth)
@@ -74,6 +76,7 @@
def another(self):
return { 'another': 'grok'}
+
class SecondMammothView(grok.JSON):
grok.context(Mammoth)
More information about the checkins
mailing list