pywinpty 2.0.15__cp310-cp310-win_amd64.whl → 3.0.1__cp310-cp310-win_amd64.whl

pywinpty-3.0.1.dist-info/METADATA

@@ -0,0 +1,6 @@
+Metadata-Version: 2.4
+Name: pywinpty
+Version: 3.0.1
+License-File: LICENSE.txt
+Summary: Pseudo terminal support for Windows from Python.
+Requires-Python: >=3.9

pywinpty-3.0.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+pywinpty-3.0.1.dist-info/METADATA,sha256=uv-Z7g2o5rjRo8IsY9CRa-o5hsuAXJ7ahffynf82knM,159
+pywinpty-3.0.1.dist-info/WHEEL,sha256=Iz7QqxpWQRXToFIDkGspPPKDuV_klwuhW8ziiU5jhR8,96
+pywinpty-3.0.1.dist-info/licenses/LICENSE.txt,sha256=-HjUdn-a0uQ9MIPvoAIBsADOk32e6GJuALpccqrJUeI,1088
+winpty/OpenConsole.exe,sha256=6Dg0D2Gj8O-6rBrxtvgb31jYQDGM0fB2GQIlWrtWqmE,1148472
+winpty/__init__.py,sha256=laTi9sLjCLycyaQYO3wMvhZNIK2vh_pOvGTJT2Od4Qs,402
+winpty/conpty.dll,sha256=kliUMMhwG7vUzGvzCV_o8GdlaIh13W7EK6VKWwdHHoU,109624
+winpty/enums.py,sha256=KAm7XJFPk7nMWwUJxvYHlql92cr6y-Y24IHK3fc0JDU,1860
+winpty/ptyprocess.py,sha256=lub-1tL-LVUEY0e8s8J0VEbfWLsRdsx8gHyhagxdb28,12255
+winpty/tests/__init__.py,sha256=fzb9cDnPt2R3b_rWh6sqDgIbiQOZtBlfsV1aq-ULT2Q,53
+winpty/tests/test_pty.py,sha256=f6UKatWALTFM7jvcrqYWsRFCxosT-Aj0ChhvkN97ov4,3850
+winpty/tests/test_ptyprocess.py,sha256=QP0I-gufNV7OaZZFpRIC9J1XD4nq86NrR3oqi9s4OEI,5981
+winpty/winpty-agent.exe,sha256=REZ6g9hrYSe8e4duiy-zP6df3gnZuf8nx_jvhLqWmyk,2627338
+winpty/winpty.cp310-win_amd64.pyd,sha256=ebOKRWpFln_Rd37RsLpOfkfuYMZZoVi2ilpFjFp8FeQ,580608
+winpty/winpty.dll,sha256=UXfzIarC-oVDbdbsa_xtQUWdJfW1M6oDNJ71E0YbTHk,2509089
+winpty/winpty.pyi,sha256=N8sy5oYzQGwtekPUSZ8Ai6Z9l3TcpNv-VOMjhRHByhs,1500
+pywinpty-3.0.1.dist-info/RECORD,,

{pywinpty-2.0.15.dist-info → pywinpty-3.0.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.1)
+Generator: maturin (1.9.4)
 Root-Is-Purelib: false
 Tag: cp310-cp310-win_amd64

winpty/enums.py

@@ -50,5 +50,5 @@ class AgentConfig:
 
     # Do output color escape sequences.  These escapes are output by default,
     # but are suppressed with WINPTY_FLAG_PLAIN_OUTPUT.
-    # Use this flag to reenable them.
+    # Use this flag to re-enable them.
     WINPTY_FLAG_COLOR_ESCAPES = 0x4

winpty/ptyprocess.py

@@ -26,6 +26,9 @@ class PtyProcess(object):
         self.pty = pty
         self.pid = pty.pid
         # self.fd = pty.fd
+        self.argv = None
+        self.env = None
+        self.launch_dir = None
 
         self.read_blocking = bool(int(os.environ.get('PYWINPTY_BLOCK', 1)))
         self.closed = False
@@ -72,8 +75,8 @@ class PtyProcess(object):
             raise TypeError("Expected a list or tuple for argv, got %r" % argv)
 
         # Shallow copy of argv so we can modify it
