Merge 58a61cf into d732b00

spyoungtech · May 17, 2023 · a1d6611 · a1d6611
2 parents d732b00 + 58a61cf
commit a1d6611
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/ahk/_async/transport.py b/ahk/_async/transport.py
@@ -632,9 +632,17 @@ def __init__(
         self.__template: jinja2.Template
         self._jinja_env: jinja2.Environment
         if jinja_loader is None:
-            self._jinja_env = jinja2.Environment(
-                loader=jinja2.PackageLoader('ahk', 'templates'), trim_blocks=True, autoescape=False
-            )
+            try:
+                loader: jinja2.BaseLoader
+                loader = jinja2.PackageLoader('ahk', 'templates')
+            except ValueError:
+                # see: https://github.com/spyoungtech/ahk/issues/201
+                warnings.warn(
+                    'Jinja could not find templates with PackageLoader. Falling back to BaseLoader',
+                    category=UserWarning,
+                )
+                loader = jinja2.BaseLoader()
+            self._jinja_env = jinja2.Environment(loader=loader, trim_blocks=True, autoescape=False)
         else:
             self._jinja_env = jinja2.Environment(loader=jinja_loader, trim_blocks=True, autoescape=False)
         try:

diff --git a/ahk/_hotkey.py b/ahk/_hotkey.py
@@ -124,9 +124,17 @@ def __init__(self, executable_path: str, default_ex_handler: Optional[Callable[[
         self._callback_queue: Queue[Union[str, Type[STOP]]] = Queue()
         self._listener_thread: Optional[threading.Thread] = None
         self._dispatcher_thread: Optional[threading.Thread] = None
-        self._jinja_env: jinja2.Environment = jinja2.Environment(
-            loader=jinja2.PackageLoader('ahk', 'templates'), autoescape=False
-        )
+        loader: jinja2.BaseLoader
+        try:
+            loader = jinja2.PackageLoader('ahk', 'templates')
+        except ValueError:
+            # see: https://github.com/spyoungtech/ahk/issues/201
+            warnings.warn(
+                'Jinja could not find templates with PackageLoader. Falling back to BaseLoader',
+                category=UserWarning,
+            )
+            loader = jinja2.BaseLoader()
+        self._jinja_env: jinja2.Environment = jinja2.Environment(loader=loader, autoescape=False)
         self._template: jinja2.Template
         try:
             self._template = self._jinja_env.get_template('hotkeys.ahk')

diff --git a/ahk/_sync/transport.py b/ahk/_sync/transport.py
@@ -606,9 +606,17 @@ def __init__(
         self.__template: jinja2.Template
         self._jinja_env: jinja2.Environment
         if jinja_loader is None:
-            self._jinja_env = jinja2.Environment(
-                loader=jinja2.PackageLoader('ahk', 'templates'), trim_blocks=True, autoescape=False
-            )
+            try:
+                loader: jinja2.BaseLoader
+                loader = jinja2.PackageLoader('ahk', 'templates')
+            except ValueError:
+                # see: https://github.com/spyoungtech/ahk/issues/201
+                warnings.warn(
+                    'Jinja could not find templates with PackageLoader. Falling back to BaseLoader',
+                    category=UserWarning,
+                )
+                loader = jinja2.BaseLoader()
+            self._jinja_env = jinja2.Environment(loader=loader, trim_blocks=True, autoescape=False)
         else:
             self._jinja_env = jinja2.Environment(loader=jinja_loader, trim_blocks=True, autoescape=False)
         try:

diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 
 name = ahk
-version = 1.1.2
+version = 1.1.3rc1
 author_email = spencer.young@spyoung.com
 author = Spencer Young
 description = A Python wrapper for AHK