Skip to content

Commit

Permalink
Changed unicode literals into unicode literals from six module
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbohman
jbohman committed Jun 13, 2011
1 parent 5dcd0fe commit 0148621
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 34 deletions.
34 changes: 18 additions & 16 deletions src/zope/registry/__init__.py
View file
Expand Up @@ -14,6 +14,7 @@
"""Basic components support
"""
import types
import six

from zope.interface import Interface
from zope.interface import implementedBy
Expand Down Expand Up @@ -82,8 +83,8 @@ def _setBases(self, bases):
lambda self, bases: self._setBases(bases),
)

def registerUtility(self, component=None, provided=None, name=u'', info=u'',
event=True, factory=None):
def registerUtility(self, component=None, provided=None, name=six.u(''),
info=six.u(''), event=True, factory=None):
if factory:
if component:
raise TypeError("Can't specify factory and component.")
Expand Down Expand Up @@ -117,7 +118,7 @@ def registerUtility(self, component=None, provided=None, name=u'', info=u'',
factory)
))

def unregisterUtility(self, component=None, provided=None, name=u'',
def unregisterUtility(self, component=None, provided=None, name=six.u(''),
factory=None):
if factory:
if component:
Expand Down Expand Up @@ -163,10 +164,10 @@ def registeredUtilities(self):
) in self._utility_registrations.iteritems():
yield UtilityRegistration(self, provided, name, *data)

def queryUtility(self, provided, name=u'', default=None):
def queryUtility(self, provided, name=six.u(''), default=None):
return self.utilities.lookup((), provided, name, default)

def getUtility(self, provided, name=u''):
def getUtility(self, provided, name=six.u('')):
utility = self.utilities.lookup((), provided, name)
if utility is None:
raise ComponentLookupError(provided, name)
Expand All @@ -179,8 +180,8 @@ def getUtilitiesFor(self, interface):
def getAllUtilitiesRegisteredFor(self, interface):
return self.utilities.subscriptions((), interface)

