Mercurial Repositories > eric / changeset

--- a/docs/changelog	Mon Feb 14 19:02:24 2022 +0100
+++ b/docs/changelog	Fri Feb 18 17:44:19 2022 +0100
@@ -4,6 +4,8 @@
 - bug fixes
 - General
   -- performance improvements
+  -- added a '__main__.py' script to allow starting eric7 with
+     'python3 -m eric7'
 - MicroPython
   -- enhanced support for ESP32 devices
 

--- a/eric7.epj	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7.epj	Fri Feb 18 17:44:19 2022 +0100
@@ -2312,7 +2312,8 @@
       "eric7/HelpViewer/HelpBookmarksWidget.py",
       "eric7/HelpViewer/HelpBookmarkPropertiesDialog.py",
       "eric7/HelpViewer/HelpBookmarksImportDialog.py",
-      "eric7/MicroPython/BoardDataDialog.py"
+      "eric7/MicroPython/BoardDataDialog.py",
+      "eric7/__main__.py"
     ],
     "SPELLEXCLUDES": "Dictionaries/excludes.dic",
     "SPELLLANGUAGE": "en_US",
@@ -2390,4 +2391,4 @@
     "VCSOTHERDATA": {},
     "VERSION": "7.x"
   }
-}
\ No newline at end of file
+}

--- a/eric7/APIs/Python3/eric7.api	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7/APIs/Python3/eric7.api	Fri Feb 18 17:44:19 2022 +0100
@@ -320,7 +320,7 @@
 eric7.DebugClients.Python.DebugClientBase.DebugClientBase.writeReady?4(stream)
 eric7.DebugClients.Python.DebugClientBase.DebugClientBase?1()
 eric7.DebugClients.Python.DebugClientBase.DebugClientClose?4(fd)
-eric7.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="")
+eric7.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="", echo=True)
 eric7.DebugClients.Python.DebugClientBase.DebugClientInstance?7
 eric7.DebugClients.Python.DebugClientBase.DebugClientSetRecursionLimit?4(limit)
 eric7.DebugClients.Python.DebugClientCapabilities.HasAll?7
@@ -473,7 +473,7 @@
 eric7.DebugClients.Python.eric7dbgstub.startDebugger?4(enableTrace=True, exceptions=True, tracePython=False, redirect=True)
 eric7.DebugClients.Python.getpass.default_getpass?7
 eric7.DebugClients.Python.getpass.fallback_getpass?7
-eric7.DebugClients.Python.getpass.getpass?4(prompt='Password: ')
+eric7.DebugClients.Python.getpass.getpass?4(prompt='Password: ', stream=None)
 eric7.DebugClients.Python.getpass.getuser?4()
 eric7.DebugClients.Python.getpass.unix_getpass?7
 eric7.DebugClients.Python.getpass.win_getpass?7

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

--- a/eric7/Documentation/Help/source.qhp	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7/Documentation/Help/source.qhp	Fri Feb 18 17:44:19 2022 +0100
@@ -1403,6 +1403,7 @@
             <section title="eric7.WebBrowser.WebBrowserWindow" ref="eric7.WebBrowser.WebBrowserWindow.html" />
             <section title="eric7.WebBrowser.WebInspector" ref="eric7.WebBrowser.WebInspector.html" />
           </section>
+          <section title="eric7.__main__" ref="eric7.__main__.html" />
           <section title="eric7.eric7" ref="eric7.eric7.html" />
           <section title="eric7.eric7_api" ref="eric7.eric7_api.html" />
           <section title="eric7.eric7_browser" ref="eric7.eric7_browser.html" />
@@ -18028,6 +18029,7 @@
       <keyword name="__initializeCondaInterface" id="__initializeCondaInterface" ref="eric7.CondaInterface.__init__.html#__initializeCondaInterface" />
       <keyword name="__jsSyntaxCheck" id="__jsSyntaxCheck" ref="eric7.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#__jsSyntaxCheck" />
       <keyword name="__jsonSyntaxCheck" id="__jsonSyntaxCheck" ref="eric7.Plugins.CheckerPlugins.SyntaxChecker.jsonCheckSyntax.html#__jsonSyntaxCheck" />
