Reflect on ad changesclient.merged

3 files changed, 9 insertions, 8 deletions

diff --git a/local_document/bus.py b/local_document/bus.py
index a4dff6b..f1524e4 100644
--- a/local_document/bus.py
+++ b/local_document/bus.py
@@ -20,9 +20,9 @@ import logging
 from os.path import exists
 from gettext import gettext as _
 
+import active_document as ad
 from local_document import ipc, env, sugar
 from local_document.mounts import Offline
-from active_document import Request, Response
 from active_toolkit import util, coroutine, sockets
 
 
@@ -66,9 +66,9 @@ class Server(object):
             if message is None:
                 break
             try:
-                request = Request(message)
+                request = ad.Request(message)
                 request.principal = self._principal
-                request.access_level = Request.ACCESS_LOCAL
+                request.access_level = ad.ACCESS_LOCAL
 
                 request_repr = str(request)
 
@@ -84,7 +84,7 @@ class Server(object):
                     self.publish(request.content)
                     result = None
                 else:
-                    response = Response()
+                    response = ad.Response()
                     result = self._mounts.call(request, response)
 
             except Exception, error:
diff --git a/local_document/mounts.py b/local_document/mounts.py
index 9934a1d..e084723 100644
--- a/local_document/mounts.py
+++ b/local_document/mounts.py
@@ -182,7 +182,7 @@ class _LocalMount(ad.ProxyCommands, _Mount):
                 util.exception(_logger, _('Failed to read %r spec file'), path)
                 continue
 
-            if request.access_level == ad.Request.ACCESS_LOCAL:
+            if request.access_level == ad.ACCESS_LOCAL:
                 impl_id = spec.root
             else:
                 impl_id = activities.path_to_guid(spec.root)
diff --git a/sugar_network/bus.py b/sugar_network/bus.py
index 944de5f..c1bf54b 100644
--- a/sugar_network/bus.py
+++ b/sugar_network/bus.py
@@ -19,7 +19,7 @@ import logging
 from contextlib import contextmanager
 from gettext import gettext as _
 
-from active_document import Request as _Request
+import active_document as ad
 from local_document import ipc, env, sugar
 from active_toolkit import util, coroutine, sockets
 
@@ -56,7 +56,8 @@ class Request(dict):
 
     def call(self, method, cmd=None, content=None, content_type=None,
             **kwargs):
-        request = _Request(kwargs)
+        request = ad.Request(kwargs)
+        request.access_level = ad.ACCESS_LOCAL
         request.principal = self.principal
         request.update(self)
         request['method'] = method
@@ -111,7 +112,7 @@ class _Client(object):
             del self._subscriptions[callback]
 
     def publish(self, event):
-        request = _Request()
+        request = ad.Request()
         request['cmd'] = 'publish'
         request.content = event
         request.content_type = 'application/json'