From 350ca81474794388ece4538a3150714644b9b0ab Mon Sep 17 00:00:00 2001
From: Ircama <Ircama@users.noreply.github.com>
Date: Fri, 20 Sep 2024 09:34:42 +0200
Subject: [PATCH] Fix importing black when building exe with pyinstaller

---
 epson_print_conf.spec | 18 ++++++++++++++++--
 requirements.txt      |  3 ++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/epson_print_conf.spec b/epson_print_conf.spec
index d405e78..45018b3 100644
--- a/epson_print_conf.spec
+++ b/epson_print_conf.spec
@@ -4,6 +4,7 @@ import argparse
 import os
 import os.path
 from PIL import Image, ImageDraw, ImageFont
+from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
 
 def create_image(png_file, text):
@@ -76,12 +77,25 @@ app.mainloop()
 with open(PROGRAM[0], 'w') as file:
     file.write(gui_wrapper)
 
+# black submodules: https://github.com/pyinstaller/pyinstaller/issues/8270
+black_submodules = collect_submodules('black')
+blib2to3_submodules = collect_submodules('blib2to3')
+
+# "black" data files: https://github.com/pyinstaller/pyinstaller/issues/8270
+blib2to3_data = collect_data_files('blib2to3')
+
 a = Analysis(
     PROGRAM,
     pathex=[],
     binaries=[],
-    datas=DATAS,
-    hiddenimports=['babel.numbers'],
+    datas=DATAS + blib2to3_data,  # the latter required by black
+    hiddenimports=[
+        'babel.numbers',
+        # The following modules are needed by "black": https://github.com/pyinstaller/pyinstaller/issues/8270
+        '30fcd23745efe32ce681__mypyc',
+        '6b397dd64e00b5aff23d__mypyc', 'click', 'json', 'platform',
+        'mypy_extensions', 'pathspec', '_black_version', 'platformdirs'
+    ] + black_submodules + blib2to3_submodules,  # the last two required by black
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
diff --git a/requirements.txt b/requirements.txt
index e9fe051..e091bb9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-PyYAML
+pyyaml
+pyasn1==0.4.8
 git+https://github.com/etingof/pysnmp.git@master#egg=pysnmp
 pyasyncore;python_version>="3.12"
 tkcalendar