-        argv = argv[:]
-        command = argv[0]
+        _argv: list[str] = list(argv[:])
+        command = _argv[0]
         env = env or os.environ
 
         path = env.get('PATH', os.defpath)
@@ -84,8 +87,8 @@ class PtyProcess(object):
                 'executable: %s.' % command
             )
         command = command_with_path
-        argv[0] = command
-        cmdline = ' ' + subprocess.list2cmdline(argv[1:])
+        _argv[0] = command
+        cmdline = ' ' + subprocess.list2cmdline(_argv[1:])
         cwd = cwd or os.getcwd()
 
         backend = backend or os.environ.get('PYWINPTY_BACKEND', None)
@@ -94,7 +97,7 @@ class PtyProcess(object):
         proc = PTY(dimensions[1], dimensions[0],
                    backend=backend)
 
-        # Create the environemnt string.
+        # Create the environment string.
         envStrs = []
         for (key, value) in env.items():
             envStrs.append('%s=%s' % (key, value))
@@ -105,7 +108,7 @@ class PtyProcess(object):
         # cmdline = bytes(cmdline, encoding)
         # env = bytes(env, encoding)
 
-        if len(argv) == 1:
+        if len(_argv) == 1:
             proc.spawn(command, cwd=cwd, env=env)
         else:
             proc.spawn(command, cwd=cwd, env=env, cmdline=cmdline)
@@ -114,7 +117,7 @@ class PtyProcess(object):
         inst._winsize = dimensions
 
         # Set some informational attributes
-        inst.argv = argv
+        inst.argv = _argv
         if env is not None:
             inst.env = env
         if cwd is not None:
@@ -194,7 +197,7 @@ class PtyProcess(object):
             raise EOFError('Pty is closed')
 
         if data == b'0011Ignore':
-            data = ''
+            data = b''
 
         err = True
         while err and data:
@@ -237,6 +240,10 @@ class PtyProcess(object):
         if not self.isalive():
             return True
         self.kill(signal.SIGINT)
+        try:
+            self.pty.cancel_io()
+        except Exception:
+            pass
         time.sleep(self.delayafterterminate)
         if not self.isalive():
             return True
@@ -266,9 +273,11 @@ class PtyProcess(object):
         self.closed = not alive
         return alive
 
-    def kill(self, sig=None):
+    def kill(self, sig):
         """Kill the process with the given signal.
         """
+        if self.pid is None:
+            return
         os.kill(self.pid, sig)
 
     def sendcontrol(self, char):
@@ -307,13 +316,13 @@ class PtyProcess(object):
         It is the responsibility of the caller to ensure the eof is sent at the
         beginning of a line."""
         # Send control character 4 (Ctrl-D)
-        self.pty.write('\x04'), '\x04'
+        self.pty.write('\x04')
 
     def sendintr(self):
         """This sends a SIGINT to the child. It does not require
         the SIGINT to be the first character on a line. """
         # Send control character 3 (Ctrl-C)
-        self.pty.write('\x03'), '\x03'
+        self.pty.write('\x03')
 
     def eof(self):
         """This returns True if the EOF exception was ever raised.
@@ -332,7 +341,7 @@ class PtyProcess(object):
         self.pty.set_size(cols, rows)
 
 
-def _read_in_thread(address, pty, blocking):
+def _read_in_thread(address, pty: PTY, blocking: bool):
     """Read data from the pty in a thread.
     """
     client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -342,7 +351,7 @@ def _read_in_thread(address, pty, blocking):
 
     while 1:
         try:
-            data = pty.read(4096, blocking=blocking) or b'0011Ignore'
+            data = pty.read(blocking=blocking) or b'0011Ignore'
             try:
                 client.send(bytes(data, 'utf-8'))
             except socket.error:

winpty/tests/test_pty.py

@@ -28,6 +28,8 @@ def pty_factory(backend):
         # loc = bytes(os.getcwd(), 'utf8')
         assert pty.spawn(CMD)
         time.sleep(0.3)
+        # if backend == Backend.ConPTY:
+        #     pty.write("\x1b[?1;0c\x1b[0;0R")
         return pty
     return pty_fixture
 
