@@ -52,38 +52,21 @@ from psutil._common import (
5252 NoSuchProcess as NoSuchProcess ,
5353 TimeoutExpired as TimeoutExpired ,
5454 ZombieProcess as ZombieProcess ,
55- pconn ,
56- pcputimes ,
57- pctxsw ,
58- pgids ,
59- pionice ,
60- popenfile ,
61- pthread ,
62- puids ,
63- sconn ,
64- scpufreq ,
65- scpustats ,
66- sdiskio ,
67- sdiskpart ,
68- sdiskusage ,
69- sfan ,
70- shwtemp ,
71- snetio ,
72- snicaddr ,
73- snicstats ,
74- sswap ,
75- suser ,
7655)
7756
57+ from . import _ntuples as _ntp
58+
7859if sys .platform == "linux" :
7960 from ._pslinux import (
8061 IOPRIO_CLASS_BE as IOPRIO_CLASS_BE ,
8162 IOPRIO_CLASS_IDLE as IOPRIO_CLASS_IDLE ,
8263 IOPRIO_CLASS_NONE as IOPRIO_CLASS_NONE ,
8364 IOPRIO_CLASS_RT as IOPRIO_CLASS_RT ,
8465 )
85- def sensors_temperatures (fahrenheit : bool = ...) -> dict [str , list [shwtemp ]]: ...
86- def sensors_fans () -> dict [str , list [sfan ]]: ...
66+ def sensors_temperatures (fahrenheit : bool = False ) -> dict [str , list [_ntp .shwtemp ]]: ...
67+ def sensors_fans () -> dict [str , list [_ntp .sfan ]]: ...
68+ def heap_info () -> _ntp .pheap : ...
69+ def heap_trim () -> None : ...
8770 PROCFS_PATH : str
8871 RLIMIT_AS : int
8972 RLIMIT_CORE : int
@@ -122,27 +105,14 @@ if sys.platform == "win32":
122105 )
123106
124107if sys .platform == "linux" :
125- from ._pslinux import pfullmem , pmem , scputimes , sensors_battery as sensors_battery , svmem
108+ from ._pslinux import sensors_battery as sensors_battery
126109elif sys .platform == "darwin" :
127- from ._psosx import pfullmem , pmem , scputimes , sensors_battery as sensors_battery , svmem
110+ from ._psosx import sensors_battery as sensors_battery
128111elif sys .platform == "win32" :
129- from ._pswindows import pfullmem , pmem , scputimes , sensors_battery as sensors_battery , svmem
112+ from ._pswindows import sensors_battery as sensors_battery
130113else :
131- scputimes = Incomplete
132-
133- class pmem (Any ): ...
134- class pfullmem (Any ): ...
135- class svmem (Any ): ...
136-
137114 def sensors_battery (): ...
138115
139- if sys .platform == "linux" :
140- from ._pslinux import pio
141- elif sys .platform == "win32" :
142- from ._pswindows import pio
143- else :
144- from ._common import pio
145-
146116AF_LINK : int
147117version_info : tuple [int , int , int ]
148118__version__ : str
@@ -191,45 +161,45 @@ class Process:
191161 def cwd (self ) -> str : ...
192162 def nice (self , value : int | None = None ) -> int : ...
193163 if sys .platform != "win32" :
194- def uids (self ) -> puids : ...
195- def gids (self ) -> pgids : ...
164+ def uids (self ) -> _ntp . puids : ...
165+ def gids (self ) -> _ntp . pgids : ...
196166 def terminal (self ) -> str : ...
197167 def num_fds (self ) -> int : ...
198168 if sys .platform != "darwin" :
199- def io_counters (self ) -> pio : ...
200- def ionice (self , ioclass : int | None = None , value : int | None = None ) -> pionice : ...
169+ def io_counters (self ) -> _ntp . pio : ...
170+ def ionice (self , ioclass : int | None = None , value : int | None = None ) -> _ntp . pionice : ...
201171 @overload
202172 def cpu_affinity (self , cpus : None = None ) -> list [int ]: ...
203173 @overload
204174 def cpu_affinity (self , cpus : list [int ]) -> None : ...
205175 def memory_maps (self , grouped : bool = True ) -> list [Incomplete ]: ...
206176 if sys .platform == "linux" :
207- def rlimit (self , resource : int , limits : tuple [int , int ] | None = ... ) -> tuple [int , int ]: ...
177+ def rlimit (self , resource : int , limits : tuple [int , int ] | None = None ) -> tuple [int , int ]: ...
208178 def cpu_num (self ) -> int : ...
209179
210180 def environ (self ) -> dict [str , str ]: ...
211181 if sys .platform == "win32" :
212182 def num_handles (self ) -> int : ...
213183
214- def num_ctx_switches (self ) -> pctxsw : ...
184+ def num_ctx_switches (self ) -> _ntp . pctxsw : ...
215185 def num_threads (self ) -> int : ...
216- def threads (self ) -> list [pthread ]: ...
186+ def threads (self ) -> list [_ntp . pthread ]: ...
217187 def children (self , recursive : bool = False ) -> list [Process ]: ...
218188 def cpu_percent (self , interval : float | None = None ) -> float : ...
219- def cpu_times (self ) -> pcputimes : ...
220- def memory_info (self ) -> pmem : ...
221- def memory_full_info (self ) -> pfullmem : ...
189+ def cpu_times (self ) -> _ntp . pcputimes : ...
190+ def memory_info (self ) -> _ntp . pmem : ...
191+ def memory_full_info (self ) -> _ntp . pfullmem : ...
222192 def memory_percent (self , memtype : str = "rss" ) -> float : ...
223- def open_files (self ) -> list [popenfile ]: ...
193+ def open_files (self ) -> list [_ntp . popenfile ]: ...
224194 @deprecated ('use "net_connections" method instead' )
225- def connections (self , kind : str = "inet" ) -> list [pconn ]: ...
195+ def connections (self , kind : str = "inet" ) -> list [_ntp . pconn ]: ...
226196 def send_signal (self , sig : int ) -> None : ...
227197 def suspend (self ) -> None : ...
228198 def resume (self ) -> None : ...
229199 def terminate (self ) -> None : ...
230200 def kill (self ) -> None : ...
231201 def wait (self , timeout : float | None = None ) -> int : ...
232- def net_connections (self , kind : str = "inet" ) -> list [pconn ]: ...
202+ def net_connections (self , kind : str = "inet" ) -> list [_ntp . pconn ]: ...
233203
234204class Popen (Process ):
235205 def __init__ (self , * args , ** kwargs ) -> None : ...
@@ -257,41 +227,43 @@ def wait_procs(
257227) -> tuple [list [Process ], list [Process ]]: ...
258228def cpu_count (logical : bool = True ) -> int | None : ...
259229@overload
260- def cpu_freq (percpu : Literal [False ] = False ) -> scpufreq : ...
230+ def cpu_freq (percpu : Literal [False ] = False ) -> _ntp . scpufreq : ...
261231@overload
262- def cpu_freq (percpu : Literal [True ]) -> list [scpufreq ]: ...
232+ def cpu_freq (percpu : Literal [True ]) -> list [_ntp . scpufreq ]: ...
263233@overload
264- def cpu_times (percpu : Literal [False ] = False ) -> scputimes : ...
234+ def cpu_times (percpu : Literal [False ] = False ) -> _ntp . scputimes : ...
265235@overload
266- def cpu_times (percpu : Literal [True ]) -> list [scputimes ]: ...
236+ def cpu_times (percpu : Literal [True ]) -> list [_ntp . scputimes ]: ...
267237@overload
268238def cpu_percent (interval : float | None = None , percpu : Literal [False ] = False ) -> float : ...
269239@overload
270240def cpu_percent (interval : float | None , percpu : Literal [True ]) -> list [float ]: ...
271241@overload
272242def cpu_percent (* , percpu : Literal [True ]) -> list [float ]: ...
273243@overload
274- def cpu_times_percent (interval : float | None = None , percpu : Literal [False ] = False ) -> scputimes : ...
244+ def cpu_times_percent (interval : float | None = None , percpu : Literal [False ] = False ) -> _ntp . scputimes : ...
275245@overload
276- def cpu_times_percent (interval : float | None , percpu : Literal [True ]) -> list [scputimes ]: ...
246+ def cpu_times_percent (interval : float | None , percpu : Literal [True ]) -> list [_ntp . scputimes ]: ...
277247@overload
278- def cpu_times_percent (* , percpu : Literal [True ]) -> list [scputimes ]: ...
279- def cpu_stats () -> scpustats : ...
248+ def cpu_times_percent (* , percpu : Literal [True ]) -> list [_ntp . scputimes ]: ...
249+ def cpu_stats () -> _ntp . scpustats : ...
280250def getloadavg () -> tuple [float , float , float ]: ...
281- def virtual_memory () -> svmem : ...
282- def swap_memory () -> sswap : ...
283- def disk_usage (path : str ) -> sdiskusage : ...
284- def disk_partitions (all : bool = False ) -> list [sdiskpart ]: ...
251+ def virtual_memory () -> _ntp .svmem : ...
252+ def swap_memory () -> _ntp .sswap : ...
253+ def disk_usage (path : str ) -> _ntp .sdiskusage : ...
254+ def disk_partitions (all : bool = False ) -> list [_ntp .sdiskpart ]: ...
255+
256+ # TODO: Incorrect sdiskio for BSD systems:
285257@overload
286- def disk_io_counters (perdisk : Literal [False ] = False , nowrap : bool = True ) -> sdiskio | None : ...
258+ def disk_io_counters (perdisk : Literal [False ] = False , nowrap : bool = True ) -> _ntp . sdiskio | None : ...
287259@overload
288- def disk_io_counters (perdisk : Literal [True ], nowrap : bool = True ) -> dict [str , sdiskio ]: ...
260+ def disk_io_counters (perdisk : Literal [True ], nowrap : bool = True ) -> dict [str , _ntp . sdiskio ]: ...
289261@overload
290- def net_io_counters (pernic : Literal [False ] = False , nowrap : bool = True ) -> snetio : ...
262+ def net_io_counters (pernic : Literal [False ] = False , nowrap : bool = True ) -> _ntp . snetio : ...
291263@overload
292- def net_io_counters (pernic : Literal [True ], nowrap : bool = True ) -> dict [str , snetio ]: ...
293- def net_connections (kind : str = "inet" ) -> list [sconn ]: ...
294- def net_if_addrs () -> dict [str , list [snicaddr ]]: ...
295- def net_if_stats () -> dict [str , snicstats ]: ...
264+ def net_io_counters (pernic : Literal [True ], nowrap : bool = True ) -> dict [str , _ntp . snetio ]: ...
265+ def net_connections (kind : str = "inet" ) -> list [_ntp . sconn ]: ...
266+ def net_if_addrs () -> dict [str , list [_ntp . snicaddr ]]: ...
267+ def net_if_stats () -> dict [str , _ntp . snicstats ]: ...
296268def boot_time () -> float : ...
297- def users () -> list [suser ]: ...
269+ def users () -> list [_ntp . suser ]: ...
0 commit comments