Backed out changeset 805dce7ae79f (bug 1107336)

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

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):

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):

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):

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
+                                application_cache, date_time_value )