@@ -131,26 +133,26 @@ def test_isalive(pty_fixture):
 #         pass
 
 
-@pytest.mark.parametrize(
-    'backend_name,backend',
-    [("ConPTY", Backend.ConPTY), ('WinPTY', Backend.WinPTY)])
-def test_pty_create_size_fail(backend_name, backend):
-    try:
-        PTY(80, -25, backend=backend)
-        assert False
-    except WinptyError:
-        pass
+# @pytest.mark.parametrize(
+#     'backend_name,backend',
+#     [("ConPTY", Backend.ConPTY), ('WinPTY', Backend.WinPTY)])
+# def test_pty_create_size_fail(backend_name, backend):
+#     try:
+#         PTY(80, -25, backend=backend)
+#         assert False
+#     except WinptyError:
+#         pass
 
 
-def test_agent_resize_fail(pty_fixture):
-    pty = pty_fixture()
-    try:
-        pty.set_size(-80, 70)
-        assert False
-    except WinptyError:
-        pass
-    finally:
-        del pty
+# def test_agent_resize_fail(pty_fixture):
+#     pty = pty_fixture()
+#     try:
+#         pty.set_size(-80, 70)
+#         assert False
+#     except WinptyError:
+#         pass
+#     finally:
+#         del pty
 
 
 def test_agent_resize(pty_fixture):

winpty/tests/test_ptyprocess.py

@@ -33,7 +33,9 @@ def pty_fixture(request):
     backend = getattr(Backend, backend)
     def _pty_factory(cmd=None, env=None):
         cmd = cmd or 'cmd'
-        return PtyProcess.spawn(cmd, env=env, backend=backend)
+        pty = PtyProcess.spawn(cmd, env=env, backend=backend)
+        return pty
+    # time.sleep(10)
     _pty_factory.backend = request.param
     return _pty_factory
 
@@ -78,6 +80,7 @@ def test_write(pty_fixture):
 @flaky(max_runs=40, min_passes=1)
 def test_isalive(pty_fixture):
     pty = pty_fixture()
+    time.sleep(4)
 
     pty.write('echo \"foo\"\r\nexit\r\n')
     data = ''
@@ -166,7 +169,7 @@ def test_exit_status(pty_fixture):
     assert pty.exitstatus == 1
 
 
-@pytest.mark.timeout(30)
+# @pytest.mark.timeout(30)
 def test_kill_sigterm(pty_fixture):
     pty = pty_fixture()
     pty.write('echo \"foo\"\r\nsleep 1000\r\n')
@@ -183,7 +186,7 @@ def test_kill_sigterm(pty_fixture):
     assert pty.exitstatus == signal.SIGTERM
 
 
-@pytest.mark.timeout(30)
+# @pytest.mark.timeout(30)
 def test_terminate(pty_fixture):
     pty = pty_fixture()
     pty.write('echo \"foo\"\r\nsleep 1000\r\n')
@@ -200,7 +203,7 @@ def test_terminate(pty_fixture):
     assert pty.closed
 
 
-@pytest.mark.timeout(30)
+# @pytest.mark.timeout(30)
 def test_terminate_force(pty_fixture):
     pty = pty_fixture()
     pty.write('echo \"foo\"\r\nsleep 1000\r\n')

winpty/winpty.pyi

@@ -8,6 +8,10 @@ from typing import Optional
 # Local imports
 from .enums import Backend, Encoding, MouseMode, AgentConfig
 
+__version__: str
+
+class WinptyError(Exception):
+    ...
 
 class PTY:
     def __init__(self, cols: int, rows: int,
@@ -19,25 +23,25 @@ class PTY:
         ...
 
     def spawn(self,
-              appname: bytes,
-              cmdline: Optional[bytes] = None,
-              cwd: Optional[bytes] = None,
-              env: Optional[bytes] = None) -> bool:
+              appname: str,
+              cmdline: Optional[str] = None,
+              cwd: Optional[str] = None,
+              env: Optional[str] = None) -> bool:
         ...
 
     def set_size(self, cols: int, rows: int): ...
 
     def read(self,
              length: Optional[int] = 1000,
-             blocking: bool = False) -> bytes:
+             blocking: bool = False) -> str:
         ...
 
     def read_stderr(self,
              length: Optional[int] = 1000,
-             blocking: bool = False) -> bytes:
+             blocking: bool = False) -> str:
         ...
 
