Bug 717408 - Remove unneeded clause in python exception handling that was causing errors on python 2.5. r=geoffbrown
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 12 Jan 2012 13:09:04 -0500
changeset 85582 37b69f47d522c61a43e9ac8c6ddc9022440e981d
parent 85581 aa62396ae6bdd594211e3acab8efa6cc02ee7b34
child 85583 2c1f1e307171886bf7b93074ef4dfaaf9aedbf09
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgeoffbrown
bugs717408
milestone12.0a1
Bug 717408 - Remove unneeded clause in python exception handling that was causing errors on python 2.5. r=geoffbrown
build/mobile/devicemanagerADB.py
testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
--- a/build/mobile/devicemanagerADB.py
+++ b/build/mobile/devicemanagerADB.py
@@ -573,17 +573,17 @@ class DeviceManagerADB(DeviceManager):
     else:
       self.checkCmdAs(["shell", "chmod", "777", remoteDir.strip()])
       print "chmod " + remoteDir.strip()
 
   def verifyADB(self):
     # Check to see if adb itself can be executed.
     try:
       self.runCmd(["version"])
-    except Exception as (ex):
+    except:
       print "unable to execute ADB: ensure Android SDK is installed and adb is in your $PATH"
     
   def isCpAvailable(self):
     # Some Android systems may not have a cp command installed,
     # or it may not be executable by the user. 
     data = self.runCmd(["shell", "cp"]).stdout.read()
     if (re.search('Usage', data)):
       return True
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -566,17 +566,17 @@ class DeviceManagerADB(DeviceManager):
     else:
       self.checkCmdAs(["shell", "chmod", "777", remoteDir.strip()])
       print "chmod " + remoteDir.strip()
 
   def verifyADB(self):
     # Check to see if adb itself can be executed.
     try:
       self.runCmd(["version"])
-    except Exception as (ex):
+    except:
       print "unable to execute ADB: ensure Android SDK is installed and adb is in your $PATH"
     
   def isCpAvailable(self):
     # Some Android systems may not have a cp command installed,
     # or it may not be executable by the user. 
     data = self.runCmd(["shell", "cp"]).stdout.read()
     if (re.search('Usage', data)):
       return True