Remove dependency on enum

imurchie · imurchie · commit b701c04a1b7f · 2015-10-07T09:23:44.000-07:00
diff --git a/appium/webdriver/connectiontype.py b/appium/webdriver/connectiontype.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from enum import Enum
-
 
 """
 Connection types are specified here:
@@ -26,7 +24,7 @@
     4 (Data only)      | 1    | 0    | 0
     6 (All network on) | 1    | 1    | 0
 """
-class ConnectionType(Enum):
+class ConnectionType(object):
     NO_CONNECTION = 0
     AIRPLANE_MODE = 1
     WIFI_ONLY = 2
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -14,7 +14,6 @@
 
 from selenium import webdriver
 
-from .connectiontype import ConnectionType
 from .mobilecommand import MobileCommand as Command
 from .errorhandler import MobileErrorHandler
 from .switch_to import MobileSwitchTo
@@ -638,7 +637,7 @@ def set_network_connection(self, connectionType):
         """
         data = {
             'parameters': {
-                'type': connectionType.value
+                'type': connectionType
             }
         }
         return self.execute(Command.SET_NETWORK_CONNECTION, data)['value']
diff --git a/setup.py b/setup.py
@@ -50,5 +50,5 @@
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing'
     ],
-    install_requires=['selenium>=2.41.0', 'enum34']
+    install_requires=['selenium>=2.47.0']
 )
diff --git a/test/functional/android/network_connection_tests.py b/test/functional/android/network_connection_tests.py
@@ -41,7 +41,7 @@ def test_get_network_connection(self):
     def test_set_network_connection(self):
         nc = self.driver.set_network_connection(ConnectionType.DATA_ONLY)
         self.assertIsInstance(nc, int)
-        self.assertEqual(nc, ConnectionType.DATA_ONLY.value)
+        self.assertEqual(nc, ConnectionType.DATA_ONLY)
 
 
 if __name__ == "__main__":

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`
`15`	`15`	`from selenium import webdriver`
`16`	`16`
`17`		`-from .connectiontype import ConnectionType`
`18`	`17`	`from .mobilecommand import MobileCommand as Command`
`19`	`18`	`from .errorhandler import MobileErrorHandler`
`20`	`19`	`from .switch_to import MobileSwitchTo`
`@@ -638,7 +637,7 @@ def set_network_connection(self, connectionType):`
`638`	`637`	`"""`
`639`	`638`	`data = {`
`640`	`639`	`'parameters': {`
`641`		`- 'type': connectionType.value`
	`640`	`+ 'type': connectionType`
`642`	`641`	`}`
`643`	`642`	`}`
`644`	`643`	`return self.execute(Command.SET_NETWORK_CONNECTION, data)['value']`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,5 @@`
`50`	`50`	`'Topic :: Software Development :: Quality Assurance',`
`51`	`51`	`'Topic :: Software Development :: Testing'`
`52`	`52`	`],`
`53`		`- install_requires=['selenium>=2.41.0', 'enum34']`
	`53`	`+ install_requires=['selenium>=2.47.0']`
`54`	`54`	`)`