| Message ID | 20221130015358.6998-2-zhangdongdong@eswincomputing.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix some typos | expand |
On 30/11/22 02:53, Dongdong Zhang wrote: > Fix some typos in 'python' directory. > > Signed-off-by: Dongdong Zhang <zhangdongdong@eswincomputing.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > python/qemu/machine/console_socket.py | 2 +- > python/qemu/machine/qtest.py | 2 +- > python/qemu/qmp/protocol.py | 2 +- > python/qemu/qmp/qmp_tui.py | 6 +++--- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/python/qemu/machine/console_socket.py b/python/qemu/machine/console_socket.py > index 8c4ff598ad..4e28ba9bb2 100644 > --- a/python/qemu/machine/console_socket.py > +++ b/python/qemu/machine/console_socket.py > @@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread: > """Kick off a thread to drain the socket.""" > # Configure socket to not block and timeout. > # This allows our drain thread to not block > - # on recieve and exit smoothly. > + # on receive and exit smoothly. > socket.socket.setblocking(self, False) > socket.socket.settimeout(self, 1) > drain_thread = threading.Thread(target=self._drain_fn) > diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py > index 1a1fc6c9b0..906bd13298 100644 > --- a/python/qemu/machine/qtest.py > +++ b/python/qemu/machine/qtest.py > @@ -42,7 +42,7 @@ class QEMUQtestProtocol: > :raise socket.error: on socket connection errors > > .. note:: > - No conection is estabalished by __init__(), this is done > + No connection is estabalished by __init__(), this is done > by the connect() or accept() methods. > """ > def __init__(self, address: SocketAddrT, > diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py > index 6ea86650ad..15909b7dba 100644 > --- a/python/qemu/qmp/protocol.py > +++ b/python/qemu/qmp/protocol.py > @@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool: > > @bottom_half > async def _bh_close_stream(self, error_pathway: bool = False) -> None: > - # NB: Closing the writer also implcitly closes the reader. > + # NB: Closing the writer also implicitly closes the reader. > if not self._writer: > return > > diff --git a/python/qemu/qmp/qmp_tui.py b/python/qemu/qmp/qmp_tui.py > index ce239d8979..8369144723 100644 > --- a/python/qemu/qmp/qmp_tui.py > +++ b/python/qemu/qmp/qmp_tui.py > @@ -71,7 +71,7 @@ def format_json(msg: str) -> str: > due to an decoding error then a simple string manipulation is done to > achieve a single line JSON string. > > - Converting into single line is more asthetically pleasing when looking > + Converting into single line is more aesthetically pleasing when looking > along with error messages. > > Eg: > @@ -91,7 +91,7 @@ def format_json(msg: str) -> str: > > [1, true, 3]: QMP message is not a JSON object. > > - The single line mode is more asthetically pleasing. > + The single line mode is more aesthetically pleasing. > > :param msg: > The message to formatted into single line. > @@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None: > class HistoryBox(urwid.ListBox): > """ > This widget is modelled using the ListBox widget, contains the list of > - all messages both QMP messages and log messsages to be shown in the TUI. > + all messages both QMP messages and log messages to be shown in the TUI. > > The messages are urwid.Text widgets. On every append of a message, the > focus is shifted to the last appended message.
On Tue, Nov 29, 2022 at 6:08 PM Dongdong Zhang <zhangdongdong@eswincomputing.com> wrote: > diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py > index 1a1fc6c9b0..906bd13298 100644 > --- a/python/qemu/machine/qtest.py > +++ b/python/qemu/machine/qtest.py > @@ -42,7 +42,7 @@ class QEMUQtestProtocol: > :raise socket.error: on socket connection errors > > .. note:: > - No conection is estabalished by __init__(), this is done > + No connection is estabalished by __init__(), this is done There are two typos in this line, the other one is 'estabalished'.
Le 30/11/2022 à 09:29, Philippe Mathieu-Daudé a écrit : > On 30/11/22 02:53, Dongdong Zhang wrote: >> Fix some typos in 'python' directory. >> >> Signed-off-by: Dongdong Zhang <zhangdongdong@eswincomputing.com> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >> --- >> python/qemu/machine/console_socket.py | 2 +- >> python/qemu/machine/qtest.py | 2 +- >> python/qemu/qmp/protocol.py | 2 +- >> python/qemu/qmp/qmp_tui.py | 6 +++--- >> 4 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/python/qemu/machine/console_socket.py b/python/qemu/machine/console_socket.py >> index 8c4ff598ad..4e28ba9bb2 100644 >> --- a/python/qemu/machine/console_socket.py >> +++ b/python/qemu/machine/console_socket.py >> @@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread: >> """Kick off a thread to drain the socket.""" >> # Configure socket to not block and timeout. >> # This allows our drain thread to not block >> - # on recieve and exit smoothly. >> + # on receive and exit smoothly. >> socket.socket.setblocking(self, False) >> socket.socket.settimeout(self, 1) >> drain_thread = threading.Thread(target=self._drain_fn) >> diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py >> index 1a1fc6c9b0..906bd13298 100644 >> --- a/python/qemu/machine/qtest.py >> +++ b/python/qemu/machine/qtest.py >> @@ -42,7 +42,7 @@ class QEMUQtestProtocol: >> :raise socket.error: on socket connection errors >> .. note:: >> - No conection is estabalished by __init__(), this is done >> + No connection is estabalished by __init__(), this is done >> by the connect() or accept() methods. >> """ >> def __init__(self, address: SocketAddrT, >> diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py >> index 6ea86650ad..15909b7dba 100644 >> --- a/python/qemu/qmp/protocol.py >> +++ b/python/qemu/qmp/protocol.py >> @@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool: >> @bottom_half >> async def _bh_close_stream(self, error_pathway: bool = False) -> None: >> - # NB: Closing the writer also implcitly closes the reader. >> + # NB: Closing the writer also implicitly closes the reader. >> if not self._writer: >> return >> diff --git a/python/qemu/qmp/qmp_tui.py b/python/qemu/qmp/qmp_tui.py >> index ce239d8979..8369144723 100644 >> --- a/python/qemu/qmp/qmp_tui.py >> +++ b/python/qemu/qmp/qmp_tui.py >> @@ -71,7 +71,7 @@ def format_json(msg: str) -> str: >> due to an decoding error then a simple string manipulation is done to >> achieve a single line JSON string. >> - Converting into single line is more asthetically pleasing when looking >> + Converting into single line is more aesthetically pleasing when looking >> along with error messages. >> Eg: >> @@ -91,7 +91,7 @@ def format_json(msg: str) -> str: >> [1, true, 3]: QMP message is not a JSON object. >> - The single line mode is more asthetically pleasing. >> + The single line mode is more aesthetically pleasing. >> :param msg: >> The message to formatted into single line. >> @@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None: >> class HistoryBox(urwid.ListBox): >> """ >> This widget is modelled using the ListBox widget, contains the list of >> - all messages both QMP messages and log messsages to be shown in the TUI. >> + all messages both QMP messages and log messages to be shown in the TUI. >> The messages are urwid.Text widgets. On every append of a message, the >> focus is shifted to the last appended message. > > Applied to my trivial-patches branch. Thanks, Laurent
On Mon, Jan 16, 2023 at 1:11 PM Laurent Vivier <laurent@vivier.eu> wrote: > > Le 30/11/2022 à 09:29, Philippe Mathieu-Daudé a écrit : > > On 30/11/22 02:53, Dongdong Zhang wrote: > >> Fix some typos in 'python' directory. > >> > >> Signed-off-by: Dongdong Zhang <zhangdongdong@eswincomputing.com> > > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > > >> --- > >> python/qemu/machine/console_socket.py | 2 +- > >> python/qemu/machine/qtest.py | 2 +- > >> python/qemu/qmp/protocol.py | 2 +- > >> python/qemu/qmp/qmp_tui.py | 6 +++--- > >> 4 files changed, 6 insertions(+), 6 deletions(-) > >> > >> diff --git a/python/qemu/machine/console_socket.py b/python/qemu/machine/console_socket.py > >> index 8c4ff598ad..4e28ba9bb2 100644 > >> --- a/python/qemu/machine/console_socket.py > >> +++ b/python/qemu/machine/console_socket.py > >> @@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread: > >> """Kick off a thread to drain the socket.""" > >> # Configure socket to not block and timeout. > >> # This allows our drain thread to not block > >> - # on recieve and exit smoothly. > >> + # on receive and exit smoothly. > >> socket.socket.setblocking(self, False) > >> socket.socket.settimeout(self, 1) > >> drain_thread = threading.Thread(target=self._drain_fn) > >> diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py > >> index 1a1fc6c9b0..906bd13298 100644 > >> --- a/python/qemu/machine/qtest.py > >> +++ b/python/qemu/machine/qtest.py > >> @@ -42,7 +42,7 @@ class QEMUQtestProtocol: > >> :raise socket.error: on socket connection errors > >> .. note:: > >> - No conection is estabalished by __init__(), this is done > >> + No connection is estabalished by __init__(), this is done > >> by the connect() or accept() methods. > >> """ > >> def __init__(self, address: SocketAddrT, > >> diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py > >> index 6ea86650ad..15909b7dba 100644 > >> --- a/python/qemu/qmp/protocol.py > >> +++ b/python/qemu/qmp/protocol.py > >> @@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool: > >> @bottom_half > >> async def _bh_close_stream(self, error_pathway: bool = False) -> None: > >> - # NB: Closing the writer also implcitly closes the reader. > >> + # NB: Closing the writer also implicitly closes the reader. > >> if not self._writer: > >> return > >> diff --git a/python/qemu/qmp/qmp_tui.py b/python/qemu/qmp/qmp_tui.py > >> index ce239d8979..8369144723 100644 > >> --- a/python/qemu/qmp/qmp_tui.py > >> +++ b/python/qemu/qmp/qmp_tui.py > >> @@ -71,7 +71,7 @@ def format_json(msg: str) -> str: > >> due to an decoding error then a simple string manipulation is done to > >> achieve a single line JSON string. > >> - Converting into single line is more asthetically pleasing when looking > >> + Converting into single line is more aesthetically pleasing when looking > >> along with error messages. > >> Eg: > >> @@ -91,7 +91,7 @@ def format_json(msg: str) -> str: > >> [1, true, 3]: QMP message is not a JSON object. > >> - The single line mode is more asthetically pleasing. > >> + The single line mode is more aesthetically pleasing. > >> :param msg: > >> The message to formatted into single line. > >> @@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None: > >> class HistoryBox(urwid.ListBox): > >> """ > >> This widget is modelled using the ListBox widget, contains the list of > >> - all messages both QMP messages and log messsages to be shown in the TUI. > >> + all messages both QMP messages and log messages to be shown in the TUI. > >> The messages are urwid.Text widgets. On every append of a message, the > >> focus is shifted to the last appended message. > > > > > > Applied to my trivial-patches branch. > > Thanks, > Laurent Laurent, I'll grab this one, sorry!
diff --git a/python/qemu/machine/console_socket.py b/python/qemu/machine/console_socket.py index 8c4ff598ad..4e28ba9bb2 100644 --- a/python/qemu/machine/console_socket.py +++ b/python/qemu/machine/console_socket.py @@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread: """Kick off a thread to drain the socket.""" # Configure socket to not block and timeout. # This allows our drain thread to not block - # on recieve and exit smoothly. + # on receive and exit smoothly. socket.socket.setblocking(self, False) socket.socket.settimeout(self, 1) drain_thread = threading.Thread(target=self._drain_fn) diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py index 1a1fc6c9b0..906bd13298 100644 --- a/python/qemu/machine/qtest.py +++ b/python/qemu/machine/qtest.py @@ -42,7 +42,7 @@ class QEMUQtestProtocol: :raise socket.error: on socket connection errors .. note:: - No conection is estabalished by __init__(), this is done + No connection is estabalished by __init__(), this is done by the connect() or accept() methods. """ def __init__(self, address: SocketAddrT, diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index 6ea86650ad..15909b7dba 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool: @bottom_half async def _bh_close_stream(self, error_pathway: bool = False) -> None: - # NB: Closing the writer also implcitly closes the reader. + # NB: Closing the writer also implicitly closes the reader. if not self._writer: return diff --git a/python/qemu/qmp/qmp_tui.py b/python/qemu/qmp/qmp_tui.py index ce239d8979..8369144723 100644 --- a/python/qemu/qmp/qmp_tui.py +++ b/python/qemu/qmp/qmp_tui.py @@ -71,7 +71,7 @@ def format_json(msg: str) -> str: due to an decoding error then a simple string manipulation is done to achieve a single line JSON string. - Converting into single line is more asthetically pleasing when looking + Converting into single line is more aesthetically pleasing when looking along with error messages. Eg: @@ -91,7 +91,7 @@ def format_json(msg: str) -> str: [1, true, 3]: QMP message is not a JSON object. - The single line mode is more asthetically pleasing. + The single line mode is more aesthetically pleasing. :param msg: The message to formatted into single line. @@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None: class HistoryBox(urwid.ListBox): """ This widget is modelled using the ListBox widget, contains the list of - all messages both QMP messages and log messsages to be shown in the TUI. + all messages both QMP messages and log messages to be shown in the TUI. The messages are urwid.Text widgets. On every append of a message, the focus is shifted to the last appended message.
Fix some typos in 'python' directory. Signed-off-by: Dongdong Zhang <zhangdongdong@eswincomputing.com> --- python/qemu/machine/console_socket.py | 2 +- python/qemu/machine/qtest.py | 2 +- python/qemu/qmp/protocol.py | 2 +- python/qemu/qmp/qmp_tui.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)