[Checkins] SVN: grok/trunk/src/grok/ Cleanup whitespace,
overlong lines.
Philipp von Weitershausen
philikon at philikon.de
Tue Oct 17 12:33:36 EDT 2006
Log message for revision 70755:
Cleanup whitespace, overlong lines.
Changed:
U grok/trunk/src/grok/_grok.py
U grok/trunk/src/grok/directive.py
U grok/trunk/src/grok/scan.py
U grok/trunk/src/grok/util.py
-=-
Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py 2006-10-17 15:21:04 UTC (rev 70754)
+++ grok/trunk/src/grok/_grok.py 2006-10-17 16:33:35 UTC (rev 70755)
@@ -13,27 +13,32 @@
##############################################################################
"""Grok
"""
+import os
import sys
-import os
from pkg_resources import resource_listdir, resource_exists, resource_string
+
import persistent
-from zope.dottedname.resolve import resolve
from zope import component
from zope import interface
+from zope.dottedname.resolve import resolve
import zope.component.interface
from zope.component.interfaces import IDefaultViewName
-from zope.security.checker import defineChecker, getCheckerForInstancesOf, NoProxy
+from zope.security.checker import (defineChecker, getCheckerForInstancesOf,
+ NoProxy)
from zope.publisher.browser import BrowserPage
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer, IBrowserRequest
+from zope.publisher.interfaces.browser import (IDefaultBrowserLayer,
+ IBrowserRequest)
from zope.pagetemplate import pagetemplate
from zope.app.pagetemplate.engine import TrustedAppPT
-from zope.app.publisher.browser.directoryresource import DirectoryResourceFactory
+from zope.app.publisher.browser.directoryresource import \
+ DirectoryResourceFactory
from grok import util, scan
from grok.error import GrokError, GrokImportError
from grok.directive import (ClassDirectiveContext, ModuleDirectiveContext,
ClassOrModuleDirectiveContext,
- TextDirective, InterfaceOrClassDirective, frame_is_module)
+ TextDirective, InterfaceOrClassDirective,
+ frame_is_module)
AMBIGUOUS_CONTEXT = object()
@@ -81,7 +86,8 @@
self.__grok_module__ = caller_module()
def __repr__(self):
- return '<%s template in %s>' % (self.__grok_name__, self.__grok_location__)
+ return '<%s template in %s>' % (self.__grok_name__,
+ self.__grok_location__)
def grok(dotted_name):
# register the name 'index' as the default view name
@@ -97,8 +103,9 @@
def grok_module(dotted_name):
module = resolve(dotted_name)
- models, adapters, multiadapters, views, templates, subscribers = scan_module(dotted_name, module)
-
+ models, adapters, multiadapters, views, templates, subscribers = \
+ scan_module(dotted_name, module)
+
find_filesystem_templates(dotted_name, module, templates)
context = determine_module_context(module, models)
@@ -141,7 +148,8 @@
def find_filesystem_templates(dotted_name, module, templates):
module_name = dotted_name.split('.')[-1]
- directory_name = directive_annotation(module, 'grok.templatedir', module_name)
+ directory_name = directive_annotation(module, 'grok.templatedir',
+ module_name)
if resource_exists(dotted_name, directory_name):
template_files = resource_listdir(dotted_name, directory_name)
for template_file in template_files:
@@ -152,8 +160,9 @@
template_path = os.path.join(directory_name, template_file)
if not template_file.endswith('.pt'):
- raise GrokError("Unrecognized file '%s' in template directory '%s'."
- % (template_file, directory_name), module)
+ raise GrokError("Unrecognized file '%s' in template directory "
+ "'%s'." % (template_file, directory_name),
+ module)
contents = resource_string(dotted_name, template_path)
template = PageTemplate(contents)
@@ -341,10 +350,12 @@
def __call__(self, function):
frame = sys._getframe(1)
if not frame_is_module(frame):
- raise GrokImportError("@grok.subscribe can only be used on module level.")
+ raise GrokImportError("@grok.subscribe can only be used on module "
+ "level.")
if not self.subscribed:
- raise GrokImportError("@grok.subscribe requires at least one argument.")
+ raise GrokImportError("@grok.subscribe requires at least one "
+ "argument.")
subscribers = frame.f_locals.get('__grok_subscribers__', None)
if subscribers is None:
Modified: grok/trunk/src/grok/directive.py
===================================================================
--- grok/trunk/src/grok/directive.py 2006-10-17 15:21:04 UTC (rev 70754)
+++ grok/trunk/src/grok/directive.py 2006-10-17 16:33:35 UTC (rev 70755)
@@ -29,7 +29,8 @@
return '__module__' in frame.f_locals
class IDirectiveContext(interface.Interface):
- description = interface.Attribute("The correct place in which the directive can be used.")
+ description = interface.Attribute("The correct place in which the "
+ "directive can be used.")
def matches(frame):
"""returns whether the given frame is the correct place in
Modified: grok/trunk/src/grok/scan.py
===================================================================
--- grok/trunk/src/grok/scan.py 2006-10-17 15:21:04 UTC (rev 70754)
+++ grok/trunk/src/grok/scan.py 2006-10-17 16:33:35 UTC (rev 70755)
@@ -15,8 +15,8 @@
"""
import os
+import setuptools
from glob import glob
-import setuptools
from zope.dottedname.resolve import resolve
def modules(dotted_name, module_path):
Modified: grok/trunk/src/grok/util.py
===================================================================
--- grok/trunk/src/grok/util.py 2006-10-17 15:21:04 UTC (rev 70754)
+++ grok/trunk/src/grok/util.py 2006-10-17 16:33:35 UTC (rev 70755)
@@ -17,7 +17,6 @@
import re
import types
-
def not_unicode_or_ascii(value):
if isinstance(value, unicode):
return False
@@ -28,11 +27,11 @@
is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
def isclass(obj):
- """We cannot use ``inspect.isclass`` because it will return True for interfaces"""
+ """We cannot use ``inspect.isclass`` because it will return True
+ for interfaces"""
return type(obj) in (types.ClassType, type)
def check_subclass(obj, class_):
if not isclass(obj):
return False
return issubclass(obj, class_)
-
More information about the Checkins
mailing list