[Checkins] SVN: megrok.resource/trunk/src/megrok/resource/ General cleaning : dependencies, unused imports, pep8 syntax.
Souheil CHELFOUH
souheil at chelfouh.com
Thu Feb 18 08:38:35 EST 2010
Log message for revision 109131:
General cleaning : dependencies, unused imports, pep8 syntax.
Renamed "traversal" to "url"
Changed:
U megrok.resource/trunk/src/megrok/resource/__init__.py
U megrok.resource/trunk/src/megrok/resource/components.py
U megrok.resource/trunk/src/megrok/resource/configure.zcml
U megrok.resource/trunk/src/megrok/resource/directives.py
U megrok.resource/trunk/src/megrok/resource/ftests/ftesting.zcml
U megrok.resource/trunk/src/megrok/resource/interfaces.py
U megrok.resource/trunk/src/megrok/resource/meta.py
D megrok.resource/trunk/src/megrok/resource/traversal.py
A megrok.resource/trunk/src/megrok/resource/url.py
U megrok.resource/trunk/src/megrok/resource/utils.py
-=-
Modified: megrok.resource/trunk/src/megrok/resource/__init__.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/__init__.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/__init__.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -1,6 +1,6 @@
from grokcore.view import path
from grokcore.component import name
-from hurry.resource import ResourceInclusion, GroupInclusion
+from hurry.resource import ResourceInclusion, GroupInclusion, mode
from megrok.resource.directives import include, use_hash, resource
from megrok.resource.components import Library, ResourceLibrary
Modified: megrok.resource/trunk/src/megrok/resource/components.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/components.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/components.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -3,12 +3,9 @@
from grokcore.component import baseclass
from grokcore.view import DirectoryResource
from zope.component import getUtility
-from hurry.resource import ResourceInclusion, GroupInclusion
from hurry.resource.interfaces import ICurrentNeededInclusions
-from megrok.resource.directives import resource
-from megrok.resource.interfaces import ILibrary
-
+
class Library(DirectoryResource):
"""A library that exposes resources through an URL.
This component is only used to declare a resources folder.
Modified: megrok.resource/trunk/src/megrok/resource/configure.zcml
===================================================================
--- megrok.resource/trunk/src/megrok/resource/configure.zcml 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/configure.zcml 2010-02-18 13:38:34 UTC (rev 109131)
@@ -9,7 +9,7 @@
<include package="z3c.hashedresource" />
<grok:grok package=".event" />
- <grok:grok package=".traversal" />
+ <grok:grok package=".url" />
<grok:grok package=".meta" />
</configure>
Modified: megrok.resource/trunk/src/megrok/resource/directives.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/directives.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/directives.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -5,7 +5,7 @@
from hurry.resource.interfaces import IInclusion
from megrok.resource.interfaces import IResourcesIncluder
from zope.interface import classImplements
-from zope.interface.declarations import addClassAdvisor, _implements_advice
+from zope.interface.declarations import addClassAdvisor
def validateInclusion(directive, value):
Modified: megrok.resource/trunk/src/megrok/resource/ftests/ftesting.zcml
===================================================================
--- megrok.resource/trunk/src/megrok/resource/ftests/ftesting.zcml 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/ftests/ftesting.zcml 2010-02-18 13:38:34 UTC (rev 109131)
@@ -8,7 +8,6 @@
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.app.zcmlfiles" />
- <include package="zope.app.authentication" />
<include package="grokcore.view" />
<include package="megrok.resource" />
@@ -20,20 +19,10 @@
id="zope.anybody"
title="Unauthenticated User"
/>
+
<grant
permission="zope.View"
principal="zope.anybody"
/>
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw"
- />
-
- <role id="zope.Manager" title="Site Manager" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager" principal="zope.mgr" />
-
</configure>
Modified: megrok.resource/trunk/src/megrok/resource/interfaces.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/interfaces.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/interfaces.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
from zope.interface import Interface, Attribute
@@ -5,8 +7,8 @@
"""A publishable component that can include resources.
"""
+
class ILibrary(Interface):
"""A library, including resources.
"""
name = Attribute("The name of the library needed for URL computations")
-
Modified: megrok.resource/trunk/src/megrok/resource/meta.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/meta.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/meta.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -4,8 +4,7 @@
from grokcore import component
from grokcore import view
-from grokcore.view.meta.directoryresource import DirectoryResourceGrokker
-from hurry.resource import ResourceInclusion, NeededInclusions
+from hurry.resource import ResourceInclusion
from hurry.resource.interfaces import IInclusion
from megrok.resource import Library, ILibrary, ResourceLibrary
from megrok.resource import resource
@@ -22,7 +21,7 @@
martian.directive(view.path)
martian.directive(component.name, get_default=default_library_name)
- def execute(self, factory, config, name, path, **kw):
+ def execute(self, factory, config, name, path, **kw):
# We set the name using the grok.name or the class name
# We do that only if the attribute is not already set.
if getattr(factory, 'name', None) is None:
@@ -36,7 +35,7 @@
# We provide ILibrary. It is needed since classProvides
# is not inherited.
alsoProvides(factory, ILibrary)
- return True
+ return True
class ResourceLibraryGrokker(martian.ClassGrokker):
@@ -51,4 +50,4 @@
def execute(self, factory, config, resource, **kw):
factory.depends = list(self.create_resources(factory, resource))
alsoProvides(factory, IInclusion)
- return True
+ return True
Deleted: megrok.resource/trunk/src/megrok/resource/traversal.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/traversal.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/traversal.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import megrok.resource
-import grokcore.component as grok
-
-from zope.component import getAdapter
-from zope.site.hooks import getSite
-from zope.traversing.browser.absoluteurl import absoluteURL
-
-from hurry.resource.interfaces import ILibraryUrl
-from hurry.zoperesource.zopesupport import getRequest
-from z3c.hashedresource.interfaces import IResourceContentsHash
-
-
- at grok.implementer(ILibraryUrl)
- at grok.adapter(megrok.resource.ILibrary)
-def library_url(library):
- request = getRequest()
- use_hash = megrok.resource.use_hash.bind().get(library)
- base_url = absoluteURL(getSite(), request)
-
- if use_hash is True:
- resource = getAdapter(request, name=library.name)
- hashpath = IResourceContentsHash(resource)
- return '%s/@@/++noop++%s/%s' % (base_url, hashpath, library.name)
-
- return '%s/@@/%s' % (base_url, library.name)
Copied: megrok.resource/trunk/src/megrok/resource/url.py (from rev 109103, megrok.resource/trunk/src/megrok/resource/traversal.py)
===================================================================
--- megrok.resource/trunk/src/megrok/resource/url.py (rev 0)
+++ megrok.resource/trunk/src/megrok/resource/url.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+import megrok.resource
+import grokcore.component as grok
+
+from zope.component import getAdapter
+from zope.site.hooks import getSite
+from zope.traversing.browser.absoluteurl import absoluteURL
+
+from hurry.resource.interfaces import ILibraryUrl
+from hurry.zoperesource.zopesupport import getRequest
+from z3c.hashedresource.interfaces import IResourceContentsHash
+
+
+ at grok.implementer(ILibraryUrl)
+ at grok.adapter(megrok.resource.ILibrary)
+def library_url(library):
+ request = getRequest()
+ use_hash = megrok.resource.use_hash.bind().get(library)
+ base_url = absoluteURL(getSite(), request)
+
+ if use_hash is True:
+ resource = getAdapter(request, name=library.name)
+ hashpath = IResourceContentsHash(resource)
+ return '%s/@@/++noop++%s/%s' % (base_url, hashpath, library.name)
+
+ return '%s/@@/%s' % (base_url, library.name)
Modified: megrok.resource/trunk/src/megrok/resource/utils.py
===================================================================
--- megrok.resource/trunk/src/megrok/resource/utils.py 2010-02-18 13:37:06 UTC (rev 109130)
+++ megrok.resource/trunk/src/megrok/resource/utils.py 2010-02-18 13:38:34 UTC (rev 109131)
@@ -1,10 +1,10 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
from martian.util import isclass
from megrok.resource import include, IResourcesIncluder
from zope.interface import classImplements, alsoProvides
+
def component_includes(component, *resources):
if isclass(component):
if not IResourcesIncluder.implementedBy(component):
@@ -12,5 +12,5 @@
else:
if not IResourcesIncluder.providedBy(component):
alsoProvides(component, IResourcesIncluder)
-
+
include.set(component, resources)
More information about the checkins
mailing list