zhmiscellany 6.2.2__py3-none-any.whl → 6.2.4__py3-none-any.whl

zhmiscellany/_misc_supportfuncs.py

@@ -156,7 +156,7 @@ def get_actual_screen_resolution():
         try:
             return pyautogui.size()
         except Exception:
-            print("Could not determine screen resolution on Linux, defaulting to 1920x1080")
+            # Could not determine screen resolution on Linux, defaulting to 1920x1080
             return 1920, 1080
 
 

zhmiscellany/_processing_supportfuncs.py

@@ -9,11 +9,7 @@ from unittest.mock import patch
 
 # Ray availability check
 if sys.platform == "win32" or True:
-    try:
-        import ray
-        RAY_AVAILABLE = True
-    except ImportError:
-        RAY_AVAILABLE = False
+    RAY_AVAILABLE = True
 else:
     RAY_AVAILABLE = False
 
@@ -281,7 +277,7 @@ def synchronous_class_multiprocess(cls, *args, disable_warning=False, **kwargs):
     if not RAY_AVAILABLE:
         print("synchronous_class_multiprocess() only supports Windows! Returning None")
         return None
-    
+
     if _ray_state == 'disabled':
         if not disable_warning:
             logging.warning("zhmiscellany didn't detect that you were going to be using multiprocessing functions, and ray was not initialized preemptively.\n\
@@ -295,12 +291,12 @@ All this means is that ray is still being initialized and this call to multiproc
 If you want to avoid this in the future and wait until ray is ready you can add this line just after importing zhmiscellany: (Or you can pass disable_warning=True to this function call)\n\
 from zhmiscellany._processing_supportfuncs import _ray_init_thread; _ray_init_thread.join()")
     _ray_init_thread.join()
-    
+
     def _ready(self):
         return True
     
     cls._ready = _ready
-    
-    remote_cls = ray.remote(cls)
+
+    remote_cls = ray.remote(num_cpus=0)(cls)
     actor_instance = remote_cls.remote(*args, **kwargs)
     return RayActorWrapper(actor_instance)

zhmiscellany/discord.py

@@ -429,7 +429,6 @@ def id_to_timestamp(id):
 
 
 def timestamp_to_id(timestamp):
-    id = int(id)
     DISCORD_EPOCH = 1420070400000
     return int((timestamp * 1000 - DISCORD_EPOCH) * 4194304)
 

zhmiscellany/image.py

@@ -1,5 +1,4 @@
 import numpy as np
-from PIL import Image, ImageDraw, ImageFont
 import math
 
 
@@ -19,6 +18,8 @@ def image_diff(img1, img2):
 
 class Canvas:
     def __init__(self, width, height, colour=(0, 0, 0, 255)):
+        from PIL import Image, ImageDraw, ImageFont
+        self.ImageFont = ImageFont
         self.width = width
         self.height = height
         self.image = Image.new("RGBA", (self.width, self.height), color=colour)
@@ -83,11 +84,11 @@ class Canvas:
                 line_colour = default_color
 
         try:
-            font = ImageFont.truetype("consola.ttf", int(12 * text_scale))
+            font = self.ImageFont.truetype("consola.ttf", int(12 * text_scale))
         except IOError:
-            font = ImageFont.load_default()
+            font = self.ImageFont.load_default()
             if hasattr(font, "size"):
-                font = ImageFont.load_default().font_variant(size=int(12 * text_scale))
+                font = self.ImageFont.load_default().font_variant(size=int(12 * text_scale))
         text_bbox = self.draw.textbbox((0, 0), text, font=font)
         text_width = text_bbox[2] - text_bbox[0]
         text_height = text_bbox[3] - text_bbox[1]

zhmiscellany/netio.py

@@ -1,11 +1,6 @@
 import os, requests
 import zhmiscellany.string
-import urllib.parse
 import sys
-from urllib3.exceptions import InsecureRequestWarning
-import urllib3
-
-urllib3.disable_warnings(InsecureRequestWarning)
 
 WIN32_AVAILABLE = False
 if sys.platform == "win32":
@@ -18,6 +13,7 @@ if sys.platform == "win32":
 
 
 def resolve_file(url, destination_folder="."):
+    import urllib.parse
     file_name = urllib.parse.unquote(url.split("/")[-1])
     file_name = file_name.split('?')[0]
     destination_path = f"{destination_folder}/{file_name}"
@@ -27,6 +23,10 @@ def resolve_file(url, destination_folder="."):
 
 
 def download_file(url, destination_folder=".", just_return_path=False, headers=None, file_path=None):
+    from urllib3.exceptions import InsecureRequestWarning
+    import urllib3
+    urllib3.disable_warnings(InsecureRequestWarning)
+
     if file_path:
         destination_path = file_path
     else:
@@ -54,6 +54,7 @@ def download_file(url, destination_folder=".", just_return_path=False, headers=N
 
 
 def generate_headers(url):
+    import urllib.parse
     headers = {}
     
     if WIN32_AVAILABLE:

zhmiscellany/pipes.py

@@ -2,7 +2,6 @@ import threading
 import queue
 import time
 import sys
-import zhmiscellany.string
 
 WIN32_AVAILABLE = False
 if sys.platform == "win32":

zhmiscellany/processing.py

@@ -2,7 +2,6 @@ from ._processing_supportfuncs import batch_multiprocess, multiprocess, synchron
 import threading, kthread
 import traceback
 import zhmiscellany.string
-import concurrent.futures
 import subprocess, zlib, pickle, dill, tempfile, os, base64
 from itertools import chain
 
@@ -15,6 +14,7 @@ def start_daemon(**kwargs):
 
 
 def batch_threading(targets, max_threads=None, show_errors=True, flatten=False):
+    import concurrent.futures
     def execute_target(target):
         try: return target[0](*target[1])
         except Exception:
@@ -34,6 +34,7 @@ def batch_threading(targets, max_threads=None, show_errors=True, flatten=False):
 
 
 def batch_threading_gen(targets, max_threads=None, show_errors=True):
+    import concurrent.futures
     def execute_target(target):
         try: return target[0](*target[1])
         except Exception:

{zhmiscellany-6.2.2.dist-info → zhmiscellany-6.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 6.2.2
+Version: 6.2.4
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-6.2.2.dist-info → zhmiscellany-6.2.4.dist-info}/RECORD

@@ -1,27 +1,27 @@
 zhmiscellany/__init__.py,sha256=Oh3gAJRWq2aUEgkolmQyiZOQ3iey5OC4NA2XaTHuVv4,1139
 zhmiscellany/_discord_supportfuncs.py,sha256=RotSpurqFtL5q6v_ST1e2Y_1qJMaHp1CDsF5i-gR4ec,6524
 zhmiscellany/_fileio_supportfuncs.py,sha256=soibLv9nOR79sHQ2MGQH2O6MhnqdXqI7ybxHSN2Tfac,434
-zhmiscellany/_misc_supportfuncs.py,sha256=RH1keGtoVjJOFh7MWOTJ2BJijLLeEvsMy9tNumdd6Uk,9944
-zhmiscellany/_processing_supportfuncs.py,sha256=Vicz7_v2HSOrUcrnbiq-6a-bP7grS3Wk36wENF9GTnA,11091
+zhmiscellany/_misc_supportfuncs.py,sha256=vfwcETCBq6fX96jad8aVPnZq5OpvNslgQPATUmGVbuI,9937
+zhmiscellany/_processing_supportfuncs.py,sha256=6UfR0QVkWv2MXKuTwWmI4bsn1joEQ-EOYo3v8sFzx_Y,11001
 zhmiscellany/_py_resources.py,sha256=HqJs5aRLymLZ2J5Io8g6bY58pGWhN9b8vCktC2DW4KQ,229009
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
 zhmiscellany/dict.py,sha256=0BZJ5eK-MurAHYV1OPa0jdGTr-QEWos7ZM0npb-tN9I,81
-zhmiscellany/discord.py,sha256=nzXjRnJbuYbuH4hScqqdsF61VeXx8xiYrwp_AKTWt9o,19774
+zhmiscellany/discord.py,sha256=iQfDrYCcoolfpCbE_kQN_yq_oOx4cbdYcTI8iHoKtIE,19756
 zhmiscellany/fileio.py,sha256=YqIfdit0TQr4VYmpCftoqwtddqo1OZz6duI7BKg7Dy4,19532
 zhmiscellany/gui.py,sha256=BDmM7e5ITKQuzxSzaYvPapQuPbQjCMTOq-GyMcLCIgg,10198
-zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
+zhmiscellany/image.py,sha256=kl4i5nfFW_byQkuCn_55HK4p1kuqng7L-k0iUbnhFb8,8257
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
 zhmiscellany/macro.py,sha256=kKtKYoHLSnBBHyGl8FlnfMaAoraKKSK023VA-mOezO0,27861
 zhmiscellany/math.py,sha256=btOQTe_GvqP0A7Zz84tmN_c8j1NGe_mKnhmAt40lhLU,2482
 zhmiscellany/misc.py,sha256=llL3ZHD5pxS4RDKLj3gX0k3NpE2mM5g3JVd0k_RvIUg,31979
-zhmiscellany/netio.py,sha256=VCqlo3ev_iOTTu5sXTZQwsYU0WMbAlOTDRsJ5Dj5-fc,2519
+zhmiscellany/netio.py,sha256=qwHsQb7TrKaIYmjH0SV-2J6lELth9QsmcsHDupzf5ok,2560
 zhmiscellany/pastebin.py,sha256=TbZ3DqFYXo5qt5d95ugrofYoptlzKkjXUr7VnEqa6ks,6357
-zhmiscellany/pipes.py,sha256=zETvWP4PF-PuSzYwR1UCodY4ftNAgmCChb9DUMofXok,4657
-zhmiscellany/processing.py,sha256=CUHgbNp8RetXDpc6DuojThi3T2iu_DX09P_WD8iUZ7s,11014
+zhmiscellany/pipes.py,sha256=ESg7UvnUJMfJ4LnNoARayZuhBPKEMGPLv_429ZCNzso,4629
+zhmiscellany/processing.py,sha256=FnWPhtzLHFtIkp0ROUVQ9fZWk1IZrSPv7lMIp8VZLnI,11049
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-6.2.2.dist-info/METADATA,sha256=lTQiC99cquo9TsWwBfhOFBgxjC8ckoazB9ThxwocBj4,43872
-zhmiscellany-6.2.2.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-zhmiscellany-6.2.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.2.2.dist-info/RECORD,,
+zhmiscellany-6.2.4.dist-info/METADATA,sha256=JpHQ3pl0C7gqzZtNBnJQaojYzq0OxV5mxKojVLgt5SE,43872
+zhmiscellany-6.2.4.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+zhmiscellany-6.2.4.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.2.4.dist-info/RECORD,,