+      <keyword name="__main__ (Module)" id="__main__ (Module)" ref="eric7.__main__.html" />
       <keyword name="__mapType" id="__mapType" ref="eric7.Project.UicLoadUi5.html#__mapType" />
       <keyword name="__mapType" id="__mapType" ref="eric7.Project.UicLoadUi6.html#__mapType" />
       <keyword name="__messageBox" id="__messageBox" ref="eric7.EricWidgets.EricMessageBox.html#__messageBox" />
@@ -20232,6 +20234,7 @@
       <file>eric7.WebBrowser.ZoomManager.ZoomManager.html</file>
       <file>eric7.WebBrowser.ZoomManager.ZoomValuesDialog.html</file>
       <file>eric7.WebBrowser.ZoomManager.ZoomValuesModel.html</file>
+      <file>eric7.__main__.html</file>
       <file>eric7.eric7.html</file>
       <file>eric7.eric7_api.html</file>
       <file>eric7.eric7_browser.html</file>

--- a/eric7/Documentation/Source/eric7.DebugClients.Python.DebugClientBase.html	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7/Documentation/Source/eric7.DebugClients.Python.DebugClientBase.html	Fri Feb 18 17:44:19 2022 +0100
@@ -784,13 +784,13 @@
 </p>
 <dl>
 
-<dt><i>prompt</i></dt>
+<dt><i>prompt</i> (str)</dt>
 <dd>
-the prompt to be shown (string)
+prompt to be shown
 </dd>
-<dt><i>echo</i></dt>
+<dt><i>echo</i> (bool)</dt>
 <dd>
-Flag indicating echoing of the input (boolean)
+flag indicating echoing of the input
 </dd>
 </dl>
 <dl>
@@ -799,6 +799,12 @@
 the entered string
 </dd>
 </dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
 <a NAME="DebugClientBase.main" ID="DebugClientBase.main"></a>
 <h4>DebugClientBase.main</h4>
 <b>main</b>(<i></i>)
@@ -1275,7 +1281,7 @@
 <hr />
 <a NAME="DebugClientInput" ID="DebugClientInput"></a>
 <h2>DebugClientInput</h2>
-<b>DebugClientInput</b>(<i>prompt=""</i>)
+<b>DebugClientInput</b>(<i>prompt="", echo=True</i>)
 
 <p>
     Replacement for the standard input() builtin.
@@ -1289,6 +1295,10 @@
 <dd>
 prompt to be shown
 </dd>
+<dt><i>echo</i> (bool)</dt>
+<dd>
+flag indicating echoing of the input
+</dd>
 </dl>
 <dl>
 <dt>Return:</dt>

--- a/eric7/Documentation/Source/eric7.DebugClients.Python.getpass.html	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7/Documentation/Source/eric7.DebugClients.Python.getpass.html	Fri Feb 18 17:44:19 2022 +0100
@@ -46,7 +46,7 @@
 <hr />
 <a NAME="getpass" ID="getpass"></a>
 <h2>getpass</h2>
-<b>getpass</b>(<i>prompt='Password: '</i>)
+<b>getpass</b>(<i>prompt='Password: ', stream=None</i>)
 
 <p>
     Function to prompt for a password, with echo turned off.
@@ -57,6 +57,10 @@
 <dd>
 Prompt to be shown to the user
 </dd>
+<dt><i>stream</i> (file)</dt>
+<dd>
+input stream to read from (ignored)
+</dd>
 </dl>
 <dl>
 <dt>Return:</dt>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.__main__.html	Fri Feb 18 17:44:19 2022 +0100
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.__main__</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.__main__</h1>
+
+<p>
+Main script to enable starting eric7 with 'python -m eric7'.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric7/Documentation/Source/index-eric7.html	Mon Feb 14 19:02:24 2022 +0100
+++ b/eric7/Documentation/Source/index-eric7.html	Fri Feb 18 17:44:19 2022 +0100
@@ -192,6 +192,10 @@
 <table>
 
 <tr>
+<td><a href="eric7.__main__.html">__main__</a></td>
+<td>Main script to enable starting eric7 with 'python -m eric7'.</td>
+</tr>
+<tr>
 <td><a href="eric7.eric7.html">eric7</a></td>
 <td>eric Python IDE.</td>
 </tr>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/__main__.py	Fri Feb 18 17:44:19 2022 +0100
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Main script to enable starting eric7 with 'python -m eric7'.
+"""
+
+from . import eric7
+eric7.main()