Skip to content

Commit a017fb7

Browse files
author
AutomatedTester
committed
Updating Python docs
1 parent 2a51484 commit a017fb7

24 files changed

+552
-487
lines changed

docs/api/py/_modules/selenium/common/exceptions.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,12 @@ <h1>Source code for selenium.common.exceptions</h1><div class="highlight"><pre>
173173
<span class="sd"> Usually raised when when an expected modal is blocking webdriver form executing any </span>
174174
<span class="sd"> more commands.</span>
175175
<span class="sd"> &quot;&quot;&quot;</span>
176-
<span class="k">pass</span>
176+
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">msg</span><span class="o">=</span><span class="bp">None</span><span class="p">,</span> <span class="n">screen</span><span class="o">=</span><span class="bp">None</span><span class="p">,</span> <span class="n">stacktrace</span><span class="o">=</span><span class="bp">None</span><span class="p">,</span> <span class="n">alert_text</span><span class="o">=</span><span class="bp">None</span><span class="p">):</span>
177+
<span class="nb">super</span><span class="p">(</span><span class="n">WebDriverException</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="n">screen</span><span class="p">,</span> <span class="n">stacktrace</span><span class="p">)</span>
178+
<span class="bp">self</span><span class="o">.</span><span class="n">alert_text</span> <span class="o">=</span> <span class="n">alert_text</span>
179+
180+
<span class="k">def</span> <span class="nf">__str__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
181+
<span class="k">return</span> <span class="s">&quot;Alert Text: </span><span class="si">%s</span><span class="se">\n</span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">alert_text</span><span class="p">,</span> <span class="nb">str</span><span class="p">(</span><span class="nb">super</span><span class="p">(</span><span class="n">WebDriverException</span><span class="p">,</span> <span class="bp">self</span><span class="p">)))</span>
177182
</div>
178183
<div class="viewcode-block" id="NoAlertPresentException"><a class="viewcode-back" href="../../../common/selenium.common.exceptions.html#selenium.common.exceptions.NoAlertPresentException">[docs]</a><span class="k">class</span> <span class="nc">NoAlertPresentException</span><span class="p">(</span><span class="n">WebDriverException</span><span class="p">):</span>
179184
<span class="sd">&quot;&quot;&quot;</span>

docs/api/py/_modules/selenium/selenium.html

Lines changed: 412 additions & 407 deletions
Large diffs are not rendered by default.

docs/api/py/_modules/selenium/webdriver/chrome/webdriver.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ <h1>Source code for selenium.webdriver.chrome.webdriver</h1><div class="highligh
9494
<span class="sd"> - chrome_options: this takes an instance of ChromeOptions</span>
9595
<span class="sd"> &quot;&quot;&quot;</span>
9696
<span class="k">if</span> <span class="n">chrome_options</span> <span class="ow">is</span> <span class="bp">None</span><span class="p">:</span>
97-
<span class="n">options</span> <span class="o">=</span> <span class="n">Options</span><span class="p">()</span>
97+
<span class="c"># desired_capabilities stays as passed in</span>
98+
<span class="k">if</span> <span class="n">desired_capabilities</span> <span class="ow">is</span> <span class="bp">None</span><span class="p">:</span>
99+
<span class="n">desired_capabilities</span> <span class="o">=</span> <span class="n">Options</span><span class="p">()</span><span class="o">.</span><span class="n">to_capabilities</span><span class="p">()</span>
98100
<span class="k">else</span><span class="p">:</span>
99-
<span class="n">options</span> <span class="o">=</span> <span class="n">chrome_options</span>
100-
101-
<span class="k">if</span> <span class="n">desired_capabilities</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span>
102-
<span class="n">desired_capabilities</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">options</span><span class="o">.</span><span class="n">to_capabilities</span><span class="p">())</span>
103-
<span class="k">else</span><span class="p">:</span>
104-
<span class="n">desired_capabilities</span> <span class="o">=</span> <span class="n">options</span><span class="o">.</span><span class="n">to_capabilities</span><span class="p">()</span>
101+
<span class="k">if</span> <span class="n">desired_capabilities</span> <span class="ow">is</span> <span class="bp">None</span><span class="p">:</span>
102+
<span class="n">desired_capabilities</span> <span class="o">=</span> <span class="n">chrome_options</span><span class="o">.</span><span class="n">to_capabilities</span><span class="p">()</span>
103+
<span class="k">else</span><span class="p">:</span>
104+
<span class="n">desired_capabilities</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">chrome_options</span><span class="o">.</span><span class="n">to_capabilities</span><span class="p">())</span>
105105

