From 15cd83bcf5ab9b7fc2308823cf906979a84ae247 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 21 Jan 2015 16:11:42 +0100
Subject: [PATCH] Backed out changeset 805dce7ae79f (bug 1107336)

---
 testing/marionette/client/marionette/b2g_update_test.py       | 4 ++--
 .../client/marionette/tests/unit/test_element_touch.py        | 2 +-
 .../marionette/client/marionette/tests/unit/test_emulator.py  | 3 +--
 .../client/marionette/tests/unit/test_switch_frame_chrome.py  | 4 ++--
 testing/marionette/driver/marionette_driver/__init__.py       | 3 +--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/testing/marionette/client/marionette/b2g_update_test.py b/testing/marionette/client/marionette/b2g_update_test.py
index 5c832922e469..ea1c4d2b04e7 100644
--- a/testing/marionette/client/marionette/b2g_update_test.py
+++ b/testing/marionette/client/marionette/b2g_update_test.py
@@ -12,8 +12,8 @@ import types
 import weakref
 
 from b2ginstance import B2GInstance
-from marionette_driver.errors import InvalidResponseException
-from marionette_driver.marionette import Marionette
+from errors import InvalidResponseException
+from marionette import Marionette
 from marionette_test import MarionetteTestCase
 from marionette_transport import MarionetteTransport
 from runtests import MarionetteTestRunner, cli
diff --git a/testing/marionette/client/marionette/tests/unit/test_element_touch.py b/testing/marionette/client/marionette/tests/unit/test_element_touch.py
index 539782ace7e1..7b9f047a9576 100644
--- a/testing/marionette/client/marionette/tests/unit/test_element_touch.py
+++ b/testing/marionette/client/marionette/tests/unit/test_element_touch.py
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette_driver.errors import MarionetteException
+from errors import MarionetteException
 
 class testElementTouch(MarionetteTestCase):
     def test_touch(self):
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator.py b/testing/marionette/client/marionette/tests/unit/test_emulator.py
index e69d996d27b0..f330d983dba7 100644
--- a/testing/marionette/client/marionette/tests/unit/test_emulator.py
+++ b/testing/marionette/client/marionette/tests/unit/test_emulator.py
@@ -3,8 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette_driver.errors import (JavascriptException,
-                                      MarionetteException)
+from errors import JavascriptException, MarionetteException
 
 
 class TestEmulatorContent(MarionetteTestCase):
diff --git a/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py b/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
index 992007d1c208..5e476231ef83 100644
--- a/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
+++ b/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette_driver.errors import JavascriptException
-from marionette_driver.by import By
+from errors import JavascriptException
+from by import By
 
 class TestSwitchFrameChrome(MarionetteTestCase):
     def setUp(self):
diff --git a/testing/marionette/driver/marionette_driver/__init__.py b/testing/marionette/driver/marionette_driver/__init__.py
index 0c82dcdad253..aff2e13acace 100644
--- a/testing/marionette/driver/marionette_driver/__init__.py
+++ b/testing/marionette/driver/marionette_driver/__init__.py
@@ -1,4 +1,3 @@
 from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
                                 gestures, keys, marionette, selection, wait,
-                                application_cache, date_time_value )
-from marionette_driver.gestures import smooth_scroll, pinch
\ No newline at end of file
+                                application_cache, date_time_value )
\ No newline at end of file