# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1234947980 -3600
# Node ID 95b3419e94c591985537dab4434bf4eac5534fba
# Parent  e044f28372bdf261125729e2aa7ac147f1b87616# Parent  2c39818304080312e185532243807f95b15d1581
merge

diff -r e044f28372bd -r 95b3419e94c5 common/test/unittest_migration.py
--- a/common/test/unittest_migration.py	Wed Feb 18 10:05:15 2009 +0100
+++ b/common/test/unittest_migration.py	Wed Feb 18 10:06:20 2009 +0100
@@ -30,6 +30,8 @@
         self.config = MigrTestConfig('data')
         from yams.schema import Schema
         self.config.load_schema = lambda expand_cubes=False: Schema('test')
+        self.config.__class__.cubicweb_vobject_path = frozenset()
+        self.config.__class__.cube_vobject_path = frozenset()
         
     def test_migration_files_base(self):
         self.assertListEquals(migration_files(self.config, [('cubicweb', (2,3,0), (2,4,0)),
diff -r e044f28372bd -r 95b3419e94c5 vregistry.py
--- a/vregistry.py	Wed Feb 18 10:05:15 2009 +0100
+++ b/vregistry.py	Wed Feb 18 10:06:20 2009 +0100
@@ -35,19 +35,8 @@
 from cubicweb import RegistryNotFound, ObjectNotFound, NoSelectableObject
 
 
-class vobject_helper(object):
-    """object instantiated at registration time to help a wrapped
-    VObject subclass
-    """
 
-    def __init__(self, registry, vobject):
-        self.registry = registry
-        self.vobject = vobject
-        self.config = registry.config
-        self.schema = registry.schema
-
-
-class registerer(vobject_helper):
+class registerer(object):
     """do whatever is needed at registration time for the wrapped
     class, according to current application schema and already
     registered objects of the same kind (i.e. same registry name and
@@ -60,7 +49,10 @@
     """
 
     def __init__(self, registry, vobject):
-        super(registerer, self).__init__(registry, vobject)
+        self.registry = registry
+        self.vobject = vobject
+        self.config = registry.config
+        self.schema = registry.schema
         self.kicked = set()
     
     def do_it_yourself(self, registered):
diff -r e044f28372bd -r 95b3419e94c5 web/views/baseviews.py
--- a/web/views/baseviews.py	Wed Feb 18 10:05:15 2009 +0100
+++ b/web/views/baseviews.py	Wed Feb 18 10:06:20 2009 +0100
@@ -24,9 +24,9 @@
 from cubicweb import Unauthorized, NoSelectableObject, typed_eid
 from cubicweb.selectors import (yes, empty_rset, nonempty_rset, one_line_rset,
                                 non_final_entity, match_search_state,  match_form_params)
+from cubicweb.view import EntityView, AnyRsetView, View
 from cubicweb.common.uilib import (cut, printable_value,  UnicodeCSVWriter,
                                    ajax_replace_url, rql_for_eid, simple_sgml_tag)
-from cubicweb.common.view import EntityView, AnyRsetView, View
 from cubicweb.web.httpcache import MaxAgeHTTPCacheManager
 from cubicweb.web.views import vid_from_rset, linksearch_select_url