Permalink
Browse files

remove zope related B/C imports, pep8

  • Loading branch information...
1 parent aa5bb6c commit 48d90fe253f6f7d186376762cf75a6cfca512e74 @rnixx rnixx committed Oct 15, 2012
View
@@ -1,4 +1,3 @@
-# /
*.pyc
/bda.ldap.egg-info
/coverage
@@ -9,9 +8,9 @@
/.*.cfg
/devsrc
/eggs
-
-# /src/
/src/bda.ldap.egg-info
/src/node.egg-info
-
.mrsd
+.project
+.pydevproject
+.pydevproject.bak
View
@@ -275,16 +275,32 @@ Summary of the test coverage report::
Contributors
============
-- Robert Niederreiter <rnix __at__ squarewave __dot__ at>
+- Robert Niederreiter <rnix [at] squarewave [dot] at>
-- Florian Friesdorf <flo __at__ chaoflow __dot__ net>
+- Florian Friesdorf <flo [at] chaoflow [dot] net>
-- Jens Klein <jens __at__ bluedynamics __dot__ com>
+- Jens Klein <jens [at] bluedynamics [dot] com>
Changes
=======
+0.9.9dev
+--------
+
+- Remove ``zope.component.event`` B/C.
+ [rnix, 2012-10-15]
+
+- Remove ``zope.location`` B/C.
+ [rnix, 2012-10-15]
+
+- Remove ``zope.lifecycleevent`` B/C.
+ [rnix, 2012-10-15]
+
+- Pep8.
+ [rnix, 2012-10-15]
+
+
0.9.8
-----
View
@@ -3,6 +3,7 @@ develop = .
parts =
test
coverage
+ pydev
extensions =
mr.developer
@@ -28,3 +29,7 @@ input = inline:
./bin/test --coverage ../../coverage -v --auto-progress "$@"
output = ${buildout:directory}/bin/coverage
mode = 755
+
+[pydev]
+recipe = pb.recipes.pydev
+eggs = ${test:eggs}
View
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = '0.9.8'
+version = '0.9.9dev'
shortdesc = "Building data structures as node trees"
longdesc = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
longdesc += open(os.path.join(os.path.dirname(__file__), 'LICENSE.rst')).read()
@@ -21,9 +21,9 @@
author='BlueDynamics Alliance',
author_email='dev@bluedynamics.com',
url='http://github.com/bluedynamics/node',
- license='Simplified BSD',
+ license='BSD',
packages=find_packages('src'),
- package_dir = {'': 'src'},
+ package_dir={'': 'src'},
namespace_packages=['node'],
include_package_data=True,
zip_safe=True,
View
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__) #pragma NO COVERAGE
+__import__('pkg_resources').declare_namespace(__name__) #pragma NO COVERAGE
View
@@ -1,17 +1,17 @@
-from odict import odict
from plumber import plumber
-from node.interfaces import INode
-from node.behaviors import Adopt
-from node.behaviors import Nodespaces
-from node.behaviors import Attributes
-from node.behaviors import Reference
-from node.behaviors import Order
-from node.behaviors import AsAttrAccess
-from node.behaviors import DefaultInit
-from node.behaviors import Nodify
-from node.behaviors import NodeChildValidate
-from node.behaviors import DictStorage
-from node.behaviors import OdictStorage
+from .behaviors import (
+ Adopt,
+ Nodespaces,
+ Attributes,
+ Reference,
+ Order,
+ AsAttrAccess,
+ DefaultInit,
+ Nodify,
+ NodeChildValidate,
+ DictStorage,
+ OdictStorage,
+)
class AbstractNode(object):
@@ -24,9 +24,9 @@ class AbstractNode(object):
class BaseNode(object):
"""Base node, not ordered.
-
+
Uses ``dict`` as ``IFullMapping`` implementation.
-
+
Derive this for unordered trees.
"""
__metaclass__ = plumber
@@ -42,9 +42,9 @@ class BaseNode(object):
class OrderedNode(object):
"""Ordered node.
-
+
Uses ``odict`` as ``IFullMapping`` implementation.
-
+
Derive this for ordered trees.
"""
__metaclass__ = plumber
@@ -60,7 +60,7 @@ class OrderedNode(object):
class Node(object):
"""A node with original functionality from zodict.node.Node.
-
+
XXX: reduce by attributes
"""
__metaclass__ = plumber
@@ -93,4 +93,4 @@ class AttributedNode(object):
DefaultInit,
Nodify,
OdictStorage,
- )
+ )
@@ -1,35 +1,51 @@
from .alias import Alias
-from .attributes import NodeAttributes
-from .attributes import Attributes
-from .cache import Invalidate
-from .cache import Cache
-from .common import Adopt
-from .common import AsAttrAccess
-from .common import ChildFactory
-from .common import FixedChildren
-from .common import GetattrChildren
-from .common import NodeChildValidate
-from .common import UnicodeAware
-from .common import UUIDAware
+from .attributes import (
+ NodeAttributes,
+ Attributes,
+)
+from .cache import (
+ Invalidate,
+ Cache,
+)
+from .common import (
+ Adopt,
+ AsAttrAccess,
+ ChildFactory,
+ FixedChildren,
+ GetattrChildren,
+ NodeChildValidate,
+ UnicodeAware,
+ UUIDAware,
+)
# from .common import Wrap
-from .lifecycle import Lifecycle
-from .lifecycle import AttributesLifecycle
-from .mapping import ItemMapping
-from .mapping import ReadMapping
-from .mapping import WriteMapping
-from .mapping import EnumerableMapping
-from .mapping import Mapping
-from .mapping import IterableMapping
-from .mapping import ClonableMapping
-from .mapping import ExtendedReadMapping
-from .mapping import ExtendedWriteMapping
-from .mapping import FullMapping
+from .lifecycle import (
+ Lifecycle,
+ AttributesLifecycle,
+)
+from .mapping import (
+ ItemMapping,
+ ReadMapping,
+ WriteMapping,
+ EnumerableMapping,
+ Mapping,
+ IterableMapping,
+ ClonableMapping,
+ ExtendedReadMapping,
+ ExtendedWriteMapping,
+ FullMapping,
+)
from .nodespace import Nodespaces
-from .nodify import DefaultInit
-from .nodify import Nodify
+from .nodify import (
+ DefaultInit,
+ Nodify,
+)
from .order import Order
-from .reference import NodeIndex
-from .reference import Reference
-from .storage import Storage
-from .storage import DictStorage
-from .storage import OdictStorage
+from .reference import (
+ NodeIndex,
+ Reference,
+)
+from .storage import (
+ Storage,
+ DictStorage,
+ OdictStorage,
+)
@@ -1,14 +1,19 @@
from odict import odict
-from plumber import plumber
-from plumber import default
-from plumber import plumb
-from plumber import Behavior
+from plumber import (
+ default,
+ plumb,
+ Behavior,
+)
from zope.interface import implementer
-from zope.interface.common.mapping import IEnumerableMapping
-from zope.interface.common.mapping import IFullMapping
-from node.interfaces import IAliaser
-from node.interfaces import IAlias
-from node.utils import ReverseMapping
+from zope.interface.common.mapping import (
+ IEnumerableMapping,
+ IFullMapping,
+)
+from ..interfaces import (
+ IAliaser,
+ IAlias,
+)
+from ..utils import ReverseMapping
@implementer(IAliaser, IFullMapping)
@@ -17,7 +22,7 @@ class DictAliaser(odict):
``__getitem__`` -> unalias
"""
-
+
def __init__(self, data=(), strict=True):
super(DictAliaser, self).__init__(data)
self.strict = strict
@@ -29,7 +34,7 @@ def alias(self, key):
if not self.strict:
return key
raise e
-
+
def unalias(self, aliased_key):
try:
return self[aliased_key]
@@ -95,7 +100,7 @@ class AliaserChain(object):
chain.alias(key) == aliaser2.alias(aliaser1.alias(key))
chain.unalias(alias_key) == aliaser2.unalias(aliaser1.unalias(aliased_key))
"""
-
+
def __init__(self, chain=None):
self.chain = chain
@@ -113,15 +118,15 @@ def unalias(self, key):
class PrefixSuffixAliaser(AliaserChain):
"""Prefixes and suffixes.
"""
-
+
def __init__(self, prefix=None, suffix=None):
self.chain = (PrefixAliaser(prefix), SuffixAliaser(suffix))
@implementer(IAlias)
class Alias(Behavior):
aliaser = default(None)
-
+
@plumb
def __getitem__(_next, self, key):
if self.aliaser:
@@ -132,7 +137,7 @@ def __getitem__(_next, self, key):
return _next(self, unaliased_key)
except KeyError:
raise KeyError(key)
-
+
@plumb
def __setitem__(_next, self, key, val):
if self.aliaser:
@@ -143,7 +148,7 @@ def __setitem__(_next, self, key, val):
_next(self, unaliased_key, val)
except KeyError:
raise KeyError(key)
-
+
@plumb
def __delitem__(_next, self, key):
if self.aliaser:
@@ -167,4 +172,4 @@ def __iter__(_next, self):
if IEnumerableMapping.providedBy(self.aliaser):
# an enumerable aliaser whitelists, we skip non-listed keys
continue
- raise
+ raise
Oops, something went wrong.

0 comments on commit 48d90fe

Please sign in to comment.