[FIX] pad, share, wiki: update import to openobject.rpc instead of openerp.utils...

Also removed a few unused imports

bzr revid: xmo@openerp.com-20110210161042-aq414sd3i4p6abka

diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index c7f3790..9ed790c 100644 (file)
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Enhanced support for (Ether)Pad attachments',
-    'version': '1.0.2',
+    'version': '1.0.3',
     'category': 'Generic Modules/Others',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client, lets the

diff --git a/addons/pad/web/controllers.py b/addons/pad/web/controllers.py
index 3eae97c..082ab69 100644 (file)
--- a/addons/pad/web/controllers.py
+++ b/addons/pad/web/controllers.py
@@ -2,10 +2,11 @@ import urlparse
 
 import cherrypy
 
+from openobject import rpc
 from openobject.tools import expose
 
 import openerp.controllers
-from openerp.utils import rpc, TinyDict
+from openerp.utils import TinyDict
 
 class Piratepad(openerp.controllers.SecuredController):
     _cp_path = "/piratepad"

diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index ff380c2..7a68936 100644 (file)
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     "name" : "Sharing Tools",
-    "version" : "1.2",
+    "version" : "1.3",
     "depends" : ["base"],
     "author" : "OpenERP SA",
     "category": 'Generic Modules',

diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index 0859c37..13812e4 100644 (file)
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -1,11 +1,10 @@
 import urlparse
+import cherrypy
 
+from openobject import rpc
 from openobject.tools import expose, ast
-from openerp.controllers import actions
-from openerp.utils import rpc
 
 import openerp.controllers
-import cherrypy
 
 
 
@@ -42,6 +41,6 @@ class ShareWizardController(openerp.controllers.SecuredController):
             'domain': str(domain),
             'action_id':action_id
         }, context)
-        return actions.execute(
+        return openerp.controllers.actions.execute(
             Share.go_step_1([sharing_view_id], context),
             ids=[sharing_view_id], context=context)

diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 5fb7b86..7402645 100644 (file)
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'Document Management - Wiki',
-    'version': '1.0',
+    'version': '1.0.1',
     'category': 'Generic Modules/Others',
     'description': """
 The base module to manage documents(wiki)

diff --git a/addons/wiki/web/controllers/wiki.py b/addons/wiki/web/controllers/wiki.py
index a409523..f4b0527 100644 (file)
--- a/addons/wiki/web/controllers/wiki.py
+++ b/addons/wiki/web/controllers/wiki.py
@@ -26,15 +26,13 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import base64
 
 import cherrypy
 
+import openobject
 from openobject.tools import expose
 
-from openerp.utils import rpc
-
 from openerp.controllers import SecuredController
 
 
@@ -42,7 +40,7 @@ class WikiView(SecuredController):
     _cp_path = "/wiki/wiki"
 
     def get_attachment(self, **kwargs):
-        attachments = rpc.RPCProxy('ir.attachment')
+        attachments = openobject.rpc.RPCProxy('ir.attachment')
         file_name = kwargs.get('file').replace("'", '').strip()
         id = kwargs.get('id').strip()
 

diff --git a/addons/wiki/web/widgets/wiki.py b/addons/wiki/web/widgets/wiki.py
index 61a81ca..0f7240f 100644 (file)
--- a/addons/wiki/web/widgets/wiki.py
+++ b/addons/wiki/web/widgets/wiki.py
@@ -28,19 +28,13 @@
 ###############################################################################
 
 import re
-import random
-import locale
-
-from base64 import b64encode
-from base64 import b64decode
-from StringIO import StringIO
 
 import cherrypy
 import wikimarkup
 
-from openobject.widgets import JSLink, CSSLink
+from openobject import rpc
+from openobject.widgets import CSSLink
 
-from openerp.utils import rpc
 
 from openerp.widgets import register_widget
 from openerp.widgets.form import Text