Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Thu Jul 29 19:39:19 2021 +0200
+++ b/eric6/APIs/Python3/eric6.api	Thu Jul 29 19:43:01 2021 +0200
@@ -3718,6 +3718,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse._Unparser.write_item?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse._Unparser.write_key_value_pair?4(v)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse._Unparser?2(*, _avoid_backslashes=False)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.nullcontext?1(enter_result=None)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.unparse?4(ast_obj)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.translations._simplifyMessages?8
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.translations._simplifyMessagesSampleArgs?8
@@ -8686,6 +8687,7 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.replaceTarget?4(replaceStr)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.scrollVertical?4(lines)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.selectionIsRectangle?4()
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setAutoCompletionWidgetSize?4(chars, lines)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setCaretLineAlwaysVisible?4(alwaysVisible)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setContractedFolds?4(folds)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setCurrentIndicator?4(indicator)

--- a/eric6/APIs/Python3/eric6.bas	Thu Jul 29 19:39:19 2021 +0200
+++ b/eric6/APIs/Python3/eric6.bas	Thu Jul 29 19:43:01 2021 +0200
@@ -1073,3 +1073,4 @@
 ZoomValuesModel QAbstractTableModel
 _Precedence IntEnum
 _Unparser ast.NodeVisitor
+nullcontext AbstractContextManager

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Thu Jul 29 19:39:19 2021 +0200
+++ b/eric6/Documentation/Help/source.qhp	Thu Jul 29 19:43:01 2021 +0200
@@ -12468,6 +12468,7 @@
       <keyword name="QsciScintillaCompat.replaceTarget" id="QsciScintillaCompat.replaceTarget" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.replaceTarget" />
       <keyword name="QsciScintillaCompat.scrollVertical" id="QsciScintillaCompat.scrollVertical" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.scrollVertical" />
       <keyword name="QsciScintillaCompat.selectionIsRectangle" id="QsciScintillaCompat.selectionIsRectangle" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.selectionIsRectangle" />
+      <keyword name="QsciScintillaCompat.setAutoCompletionWidgetSize" id="QsciScintillaCompat.setAutoCompletionWidgetSize" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setAutoCompletionWidgetSize" />
       <keyword name="QsciScintillaCompat.setCaretLineAlwaysVisible" id="QsciScintillaCompat.setCaretLineAlwaysVisible" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setCaretLineAlwaysVisible" />
       <keyword name="QsciScintillaCompat.setContractedFolds" id="QsciScintillaCompat.setContractedFolds" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setContractedFolds" />
       <keyword name="QsciScintillaCompat.setCurrentIndicator" id="QsciScintillaCompat.setCurrentIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setCurrentIndicator" />
@@ -18319,6 +18320,10 @@
       <keyword name="normcaseabspath" id="normcaseabspath" ref="eric6.Utilities.__init__.html#normcaseabspath" />
       <keyword name="normcasepath" id="normcasepath" ref="eric6.Utilities.__init__.html#normcasepath" />
       <keyword name="normjoinpath" id="normjoinpath" ref="eric6.Utilities.__init__.html#normjoinpath" />
+      <keyword name="nullcontext" id="nullcontext" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html#nullcontext" />
+      <keyword name="nullcontext (Constructor)" id="nullcontext (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html#nullcontext.__init__" />
+      <keyword name="nullcontext.__enter__" id="nullcontext.__enter__" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html#nullcontext.__enter__" />
+      <keyword name="nullcontext.__exit__" id="nullcontext.__exit__" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html#nullcontext.__exit__" />
       <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi5.html#objectName" />
       <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi6.html#objectName" />
       <keyword name="okToClearData" id="okToClearData" ref="eric6.E5Gui.E5MessageBox.html#okToClearData" />

