--- a/entities/__init__.py Tue Feb 24 11:35:08 2009 +0100
+++ b/entities/__init__.py Tue Feb 24 11:59:53 2009 +0100
@@ -13,7 +13,7 @@
from cubicweb import Unauthorized, typed_eid
from cubicweb.entity import Entity
-from cubicweb.common.utils import dump_class
+from cubicweb.utils import dump_class
from cubicweb.schema import FormatConstraint
from cubicweb.interfaces import IBreadCrumbs, IFeed
--- a/server/msplanner.py Tue Feb 24 11:35:08 2009 +0100
+++ b/server/msplanner.py Tue Feb 24 11:59:53 2009 +0100
@@ -64,7 +64,7 @@
from rql.nodes import VariableRef, Comparison, Relation, Constant, Exists, Variable
from cubicweb import server
-from cubicweb.common.utils import make_uid
+from cubicweb.utils import make_uid
from cubicweb.server.utils import cleanup_solutions
from cubicweb.server.ssplanner import SSPlanner, OneFetchStep, add_types_restriction
from cubicweb.server.mssteps import *
--- a/server/session.py Tue Feb 24 11:35:08 2009 +0100
+++ b/server/session.py Tue Feb 24 11:59:53 2009 +0100
@@ -18,7 +18,7 @@
from cubicweb import RequestSessionMixIn, Binary
from cubicweb.dbapi import ConnectionProperties
-from cubicweb.common.utils import make_uid
+from cubicweb.utils import make_uid
from cubicweb.server.rqlrewrite import RQLRewriter
_ETYPE_PYOBJ_MAP = { bool: 'Boolean',
--- a/web/htmlwidgets.py Tue Feb 24 11:35:08 2009 +0100
+++ b/web/htmlwidgets.py Tue Feb 24 11:59:53 2009 +0100
@@ -10,7 +10,7 @@
from logilab.mtconverter import html_escape
-from cubicweb.common.utils import UStringIO
+from cubicweb.utils import UStringIO
from cubicweb.common.uilib import toggle_action
# XXX HTMLWidgets should have access to req (for datadir / static urls,
--- a/web/request.py Tue Feb 24 11:35:08 2009 +0100
+++ b/web/request.py Tue Feb 24 11:59:53 2009 +0100
@@ -21,7 +21,7 @@
from cubicweb.dbapi import DBAPIRequest
from cubicweb.common.mail import header
from cubicweb.common.uilib import remove_html_tags
-from cubicweb.common.utils import SizeConstrainedList, HTMLHead
+from cubicweb.utils import SizeConstrainedList, HTMLHead
from cubicweb.web import (INTERNAL_FIELD_VALUE, LOGGER, NothingToEdit, RequestError,
StatusResponse)
--- a/web/views/eproperties.py Tue Feb 24 11:35:08 2009 +0100
+++ b/web/views/eproperties.py Tue Feb 24 11:59:53 2009 +0100
@@ -13,7 +13,7 @@
from cubicweb.selectors import (one_line_rset, none_rset, implements,
match_user_groups, chainfirst, chainall)
-from cubicweb.common.utils import UStringIO
+from cubicweb.utils import UStringIO
from cubicweb.common.view import StartupView
from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs
from cubicweb.web.views import baseviews
--- a/web/views/tabs.py Tue Feb 24 11:35:08 2009 +0100
+++ b/web/views/tabs.py Tue Feb 24 11:59:53 2009 +0100
@@ -12,9 +12,9 @@
from cubicweb import NoSelectableObject, role
from cubicweb.selectors import partial_has_related_entities
+from cubicweb.utils import HTMLHead
from cubicweb.common.view import EntityView
from cubicweb.common.selectors import has_related_entities
-from cubicweb.common.utils import HTMLHead
from cubicweb.common.uilib import rql_for_eid
from cubicweb.web.views.basecontrollers import JSonController