106106
<span class="bp">self</span><span class="o">.</span><span class="n">service</span> <span class="o">=</span> <span class="n">Service</span><span class="p">(</span><span class="n">executable_path</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="n">port</span><span class="p">,</span>
107107
<span class="n">service_args</span><span class="o">=</span><span class="n">service_args</span><span class="p">,</span> <span class="n">log_path</span><span class="o">=</span><span class="n">service_log_path</span><span class="p">)</span>
@@ -114,7 +114,7 @@ <h1>Source code for selenium.webdriver.chrome.webdriver</h1><div class="highligh
114114
<span class="n">keep_alive</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>
115115
<span class="k">except</span><span class="p">:</span>
116116
<span class="bp">self</span><span class="o">.</span><span class="n">quit</span><span class="p">()</span>
117-
<span class="k">raise</span>
117+
<span class="k">raise</span>
118118
<span class="bp">self</span><span class="o">.</span><span class="n">_is_remote</span> <span class="o">=</span> <span class="bp">False</span>
119119

120120
<div class="viewcode-block" id="WebDriver.quit"><a class="viewcode-back" href="../../../../webdriver_chrome/selenium.webdriver.chrome.webdriver.html#selenium.webdriver.chrome.webdriver.WebDriver.quit">[docs]</a> <span class="k">def</span> <span class="nf">quit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>

docs/api/py/_modules/selenium/webdriver/common/utils.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ <h1>Source code for selenium.webdriver.common.utils</h1><div class="highlight"><
8989
<span class="k">try</span><span class="p">:</span>
9090
<span class="n">socket_</span> <span class="o">=</span> <span class="n">socket</span><span class="o">.</span><span class="n">socket</span><span class="p">(</span><span class="n">socket</span><span class="o">.</span><span class="n">AF_INET</span><span class="p">,</span> <span class="n">socket</span><span class="o">.</span><span class="n">SOCK_STREAM</span><span class="p">)</span>
9191
<span class="n">socket_</span><span class="o">.</span><span class="n">settimeout</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
92-
<span class="n">socket_</span><span class="o">.</span><span class="n">connect</span><span class="p">((</span><span class="s">&quot;localhost&quot;</span><span class="p">,</span> <span class="n">port</span><span class="p">))</span>
92+
<span class="n">socket_</span><span class="o">.</span><span class="n">connect</span><span class="p">((</span><span class="s">&quot;127.0.0.1&quot;</span><span class="p">,</span> <span class="n">port</span><span class="p">))</span>
9393
<span class="n">socket_</span><span class="o">.</span><span class="n">close</span><span class="p">()</span>
9494
<span class="k">return</span> <span class="bp">True</span>
9595
<span class="k">except</span> <span class="n">socket</span><span class="o">.</span><span class="n">error</span><span class="p">:</span>
@@ -109,7 +109,7 @@ <h1>Source code for selenium.webdriver.common.utils</h1><div class="highlight"><
109109
<span class="kn">import</span> <span class="nn">urllib2</span> <span class="kn">as</span> <span class="nn">url_request</span>
110110