--- a/eric6/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html	Thu Jul 29 19:39:19 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.Simplify.ast_unparse.html	Thu Jul 29 19:43:01 2021 +0200
@@ -39,6 +39,10 @@
 <td><a href="#_Unparser">_Unparser</a></td>
 <td>Methods in this class recursively traverse an AST and output source code for the abstract syntax; original formatting is disregarded.</td>
 </tr>
+<tr>
+<td><a href="#nullcontext">nullcontext</a></td>
+<td>Context manager that does no additional processing.</td>
+</tr>
 </table>
 <h3>Functions</h3>
 
@@ -934,6 +938,71 @@
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 <hr />
+<a NAME="nullcontext" ID="nullcontext"></a>
+<h2>nullcontext</h2>
+
+<p>
+Context manager that does no additional processing.
+</p>
+<p>
+        Used as a stand-in for a normal context manager, when a particular
+        block of code is only sometimes used with a normal context manager:
+</p>
+<p>
+        cm = optional_cm if condition else nullcontext()
+        with cm:
+            # Perform operation, using optional_cm if condition is True
+</p>
+<h3>Derived from</h3>
+AbstractContextManager
+<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="#nullcontext.__init__">nullcontext</a></td>
+<td></td>
+</tr>
+<tr>
+<td><a href="#nullcontext.__enter__">__enter__</a></td>
+<td></td>
+</tr>
+<tr>
+<td><a href="#nullcontext.__exit__">__exit__</a></td>
+<td></td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="nullcontext.__init__" ID="nullcontext.__init__"></a>
+<h4>nullcontext (Constructor)</h4>
+<b>nullcontext</b>(<i>enter_result=None</i>)
+
+<a NAME="nullcontext.__enter__" ID="nullcontext.__enter__"></a>
+<h4>nullcontext.__enter__</h4>
+<b>__enter__</b>(<i></i>)
+
+<a NAME="nullcontext.__exit__" ID="nullcontext.__exit__"></a>
+<h4>nullcontext.__exit__</h4>
+<b>__exit__</b>(<i>*excinfo</i>)
+
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="unparse" ID="unparse"></a>
 <h2>unparse</h2>
 <b>unparse</b>(<i>ast_obj</i>)

--- a/eric6/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Thu Jul 29 19:39:19 2021 +0200
+++ b/eric6/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Thu Jul 29 19:43:01 2021 +0200
@@ -442,6 +442,10 @@
 <td>Public method to check, if the current selection is rectangular.</td>
 </tr>
 <tr>
+<td><a href="#QsciScintillaCompat.setAutoCompletionWidgetSize">setAutoCompletionWidgetSize</a></td>
+<td>Public method to set the size of completion and user lists.</td>
+</tr>
+<tr>
 <td><a href="#QsciScintillaCompat.setCaretLineAlwaysVisible">setCaretLineAlwaysVisible</a></td>
 <td>Public method to set the caret line visible even if the editor doesn't have the focus.</td>
 </tr>
@@ -1990,6 +1994,24 @@
 flag indicating a rectangular selection (boolean)
 </dd>
 </dl>
+<a NAME="QsciScintillaCompat.setAutoCompletionWidgetSize" ID="QsciScintillaCompat.setAutoCompletionWidgetSize"></a>
+<h4>QsciScintillaCompat.setAutoCompletionWidgetSize</h4>
+<b>setAutoCompletionWidgetSize</b>(<i>chars, lines</i>)
+
+<p>
+        Public method to set the size of completion and user lists.
+</p>
+<dl>
+
+<dt><i>chars</i> (int)</dt>
+<dd>
+max. number of chars to show
+</dd>
+<dt><i>lines</i> (int)</dt>
+<dd>
+max. number of lines to show
+</dd>
+</dl>
 <a NAME="QsciScintillaCompat.setCaretLineAlwaysVisible" ID="QsciScintillaCompat.setCaretLineAlwaysVisible"></a>
 <h4>QsciScintillaCompat.setCaretLineAlwaysVisible</h4>
 <b>setCaretLineAlwaysVisible</b>(<i>alwaysVisible</i>)