python 3 compatibility

remove __eq__ and __ne__ in Option
This commit is contained in:
gwen
2013-08-28 11:33:43 +02:00
committed by Emmanuel Garette
parent fc9aa7fad5
commit fbf05ba5e4
16 changed files with 161 additions and 173 deletions

View File

@ -206,7 +206,7 @@ class Property(object):
def set_storage(name, **args):
storage_type.set_storage(name)
settings = __import__(storage_type.get_storage(), globals(), locals(),
['Setting'], -1).Setting()
['Setting']).Setting()
for option, value in args.items():
try:
getattr(settings, option)
@ -223,17 +223,17 @@ def get_storage(context, session_id, persistent):
if session_id is None:
session_id = gen_id(context)
return __import__(storage_type.get_storage(), globals(), locals(),
['Storage'], -1).Storage(session_id, persistent)
['Storage']).Storage(session_id, persistent)
def list_sessions():
return __import__(storage_type.get_storage(), globals(), locals(),
['list_sessions'], -1).list_sessions()
['list_sessions']).list_sessions()
def delete_session(session_id):
return __import__(storage_type.get_storage(), globals(), locals(),
['delete_session'], -1).delete_session(session_id)
['delete_session']).delete_session(session_id)
#____________________________________________________________
@ -255,8 +255,8 @@ class Settings(object):
self._owner = owners.user
self.context = weakref.ref(context)
import_lib = 'tiramisu.storage.{0}.setting'.format(storage.storage)
self._p_ = __import__(import_lib, globals(), locals(), ['Settings'],
-1).Settings(storage)
self._p_ = __import__(import_lib, globals(), locals(), ['Settings']
).Settings(storage)
#____________________________________________________________
# properties methods
@ -496,7 +496,7 @@ class Settings(object):
try:
value = self.context()._getattr(reqpath,
force_permissive=True)
except PropertiesOptionError, err:
except PropertiesOptionError as err:
if not transitive:
continue
properties = err.proptype