-    def write(self, to_write: bytes) -> int: ...
+    def write(self, to_write: str) -> int: ...
 
     def isalive(self) -> bool: ...
 
@@ -45,6 +49,8 @@ class PTY:
 
     def iseof(self) -> bool: ...
 
+    def cancel_io() -> bool: ...
+
     @property
     def pid(self) -> Optional[int]: ...
 

pywinpty-2.0.15.dist-info/METADATA

@@ -1,145 +0,0 @@
-Metadata-Version: 2.4
-Name: pywinpty
-Version: 2.0.15
-License-File: LICENSE.txt
-Summary: Pseudo terminal support for Windows from Python.
-Keywords: pty,pseudo-terminal,conpty,windows,winpty
-Author: Edgar Andrés Margffoy Tuay <andfoy@gmail.com>
-Author-email: Edgar Andrés Margffoy Tuay <andfoy@gmail.com>
-License: MIT
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Source Code, https://github.com/spyder-ide/pywinpty
-
-# PyWinpty: Pseudoterminals for Windows in Python
-
-[![Project License - MIT](https://img.shields.io/pypi/l/pywinpty.svg)](./LICENSE.txt)
-[![pypi version](https://img.shields.io/pypi/v/pywinpty.svg)](https://pypi.org/project/pywinpty/)
-[![conda version](https://img.shields.io/conda/vn/conda-forge/pywinpty.svg)](https://www.anaconda.com/download/)
-[![download count](https://img.shields.io/conda/dn/conda-forge/pywinpty.svg)](https://www.anaconda.com/download/)
-[![Downloads](https://pepy.tech/badge/pywinpty)](https://pepy.tech/project/pywinpty)
-[![PyPI status](https://img.shields.io/pypi/status/pywinpty.svg)](https://github.com/spyder-ide/pywinpty)
-[![Windows tests](https://github.com/andfoy/pywinpty/actions/workflows/windows_build.yml/badge.svg)](https://github.com/andfoy/pywinpty/actions/workflows/windows_build.yml)
-
-*Copyright © 2017–2022 Spyder Project Contributors*
-*Copyright © 2022– Edgar Andrés Margffoy Tuay*
-
-
-## Overview
-
-PyWinpty allows creating and communicating with Windows processes that receive input and print outputs via console input and output pipes. PyWinpty supports both the native [ConPTY](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/) interface and the previous, fallback [winpty](https://github.com/rprichard/winpty) library.
-
-
-## Dependencies
-To compile pywinpty sources, you must have [Rust](https://rustup.rs/) installed.
-Optionally, you can also have Winpty's C header and library files available on your include path.
-
-
-## Installation
-You can install this library by using conda or pip package managers, as it follows:
-
-Using conda (Recommended):
-```bash
-conda install pywinpty
-```
-
-Using pip:
-```bash
-pip install pywinpty
-```
-
-## Building from source
-
-To build from sources, you will require both a working stable or nightly Rust toolchain with
-target `x86_64-pc-windows-msvc`, which can be installed using [rustup](https://rustup.rs/).
-
-Optionally, this library can be linked against winpty library, which you can install using conda-forge:
-
-```batch
-conda install winpty -c conda-forge
-```
-
-If you don't want to use conda, you will need to have the winpty binaries and headers available on your PATH.
-
-Finally, pywinpty uses [Maturin](https://github.com/PyO3/maturin) as the build backend, which can be installed using `pip`:
-
-```batch
-pip install maturin
-```
-
-To test your compilation environment settings, you can build pywinpty sources locally, by
-executing:
-
-```bash
-maturin develop
-```
-
-This package depends on the following Rust crates:
-
-* [PyO3](https://github.com/PyO3/pyo3): Library used to produce Python bindings from Rust code.
-* [WinPTY-rs](https://github.com/andfoy/winpty-rs): Create and spawn processes inside a pseudoterminal in Windows from Rust.
-* [Maturin](https://github.com/PyO3/maturin): Build system to build and publish Rust-based Python packages.
-
-## Package usage
-Pywinpty offers a single python wrapper around winpty library functions.
-This implies that using a single object (``winpty.PTY``) it is possible to access to all functionality, as it follows:
-
-```python
-# High level usage using `spawn`
-from winpty import PtyProcess
-
-proc = PtyProcess.spawn('python')
-proc.write('print("hello, world!")\r\n')
-proc.write('exit()\r\n')
-while proc.isalive():
-	print(proc.readline())
-
-# Low level usage using the raw `PTY` object
-from winpty import PTY
-
-# Start a new winpty-agent process of size (cols, rows)
-cols, rows = 80, 25
-process = PTY(cols, rows)
-
-# Spawn a new console process, e.g., CMD
-process.spawn(br'C:\windows\system32\cmd.exe')
-
-# Read console output (Unicode)
-process.read()
-
-# Write input to console (Unicode)
-process.write(b'Text')
-
-# Resize console size
-new_cols, new_rows = 90, 30
-process.set_size(new_cols, new_rows)
-
-# Know if the process is alive
-alive = process.isalive()
-
-# End winpty-agent process
-del process
-```
-
-## Running tests
-We use pytest to run tests as it follows (after calling ``maturin develop``), the test suite depends
-on pytest-lazy-fixture, which can be installed via pip:
-
-```batch
-pip install pytest pytest-lazy-fixture flaky
-```
-
-All the tests can be exceuted using the following command
-
-```bash
-python runtests.py
-```
-
-
-## Changelog
-Visit our [CHANGELOG](CHANGELOG.md) file to learn more about our new features and improvements.
-
-
-## Contribution guidelines
-We follow PEP8 and PEP257 for pure python packages and Rust to compile extensions. We use MyPy type annotations for all functions and classes declared on this package. Feel free to send a PR or create an issue if you have any problem/question.
-

pywinpty-2.0.15.dist-info/RECORD

@@ -1,14 +0,0 @@
-pywinpty-2.0.15.dist-info/METADATA,sha256=JvigkiTz4bbGOWiYRrvpK42n6ASsNzKxr5j3LPpQl-o,5195
-pywinpty-2.0.15.dist-info/WHEEL,sha256=nWeKMpvecbFEmBYQM44p2FChzkAyOaqMiofeuspsYro,96
-pywinpty-2.0.15.dist-info/licenses/LICENSE.txt,sha256=-HjUdn-a0uQ9MIPvoAIBsADOk32e6GJuALpccqrJUeI,1088
-winpty/enums.py,sha256=fhHvBfb0ciVR2XsAiBn67Q-zNDlUGvakqlyZ2XRicig,1859
-winpty/ptyprocess.py,sha256=OIrWzipZZ5zZSqc7k__megCZ9yWkepSzAP04Du0G2H4,12021
-winpty/tests/test_pty.py,sha256=PqZPzzZqfdABi_eW0KFVkDdSd8uskPtUKHj0Lw7uPIA,3725
-winpty/tests/test_ptyprocess.py,sha256=F-5Tp8nQnPhpJlTEKJTM3XDH-VVEbcYr7DsKiJMHT2g,5915
-winpty/tests/__init__.py,sha256=fzb9cDnPt2R3b_rWh6sqDgIbiQOZtBlfsV1aq-ULT2Q,53
-winpty/winpty-agent.exe,sha256=REZ6g9hrYSe8e4duiy-zP6df3gnZuf8nx_jvhLqWmyk,2627338
-winpty/winpty.dll,sha256=UXfzIarC-oVDbdbsa_xtQUWdJfW1M6oDNJ71E0YbTHk,2509089
-winpty/winpty.pyi,sha256=CAFZIWyBAGwV-2pekJUF5ft6uxRwFo-5n0UGEbiToRE,1418
-winpty/__init__.py,sha256=laTi9sLjCLycyaQYO3wMvhZNIK2vh_pOvGTJT2Od4Qs,402
-winpty/winpty.cp310-win_amd64.pyd,sha256=xp36ECFSK-sN465oOYEc7JUlTCKtk3OC5VnsQrSxzKU,534016
-pywinpty-2.0.15.dist-info/RECORD,,