Mercurial Repositories > eric / changeset
changeset
Fixed some code style issues and regenerated the source docu.
Tue, 04 Aug 2015 19:13:28 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 04 Aug 2015 19:13:28 +0200
- changeset 4352
- 86f7a3344d38
- parent 4351
- ace015b19c0f
- child 4353
- cff7e27fb7b8
Fixed some code style issues and regenerated the source docu.
--- a/APIs/Python3/eric6.api Tue Aug 04 19:09:37 2015 +0200 +++ b/APIs/Python3/eric6.api Tue Aug 04 19:13:28 2015 +0200 @@ -1667,6 +1667,10 @@ eric6.E5Network.E5NetworkMonitor.E5RequestModel?1(networkAccessManager, parent=None) eric6.E5Network.E5NetworkProxyFactory.E5NetworkProxyFactory.queryProxy?4(query) eric6.E5Network.E5NetworkProxyFactory.E5NetworkProxyFactory?1() +eric6.E5Network.E5NetworkProxyFactory.HostnameMatcher.match?4(host) +eric6.E5Network.E5NetworkProxyFactory.HostnameMatcher.pattern?4() +eric6.E5Network.E5NetworkProxyFactory.HostnameMatcher.setPattern?4(pattern) +eric6.E5Network.E5NetworkProxyFactory.HostnameMatcher?1(pattern) eric6.E5Network.E5NetworkProxyFactory.proxyAuthenticationRequired?4(proxy, auth) eric6.E5Network.E5NetworkProxyFactory.schemeFromProxyType?4(proxyType) eric6.E5Network.E5RFC6266.Charset.grammar?7
--- a/Documentation/Help/source.qhp Tue Aug 04 19:09:37 2015 +0200 +++ b/Documentation/Help/source.qhp Tue Aug 04 19:13:28 2015 +0200 @@ -3825,6 +3825,7 @@ <keyword name="E5NetworkProxyFactory" id="E5NetworkProxyFactory" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory" /> <keyword name="E5NetworkProxyFactory (Constructor)" id="E5NetworkProxyFactory (Constructor)" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory.__init__" /> <keyword name="E5NetworkProxyFactory (Module)" id="E5NetworkProxyFactory (Module)" ref="eric6.E5Network.E5NetworkProxyFactory.html" /> + <keyword name="E5NetworkProxyFactory.__setExceptions" id="E5NetworkProxyFactory.__setExceptions" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory.__setExceptions" /> <keyword name="E5NetworkProxyFactory.queryProxy" id="E5NetworkProxyFactory.queryProxy" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory.queryProxy" /> <keyword name="E5NetworkRequest" id="E5NetworkRequest" ref="eric6.E5Network.E5NetworkMonitor.html#E5NetworkRequest" /> <keyword name="E5NetworkRequest (Constructor)" id="E5NetworkRequest (Constructor)" ref="eric6.E5Network.E5NetworkMonitor.html#E5NetworkRequest.__init__" /> @@ -6876,6 +6877,11 @@ <keyword name="HistoryTreeModel.removeRows" id="HistoryTreeModel.removeRows" ref="eric6.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.removeRows" /> <keyword name="HistoryTreeModel.rowCount" id="HistoryTreeModel.rowCount" ref="eric6.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.rowCount" /> <keyword name="HistoryTreeModel.setSourceModel" id="HistoryTreeModel.setSourceModel" ref="eric6.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.setSourceModel" /> + <keyword name="HostnameMatcher" id="HostnameMatcher" ref="eric6.E5Network.E5NetworkProxyFactory.html#HostnameMatcher" /> + <keyword name="HostnameMatcher (Constructor)" id="HostnameMatcher (Constructor)" ref="eric6.E5Network.E5NetworkProxyFactory.html#HostnameMatcher.__init__" /> + <keyword name="HostnameMatcher.match" id="HostnameMatcher.match" ref="eric6.E5Network.E5NetworkProxyFactory.html#HostnameMatcher.match" /> + <keyword name="HostnameMatcher.pattern" id="HostnameMatcher.pattern" ref="eric6.E5Network.E5NetworkProxyFactory.html#HostnameMatcher.pattern" /> + <keyword name="HostnameMatcher.setPattern" id="HostnameMatcher.setPattern" ref="eric6.E5Network.E5NetworkProxyFactory.html#HostnameMatcher.setPattern" /> <keyword name="HtmlImporter" id="HtmlImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter" /> <keyword name="HtmlImporter (Constructor)" id="HtmlImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.__init__" /> <keyword name="HtmlImporter (Module)" id="HtmlImporter (Module)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html" />
--- a/Documentation/Source/eric6.E5Network.E5NetworkProxyFactory.html Tue Aug 04 19:09:37 2015 +0200 +++ b/Documentation/Source/eric6.E5Network.E5NetworkProxyFactory.html Tue Aug 04 19:13:28 2015 +0200 @@ -32,6 +32,9 @@ <tr> <td><a href="#E5NetworkProxyFactory">E5NetworkProxyFactory</a></td> <td>Class implementing a network proxy factory.</td> +</tr><tr> +<td><a href="#HostnameMatcher">HostnameMatcher</a></td> +<td>Class implementing a matcher for host names.</td> </tr> </table> <h3>Functions</h3> @@ -66,6 +69,9 @@ <td><a href="#E5NetworkProxyFactory.__init__">E5NetworkProxyFactory</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#E5NetworkProxyFactory.__setExceptions">__setExceptions</a></td> +<td>Private method to set the host name exceptions.</td> +</tr><tr> <td><a href="#E5NetworkProxyFactory.queryProxy">queryProxy</a></td> <td>Public method to determine a proxy for a given query.</td> </tr> @@ -79,7 +85,17 @@ <b>E5NetworkProxyFactory</b>(<i></i>) <p> Constructor -</p><a NAME="E5NetworkProxyFactory.queryProxy" ID="E5NetworkProxyFactory.queryProxy"></a> +</p><a NAME="E5NetworkProxyFactory.__setExceptions" ID="E5NetworkProxyFactory.__setExceptions"></a> +<h4>E5NetworkProxyFactory.__setExceptions</h4> +<b>__setExceptions</b>(<i>exceptions</i>) +<p> + Private method to set the host name exceptions. +</p><dl> +<dt><i>exceptions</i> (str)</dt> +<dd> +list of exceptions separated by ',' +</dd> +</dl><a NAME="E5NetworkProxyFactory.queryProxy" ID="E5NetworkProxyFactory.queryProxy"></a> <h4>E5NetworkProxyFactory.queryProxy</h4> <b>queryProxy</b>(<i>query</i>) <p> @@ -97,6 +113,99 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="HostnameMatcher" ID="HostnameMatcher"></a> +<h2>HostnameMatcher</h2> +<p> + Class implementing a matcher for host names. +</p> +<h3>Derived from</h3> +object +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HostnameMatcher.__init__">HostnameMatcher</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HostnameMatcher.match">match</a></td> +<td>Public method to test the given string.</td> +</tr><tr> +<td><a href="#HostnameMatcher.pattern">pattern</a></td> +<td>Public method to get the match pattern.</td> +</tr><tr> +<td><a href="#HostnameMatcher.setPattern">setPattern</a></td> +<td>Public method to set the match pattern.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HostnameMatcher.__init__" ID="HostnameMatcher.__init__"></a> +<h4>HostnameMatcher (Constructor)</h4> +<b>HostnameMatcher</b>(<i>pattern</i>) +<p> + Constructor +</p><dl> +<dt><i>pattern</i> (str)</dt> +<dd> +pattern to be matched against +</dd> +</dl><a NAME="HostnameMatcher.match" ID="HostnameMatcher.match"></a> +<h4>HostnameMatcher.match</h4> +<b>match</b>(<i>host</i>) +<p> + Public method to test the given string. +</p><dl> +<dt><i>host</i> (str)</dt> +<dd> +host name to be matched +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a successful match +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HostnameMatcher.pattern" ID="HostnameMatcher.pattern"></a> +<h4>HostnameMatcher.pattern</h4> +<b>pattern</b>(<i></i>) +<p> + Public method to get the match pattern. +</p><dl> +<dt>Returns:</dt> +<dd> +match pattern +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HostnameMatcher.setPattern" ID="HostnameMatcher.setPattern"></a> +<h4>HostnameMatcher.setPattern</h4> +<b>setPattern</b>(<i>pattern</i>) +<p> + Public method to set the match pattern. +</p><dl> +<dt><i>pattern</i></dt> +<dd> +pattern to be matched against +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="proxyAuthenticationRequired" ID="proxyAuthenticationRequired"></a> <h2>proxyAuthenticationRequired</h2> <b>proxyAuthenticationRequired</b>(<i>proxy, auth</i>)
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 04 19:09:37 2015 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 04 19:13:28 2015 +0200 @@ -126,7 +126,7 @@ # Check for required subscription self.__requiresLocation = QUrl.fromPercentEncoding( QByteArray(urlQuery.queryItemValue( - "requiresLocation").encode())) + "requiresLocation").encode())) self.__requiresTitle = QUrl.fromPercentEncoding( QByteArray(urlQuery.queryItemValue("requiresTitle").encode())) if self.__requiresLocation and self.__requiresTitle:
--- a/Helpviewer/HelpBrowserWV.py Tue Aug 04 19:09:37 2015 +0200 +++ b/Helpviewer/HelpBrowserWV.py Tue Aug 04 19:13:28 2015 +0200 @@ -323,8 +323,8 @@ QDesktopServices.openUrl(url) return True elif info.domain == QWebPage.QtNetwork and \ - info.error == QNetworkReply.ContentAccessDenied and \ - info.errorString.startswith("AdBlockRule:"): + info.error == QNetworkReply.ContentAccessDenied and \ + info.errorString.startswith("AdBlockRule:"): if info.frame != info.frame.page().mainFrame(): # content in <iframe> docElement = info.frame.page().mainFrame()\
--- a/Helpviewer/HelpInspector.py Tue Aug 04 19:09:37 2015 +0200 +++ b/Helpviewer/HelpInspector.py Tue Aug 04 19:13:28 2015 +0200 @@ -14,6 +14,7 @@ import Preferences + class HelpInspector(QWebInspector): """ Class implementing a QWebInspector wrapper to save and restore the @@ -36,7 +37,6 @@ @param evt event object @type QCloseEvent """ - Preferences.setGeometry("HelpInspectorGeometry", self.saveGeometry()) super().closeEvent(evt)
