[Checkins] SVN: megrok.icon/branches/utility-less/src/megrok/icon/ Cleanup pep8/pyflakes
Vincent Fretin
vincent.fretin at gmail.com
Sat Jan 2 11:52:27 EST 2010
Log message for revision 107558:
Cleanup pep8/pyflakes
Changed:
U megrok.icon/branches/utility-less/src/megrok/icon/__init__.py
U megrok.icon/branches/utility-less/src/megrok/icon/directive.py
U megrok.icon/branches/utility-less/src/megrok/icon/interfaces.py
U megrok.icon/branches/utility-less/src/megrok/icon/registries_map.py
U megrok.icon/branches/utility-less/src/megrok/icon/registry.py
U megrok.icon/branches/utility-less/src/megrok/icon/tests/test_readme.py
U megrok.icon/branches/utility-less/src/megrok/icon/traversal.py
U megrok.icon/branches/utility-less/src/megrok/icon/utils.py
-=-
Modified: megrok.icon/branches/utility-less/src/megrok/icon/__init__.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/__init__.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/__init__.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -19,7 +19,6 @@
from megrok.icon.registry import IconsRegistry, CHECKER
-from megrok.icon.registries_map import _icons_registries_map
from megrok.icon.registries_map import (
getIconsRegistriesMap,
setIconsRegistriesMap,
Modified: megrok.icon/branches/utility-less/src/megrok/icon/directive.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/directive.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/directive.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -13,7 +13,7 @@
pyfile = modules[frame.f_locals['__module__']].__file__
path = os.path.join(os.path.dirname(pyfile), path)
if not os.path.isfile(path):
- raise ValueError, '%r is not a valid file' % path
+ raise ValueError('%r is not a valid file' % path)
return path
@@ -29,11 +29,11 @@
directlyProvides(reg, ITemporaryIconsRegistry)
else:
reg = mapping.get(registry)
-
+
reg.add(name, icon_absolute_path(self.frame, path))
else:
reg = mapping.get(registry)
if not name in reg:
- raise ValueError, 'Icon %r does not exist' % name
+ raise ValueError('Icon %r does not exist' % name)
return (name, registry)
Modified: megrok.icon/branches/utility-less/src/megrok/icon/interfaces.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/interfaces.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/interfaces.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -33,6 +33,7 @@
class IIconsRegistry(Interface):
"""The icon registry.
"""
+
def add(name, path):
"""Adds an icon to the registry.
"""
Modified: megrok.icon/branches/utility-less/src/megrok/icon/registries_map.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/registries_map.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/registries_map.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
-from megrok.icon import IconsRegistry
-from zope.browserresource.file import FileResourceFactory
-
_icons_registries_map = None
+
class IconsRegistryError(LookupError):
+
def __init__(self, name):
self.name = name
Exception.__init__(self, str(self))
Modified: megrok.icon/branches/utility-less/src/megrok/icon/registry.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/registry.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/registry.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
-import os
import mimetypes
-from grokcore import view, component as grok
+from grokcore import component as grok
from megrok.icon import log
-from megrok.icon.interfaces import IIcon, IIconsRegistry, IIconsRegistryStorage
+from megrok.icon.interfaces import IIconsRegistry, IIconsRegistryStorage
from zope.schema.fieldproperty import FieldProperty
from zope.security.checker import NamesChecker
from zope.browserresource.file import FileResourceFactory
@@ -24,7 +23,7 @@
allowed = FieldProperty(IIconsRegistry['allowed'])
registry = FieldProperty(IIconsRegistry['registry'])
subregistries = FieldProperty(IIconsRegistry['subregistries'])
-
+
def add(self, name, path):
if name in self:
log.warning(
@@ -52,4 +51,3 @@
def __init__(self, name):
self.name = name
self.registry = IconsStorage()
-
Modified: megrok.icon/branches/utility-less/src/megrok/icon/tests/test_readme.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/tests/test_readme.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/tests/test_readme.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -7,13 +7,13 @@
ftesting_zcml = os.path.join(os.path.dirname(__file__), 'ftesting.zcml')
FunctionalLayer = functional.ZCMLLayer(
- ftesting_zcml, __name__, 'FunctionalLayer', allow_teardown=True
- )
+ ftesting_zcml, __name__, 'FunctionalLayer', allow_teardown=True)
def setUp(test):
module.setUp(test, 'megrok.icon.tests')
-
+
+
def test_suite():
globs = {'grok_component': grok_component}
suite = unittest.TestSuite()
Modified: megrok.icon/branches/utility-less/src/megrok/icon/traversal.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/traversal.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/traversal.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -4,7 +4,6 @@
from megrok.icon import IIconsRegistry, queryIconsRegistry
-from zope.component import queryUtility
from zope.interface import Interface
from zope.location.interfaces import ILocation
from zope.location.location import locate, LocationProxy
@@ -41,7 +40,7 @@
def __init__(self, context, request):
self.context = context
self.request = request
-
+
def publishTraverse(self, request, name):
registry = removeSecurityProxy(self.context)
icon = registry.resource(name)
Modified: megrok.icon/branches/utility-less/src/megrok/icon/utils.py
===================================================================
--- megrok.icon/branches/utility-less/src/megrok/icon/utils.py 2010-01-02 16:42:02 UTC (rev 107557)
+++ megrok.icon/branches/utility-less/src/megrok/icon/utils.py 2010-01-02 16:52:27 UTC (rev 107558)
@@ -1,19 +1,17 @@
# -*- coding: utf-8 -*-
import os
-import grokcore.component as grok
import megrok.icon
from megrok.icon import getIconsRegistry, queryIconsRegistry
-from zope.component import queryUtility
from zope.traversing.browser.absoluteurl import absoluteURL
def get_icon_url(registry, request, name):
url = absoluteURL(registry, request)
return '%s/%s' % (url, name)
-
+
def get_component_icon_url(component, request):
icon, reg_name = megrok.icon.icon.bind().get(component)
registry = queryIconsRegistry(reg_name)
@@ -26,12 +24,12 @@
def populate_icons_registry(name, path):
registry = getIconsRegistry(name)
-
+
if not os.path.isdir(path):
path = os.path.join(os.path.dirname(__file__), path)
if not os.path.isdir(path):
raise NotImplementedError
-
+
for root, dirs, files in os.walk(path):
for name in files:
ipath = os.path.join(root, name)
More information about the checkins
mailing list