Update DesiredCapabilities doc comments to use .copy() in the examples.

clean up mix if tab and space characters.
Issue 6486

Signed-off-by: Luke Inman-Semerau <luke.semerau@gmail.com>

Author: David Lai

py/selenium/webdriver/common/desired_capabilities.py

@@ -19,10 +19,10 @@
 
 class DesiredCapabilities(object):
     """
-    Set of supported desired capabilities.
-    
+    Set of default supported desired capabilities.
+
     Use this as a starting point for creating a desired capabilities object for 
-    requesting remote webdrivers from selenium server or selenium grid.
+    requesting remote webdrivers for connecting to selenium server or selenium grid.
 
 
     Usage Example:
@@ -32,14 +32,16 @@ class DesiredCapabilities(object):
         selenium_grid_url = "http://198.0.0.1:4444/wd/hub"
 
         # Create a desired capabilities object as a starting point.
-        capabilities = DesiredCapabilities.FIREFOX 
+        capabilities = DesiredCapabilities.FIREFOX.copy()
         capabilities['platform'] = "WINDOWS"
         capabilities['version'] = "10"
 
         # Instantiate an instance of Remote WebDriver with the desired capabilities.
         driver = webdriver.Remote(desired_capabilities=capabilities, 
-                                  command_executor=selenium_grid_url) 
+                                  command_executor=selenium_grid_url)
 
+    Note: Always use '.copy()' on the DesiredCapabilities object to avoid the side
+    effects of altering the Global class instance.
 
     """
 
@@ -111,7 +113,7 @@ class DesiredCapabilities(object):
         "platform": "ANDROID",
         "javascriptEnabled": True,
     }
-    
+
     PHANTOMJS = {
         "browserName":"phantomjs",
         "version": "",

py/selenium/webdriver/firefox/extension_connection.py

@@ -57,7 +57,8 @@ def quit(self, sessionId=None):
 
     def connect(self):
         """Connects to the extension and retrieves the session id."""
-        return self.execute(Command.NEW_SESSION, {'desiredCapabilities': DesiredCapabilities.FIREFOX})
+        return self.execute(Command.NEW_SESSION,
+                            {'desiredCapabilities': DesiredCapabilities.FIREFOX})
 
     @classmethod
     def connect_and_quit(self):

py/selenium/webdriver/support/wait.py

@@ -19,13 +19,13 @@
 from selenium.common.exceptions import TimeoutException
 
 POLL_FREQUENCY = 0.5  # How long to sleep inbetween calls to the method
-IGNORED_EXCEPTIONS = [NoSuchElementException] # list of exceptions ignored during calls to the method
+IGNORED_EXCEPTIONS = [NoSuchElementException]  # list of exceptions ignored during calls to the method
 
 class WebDriverWait(object):
 
     def __init__(self, driver, timeout, poll_frequency=POLL_FREQUENCY, ignored_exceptions=None):
         """Constructor, takes a WebDriver instance and timeout in seconds.
-           
+
            :Args:
             - driver - Instance of WebDriver (Ie, Firefox, Chrome or Remote)
             - timeout - Number of seconds before timing out
@@ -50,7 +50,7 @@ def __init__(self, driver, timeout, poll_frequency=POLL_FREQUENCY, ignored_excep
         if ignored_exceptions is not None:
             try:
                 exceptions.extend(iter(ignored_exceptions))
-            except TypeError: # ignored_exceptions is not iterable
+            except TypeError:  # ignored_exceptions is not iterable
                 exceptions.append(ignored_exceptions)
         self._ignored_exceptions = tuple(exceptions)
 
@@ -71,17 +71,17 @@ def until(self, method, message=''):
         raise TimeoutException(message)
 
     def until_not(self, method, message=''):
-          """Calls the method provided with the driver as an argument until the \
-          return value is False."""
-          end_time = time.time() + self._timeout
-          while(True):
-              try:
-                  value = method(self._driver)
-                  if not value:
-                      return value
-              except self._ignored_exceptions:
-                  return True
-              time.sleep(self._poll)
-              if(time.time() > end_time):
-                  break
-          raise TimeoutException(message)
+        """Calls the method provided with the driver as an argument until the \
+        return value is False."""
+        end_time = time.time() + self._timeout
+        while(True):
+            try:
+                value = method(self._driver)
+                if not value:
+                    return value
+            except self._ignored_exceptions:
+                return True
+            time.sleep(self._poll)
+            if(time.time() > end_time):
+                break
+        raise TimeoutException(message)