def registerAdapter(self, factory, required=None, provided=None, name=u'',
info=u'', event=True):
def registerAdapter(self, factory, required=None, provided=None,
name=six.u(''), info=six.u(''), event=True):
if provided is None:
provided = _getAdapterProvided(factory)
required = _getAdapterRequired(factory, required)
Expand All @@ -196,7 +197,7 @@ def registerAdapter(self, factory, required=None, provided=None, name=u'',


def unregisterAdapter(self, factory=None,
required=None, provided=None, name=u'',
required=None, provided=None, name=six.u(''),
):
if provided is None:
if factory is None:
Expand Down Expand Up @@ -228,20 +229,21 @@ def registeredAdapters(self):
yield AdapterRegistration(self, required, provided, name,
component, info)

def queryAdapter(self, object, interface, name=u'', default=None):
def queryAdapter(self, object, interface, name=six.u(''), default=None):
return self.adapters.queryAdapter(object, interface, name, default)

def getAdapter(self, object, interface, name=u''):
def getAdapter(self, object, interface, name=six.u('')):
adapter = self.adapters.queryAdapter(object, interface, name)
if adapter is None:
raise ComponentLookupError(object, interface, name)
return adapter

def queryMultiAdapter(self, objects, interface, name=u'', default=None):
def queryMultiAdapter(self, objects, interface, name=six.u(''),
default=None):
return self.adapters.queryMultiAdapter(
objects, interface, name, default)

def getMultiAdapter(self, objects, interface, name=u''):
def getMultiAdapter(self, objects, interface, name=six.u('')):
adapter = self.adapters.queryMultiAdapter(objects, interface, name)
if adapter is None:
raise ComponentLookupError(objects, interface, name)
Expand All @@ -257,7 +259,7 @@ def getAdapters(self, objects, provided):

def registerSubscriptionAdapter(self,
factory, required=None, provided=None,
name=u'', info=u'',
name=six.u(''), info=six.u(''),
event=True):
if name:
raise TypeError("Named subscribers are not yet supported")
Expand All @@ -280,7 +282,7 @@ def registeredSubscriptionAdapters(self):
yield SubscriptionRegistration(self, *data)

def unregisterSubscriptionAdapter(self, factory=None,
required=None, provided=None, name=u'',
required=None, provided=None, name=six.u(''),
):
if name:
raise TypeError("Named subscribers are not yet supported")
Expand Down Expand Up @@ -326,7 +328,7 @@ def subscribers(self, objects, provided):

def registerHandler(self,
factory, required=None,
name=u'', info=u'',
name=six.u(''), info=six.u(''),
event=True):
if name:
raise TypeError("Named handlers are not yet supported")
Expand All @@ -345,7 +347,7 @@ def registeredHandlers(self):
for data in self._handler_registrations:
yield HandlerRegistration(self, *data)

def unregisterHandler(self, factory=None, required=None, name=u''):
def unregisterHandler(self, factory=None, required=None, name=six.u('')):
if name:
raise TypeError("Named subscribers are not yet supported")

Expand Down
37 changes: 19 additions & 18 deletions src/zope/registry/interfaces.py
View file
Expand Up @@ -14,6 +14,7 @@
"""Component and Component Architecture Interfaces
"""
__docformat__ = "reStructuredText"
import six

from zope.interface import Attribute
from zope.interface import Interface
Expand Down Expand Up @@ -119,7 +120,7 @@ def getAllUtilitiesRegisteredFor(interface, context=None):
# Adapter API

def getAdapter(object,
interface=Interface, name=u'',
interface=Interface, name=six.u(''),
context=None):
"""Get a named adapter to an interface for an object
Expand Down Expand Up @@ -174,7 +175,7 @@ def getMultiAdapter(objects,
named adapter methods with an empty string for a name.
"""

def queryAdapter(object, interface=Interface, name=u'',
def queryAdapter(object, interface=Interface, name=six.u(''),
default=None, context=None):
"""Look for a named adapter to an interface for an object
Expand Down Expand Up @@ -211,7 +212,7 @@ def queryAdapterInContext(object, interface, context, default=None):
"""

def queryMultiAdapter(objects,
interface=Interface, name=u'',
interface=Interface, name=six.u(''),
default=None,
context=None):
"""Look for a multi-adapter to an interface for objects
Expand Down Expand Up @@ -318,26 +319,26 @@ class IComponentLookup(Interface):
utilities = Attribute(
"Adapter Registry to manage all registered utilities.")

def queryAdapter(object, interface, name=u'', default=None):
def queryAdapter(object, interface, name=six.u(''), default=None):
"""Look for a named adapter to an interface for an object
If a matching adapter cannot be found, returns the default.
"""

def getAdapter(object, interface, name=u''):
def getAdapter(object, interface, name=six.u('')):
"""Look for a named adapter to an interface for an object
If a matching adapter cannot be found, a ComponentLookupError
is raised.
"""

def queryMultiAdapter(objects, interface, name=u'', default=None):
def queryMultiAdapter(objects, interface, name=six.u(''), default=None):
"""Look for a multi-adapter to an interface for multiple objects
If a matching adapter cannot be found, returns the default.
"""

def getMultiAdapter(objects, interface, name=u''):
def getMultiAdapter(objects, interface, name=six.u('')):
"""Look for a multi-adapter to an interface for multiple objects
If a matching adapter cannot be found, a ComponentLookupError
Expand Down Expand Up @@ -395,7 +396,7 @@ class IComponentRegistrationConvenience(Interface):
activity.
"""

def provideUtility(component, provides=None, name=u''):
def provideUtility(component, provides=None, name=six.u('')):
"""Register a utility globally
A utility is registered to provide an interface with a
Expand All @@ -411,7 +412,7 @@ def provideUtility(component, provides=None, name=u''):
"""

def provideAdapter(factory, adapts=None, provides=None, name=u''):
def provideAdapter(factory, adapts=None, provides=None, name=six.u('')):
"""Register an adapter globally
An adapter is registered to provide an interface with a name
Expand Down Expand Up @@ -586,7 +587,7 @@ class IComponentRegistry(Interface):
"""Register components
"""

def registerUtility(component=None, provided=None, name=u'', info=u'', factory=None):
def registerUtility(component=None, provided=None, name=six.u(''), info=six.u(''), factory=None):
"""Register a utility
factory
Expand All @@ -612,7 +613,7 @@ def registerUtility(component=None, provided=None, name=u'', info=u'', factory=N
A Registered event is generated with an IUtilityRegistration.
"""

def unregisterUtility(component=None, provided=None, name=u'', factory=None):
def unregisterUtility(component=None, provided=None, name=six.u(''), factory=None):
"""Unregister a utility
A boolean is returned indicating whether the registry was
Expand Down Expand Up @@ -650,8 +651,8 @@ def registeredUtilities():
in the object.
"""

def registerAdapter(factory, required=None, provided=None, name=u'',
info=u''):
def registerAdapter(factory, required=None, provided=None, name=six.u(''),
info=six.u('')):
"""Register an adapter factory
Parameters:
Expand Down Expand Up @@ -688,7 +689,7 @@ def registerAdapter(factory, required=None, provided=None, name=u'',
"""

def unregisterAdapter(factory=None, required=None,
provided=None, name=u''):
provided=None, name=six.u('')):
"""Register an adapter factory
A boolean is returned indicating whether the registry was
Expand Down Expand Up @@ -738,7 +739,7 @@ def registeredAdapters():
"""

def registerSubscriptionAdapter(factory, required=None, provides=None,
name=u'', info=''):
name=six.u(''), info=''):
"""Register a subscriber factory
Parameters:
Expand Down Expand Up @@ -779,7 +780,7 @@ def registerSubscriptionAdapter(factory, required=None, provides=None,
"""

def unregisterSubscriptionAdapter(factory=None, required=None,
provides=None, name=u''):
provides=None, name=six.u('')):
"""Unregister a subscriber factory.
A boolean is returned indicating whether the registry was
Expand Down Expand Up @@ -833,7 +834,7 @@ def registeredSubscriptionAdapters():
registrations in the object.
"""

def registerHandler(handler, required=None, name=u'', info=''):
def registerHandler(handler, required=None, name=six.u(''), info=''):
"""Register a handler.
A handler is a subscriber that doesn't compute an adapter
Expand Down Expand Up @@ -871,7 +872,7 @@ def registerHandler(handler, required=None, name=u'', info=''):
A Registered event is generated with an IHandlerRegistration.
"""

def unregisterHandler(handler=None, required=None, name=u''):
def unregisterHandler(handler=None, required=None, name=six.u('')):
"""Unregister a handler.
A handler is a subscriber that doesn't compute an adapter
Expand Down

0 comments on commit 0148621

Please sign in to comment.