111111
<span class="k">try</span><span class="p">:</span>
112-
<span class="n">res</span> <span class="o">=</span> <span class="n">url_request</span><span class="o">.</span><span class="n">urlopen</span><span class="p">(</span><span class="s">&quot;http://localhost:</span><span class="si">%s</span><span class="s">/status&quot;</span> <span class="o">%</span> <span class="n">port</span><span class="p">)</span>
112+
<span class="n">res</span> <span class="o">=</span> <span class="n">url_request</span><span class="o">.</span><span class="n">urlopen</span><span class="p">(</span><span class="s">&quot;http://127.0.0.1:</span><span class="si">%s</span><span class="s">/status&quot;</span> <span class="o">%</span> <span class="n">port</span><span class="p">)</span>
113113
<span class="k">if</span> <span class="n">res</span><span class="o">.</span><span class="n">getcode</span><span class="p">()</span> <span class="o">==</span> <span class="mi">200</span><span class="p">:</span>
114114
<span class="k">return</span> <span class="bp">True</span>
115115
<span class="k">else</span><span class="p">:</span>

docs/api/py/_modules/selenium/webdriver/firefox/firefox_binary.html

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ <h1>Source code for selenium.webdriver.firefox.firefox_binary</h1><div class="hi
6565

6666
<span class="kn">import</span> <span class="nn">os</span>
6767
<span class="kn">import</span> <span class="nn">platform</span>
68-
<span class="kn">from</span> <span class="nn">subprocess</span> <span class="kn">import</span> <span class="n">Popen</span><span class="p">,</span> <span class="n">PIPE</span><span class="p">,</span> <span class="n">STDOUT</span>
68+
<span class="kn">from</span> <span class="nn">subprocess</span> <span class="kn">import</span> <span class="n">Popen</span><span class="p">,</span> <span class="n">STDOUT</span>
6969
<span class="kn">from</span> <span class="nn">selenium.common.exceptions</span> <span class="kn">import</span> <span class="n">WebDriverException</span>
7070
<span class="kn">from</span> <span class="nn">selenium.webdriver.common</span> <span class="kn">import</span> <span class="n">utils</span>
7171
<span class="kn">import</span> <span class="nn">time</span>
@@ -83,13 +83,16 @@ <h1>Source code for selenium.webdriver.firefox.firefox_binary</h1><div class="hi
8383
<span class="sd"> - firefox_path - Path to the Firefox executable. By default, it will be detected from the standard locations.</span>
8484
<span class="sd"> - log_file - A file object to redirect the firefox process output to. It can be sys.stdout.</span>
8585
<span class="sd"> Please note that with parallel run the output won&#39;t be synchronous.</span>
86-
<span class="sd"> By default, it will be redirected to subprocess.PIPE.</span>
86+
<span class="sd"> By default, it will be redirected to /dev/null.</span>
8787
<span class="sd"> &quot;&quot;&quot;</span>
8888
<span class="bp">self</span><span class="o">.</span><span class="n">_start_cmd</span> <span class="o">=</span> <span class="n">firefox_path</span>
89-
<span class="bp">self</span><span class="o">.</span><span class="n">_log_file</span> <span class="o">=</span> <span class="n">log_file</span> <span class="ow">or</span> <span class="n">PIPE</span>
89+
<span class="bp">self</span><span class="o">.</span><span class="n">_log_file</span> <span class="o">=</span> <span class="n">log_file</span> <span class="ow">or</span> <span class="nb">open</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">devnull</span><span class="p">,</span> <span class="s">&quot;wb&quot;</span><span class="p">)</span>
9090
<span class="bp">self</span><span class="o">.</span><span class="n">command_line</span> <span class="o">=</span> <span class="bp">None</span>
9191
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_start_cmd</span> <span class="ow">is</span> <span class="bp">None</span><span class="p">:</span>
9292
<span class="bp">self</span><span class="o">.</span><span class="n">_start_cmd</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_get_firefox_start_cmd</span><span class="p">()</span>
93+
<span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">_start_cmd</span><span class="o">.</span><span class="n">strip</span><span class="p">():</span>
94+
<span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s">&quot;Failed to find firefox binary. You can set it by specifying the path to &#39;firefox_binary&#39;:</span><span class="se">\n\n</span><span class="s">from selenium.webdriver.firefox.firefox_binary import FirefoxBinary</span><span class="se">\n\n</span><span class="s">&quot;</span> <span class="o">+</span>
95+
<span class="s">&quot;binary = FirefoxBinary(&#39;/path/to/binary&#39;)</span><span class="se">\n</span><span class="s">driver = webdriver.Firefox(firefox_binary=binary)&quot;</span><span class="p">)</span>
9396
<span class="c"># Rather than modifying the environment of the calling Python process</span>
9497
<span class="c"># copy it and modify as needed.</span>
9598
<span class="bp">self</span><span class="o">.</span><span class="n">_firefox_env</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
@@ -158,9 +161,9 @@ <h1>Source code for selenium.webdriver.firefox.firefox_binary</h1><div class="hi
158161

159162
<span class="k">def</span> <span class="nf">_find_exe_in_registry</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
160163
<span class="k">try</span><span class="p">:</span>
161-
<span class="kn">from</span> <span class="nn">_winreg</span> <span class="kn">import</span> <span class="n">OpenKey</span><span class="p">,</span> <span class="n">QueryValue</span><span class="p">,</span> <span class="n">HKEY_LOCAL_MACHINE</span>
164+
<span class="kn">from</span> <span class="nn">_winreg</span> <span class="kn">import</span> <span class="n">OpenKey</span><span class="p">,</span> <span class="n">QueryValue</span><span class="p">,</span> <span class="n">HKEY_LOCAL_MACHINE</span><span class="p">,</span> <span class="n">HKEY_CURRENT_USER</span>
162165
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
163-
<span class="kn">from</span> <span class="nn">winreg</span> <span class="kn">import</span> <span class="n">OpenKey</span><span class="p">,</span> <span class="n">QueryValue</span><span class="p">,</span> <span class="n">HKEY_LOCAL_MACHINE</span>
166+
<span class="kn">from</span> <span class="nn">winreg</span> <span class="kn">import</span> <span class="n">OpenKey</span><span class="p">,</span> <span class="n">QueryValue</span><span class="p">,</span> <span class="n">HKEY_LOCAL_MACHINE</span><span class="p">,</span> <span class="n">HKEY_CURRENT_USER</span>
164167
<span class="kn">import</span> <span class="nn">shlex</span>
165168
<span class="n">keys</span> <span class="o">=</span> <span class="p">(</span>
166169
<span class="s">r&quot;SOFTWARE\Classes\FirefoxHTML\shell\open\command&quot;</span><span class="p">,</span>
@@ -173,7 +176,12 @@ <h1>Source code for selenium.webdriver.firefox.firefox_binary</h1><div class="hi
173176
<span class="n">command</span> <span class="o">=</span> <span class="n">QueryValue</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="s">&quot;&quot;</span><span class="p">)</span>
174177
<span class="k">break</span>
175178
<span class="k">except</span> <span class="ne">OSError</span><span class="p">:</span>
176-
<span class="k">pass</span>
179+
<span class="k">try</span><span class="p">:</span>
180+
<span class="n">key</span> <span class="o">=</span> <span class="n">OpenKey</span><span class="p">(</span><span class="n">HKEY_CURRENT_USER</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span>
181+
<span class="n">command</span> <span class="o">=</span> <span class="n">QueryValue</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="s">&quot;&quot;</span><span class="p">)</span>
182+
<span class="k">break</span>
183+
<span class="k">except</span> <span class="ne">OSError</span><span class="p">:</span>
184+
<span class="k">pass</span>
177185
<span class="k">else</span><span class="p">:</span>
178186
<span class="k">return</span> <span class="s">&quot;&quot;</span>
179187

docs/api/py/_modules/selenium/webdriver/opera/service.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ <h1>Source code for selenium.webdriver.opera.service</h1><div class="highlight">
6464
<span class="c"># See the License for the specific language governing permissions and</span>
6565
<span class="c"># limitations under the License.</span>
6666
<span class="kn">import</span> <span class="nn">subprocess</span>
67-
<span class="kn">from</span> <span class="nn">subprocess</span> <span class="kn">import</span> <span class="n">PIPE</span>
6867
<span class="kn">import</span> <span class="nn">time</span>
6968
<span class="kn">from</span> <span class="nn">selenium.common.exceptions</span> <span class="kn">import</span> <span class="n">WebDriverException</span>
7069
<span class="kn">from</span> <span class="nn">selenium.webdriver.common</span> <span class="kn">import</span> <span class="n">utils</span>

docs/api/py/_modules/selenium/webdriver/remote/command.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h1>Source code for selenium.webdriver.remote.command</h1><div class="highlight"
6969
<span class="sd"> While these constants have no meaning in and of themselves, they are</span>
7070
<span class="sd"> used to marshal commands through a service that implements WebDriver&#39;s</span>
7171
<span class="sd"> remote wire protocol:</span>
72-
<span class="sd"> </span>
72+
7373
<span class="sd"> http://code.google.com/p/selenium/wiki/JsonWireProtocol</span>
7474
<span class="sd"> &quot;&quot;&quot;</span>
7575

@@ -124,6 +124,7 @@ <h1>Source code for selenium.webdriver.remote.command</h1><div class="highlight"
124124
<span class="n">GET_ELEMENT_LOCATION</span> <span class="o">=</span> <span class="s">&quot;getElementLocation&quot;</span>
125125
<span class="n">GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW</span> <span class="o">=</span> <span class="s">&quot;getElementLocationOnceScrolledIntoView&quot;</span>
126126
<span class="n">GET_ELEMENT_SIZE</span> <span class="o">=</span> <span class="s">&quot;getElementSize&quot;</span>
127+
<span class="n">GET_ELEMENT_RECT</span> <span class="o">=</span> <span class="s">&quot;getElementRect&quot;</span>
127128
<span class="n">GET_ELEMENT_ATTRIBUTE</span> <span class="o">=</span> <span class="s">&quot;getElementAttribute&quot;</span>
128129
<span class="n">GET_ELEMENT_VALUE_OF_CSS_PROPERTY</span> <span class="o">=</span> <span class="s">&quot;getElementValueOfCssProperty&quot;</span>
129130
<span class="n">ELEMENT_EQUALS</span> <span class="o">=</span> <span class="s">&quot;elementEquals&quot;</span>

0 commit comments

Comments
 (0)