missed a couple of things resolving conflicts in the last merge

mozilla · Apr 27, 2011 · b665c3f · b665c3f
1 parent dfff2ba
commit b665c3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/linkdrop/controllers/contacts.py b/linkdrop/controllers/contacts.py
@@ -100,7 +100,7 @@ def get(self, request):
         headers = get_passthrough_headers(request)
         page_data = page_data and json.loads(page_data) or {}
         try:
-            services = get_services(self.app_config)
+            services = get_services(self.app.config)
             result, error = services.getcontacts(domain, acct, page_data,
                                                  headers)
         except DomainNotRegisteredError:

diff --git a/linkdrop/tests/services/test_playback.py b/linkdrop/tests/services/test_playback.py
@@ -272,14 +272,15 @@ def checkResponse(self, canned, response):
     def getResponse(self, req_type, request, headers=None):
         url = URLGenerator(self.app.mapper, dict(HTTP_HOST='localhost'))
         if req_type == "send":
-            response = self.app.post(url(controller='send', action='send'),
-                                     params=request, headers=headers)
+            response = self.test_app.post(url(controller='send',
+                                              action='send'),
+                                          params=request, headers=headers)
         elif req_type == "contacts":
             # send the 'contacts' request.
             domain = request.pop('domain')
-            response = self.app.post(url(controller='contacts',
-                                         action='get', domain=domain),
-                                     params=request, headers=headers)
+            response = self.test_app.post(url(controller='contacts',
+                                              action='get', domain=domain),
+                                          params=request, headers=headers)
         elif req_type == "auth":
             # this is a little gross - we need to hit "authorize"
             # direct, then assume we got redirected to the service,