skilleter-modules 0.0.5__tar.gz → 0.0.7__tar.gz

{skilleter_modules-0.0.5/src/skilleter_modules.egg-info → skilleter_modules-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.5
+Version: 0.0.7
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_modules-0.0.5 → skilleter_modules-0.0.7}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_modules"
 
 # Version must be incremented to install updated skilleter-extras
 
-version = "0.0.5"
+version = "0.0.7"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_modules-0.0.5 → skilleter_modules-0.0.7}/src/skilleter_modules/popup.py

@@ -21,7 +21,7 @@ import curses.panel
 class PopUp():
     """ Class to enable popup windows to be used via with statements """
 
-    def __init__(self, screen, msg, colour, waitkey=False, sleep=True, centre=True, refresh=True):
+    def __init__(self, screen, msg, colour, waitkey=False, sleep=1, centre=True, refresh=True):
         """ Initialisation - just save the popup parameters """
 
         self.panel = None
@@ -30,7 +30,7 @@ class PopUp():
         self.centre = centre
         self.colour = curses.color_pair(colour)
         self.refresh = refresh
-        self.sleep = sleep and not waitkey
+        self.sleep = 0 if waitkey else sleep 
         self.waitkey = waitkey
         self.start_time = 0
 
@@ -63,6 +63,11 @@ class PopUp():
 
         self.start_time = time.monotonic()
 
+        return self
+
+    def __exit__(self, _exc_type, _exc_value, _exc_traceback):
+        """ Remove the popup """
+
         if self.waitkey:
             while True:
                 keypress = self.screen.getch()
@@ -72,15 +77,12 @@ class PopUp():
                 curses.panel.update_panels()
                 self.screen.refresh()
 
-    def __exit__(self, _exc_type, _exc_value, _exc_traceback):
-        """ Remove the popup """
-
         if self.panel:
             if self.sleep:
                 elapsed = time.monotonic() - self.start_time
 
-                if elapsed < 1:
-                    time.sleep(1 - elapsed)
+                if elapsed < self.sleep:
+                    time.sleep(self.sleep - elapsed)
 
             del self.panel
 

{skilleter_modules-0.0.5 → skilleter_modules-0.0.7/src/skilleter_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.5
+Version: 0.0.7
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

skilleter_modules-0.0.7/tests/test_popup.py

@@ -0,0 +1,70 @@
+from types import SimpleNamespace
+
+import skilleter_modules.popup as popup
+
+
+class FakePanel:
+    def __init__(self):
+        self.update_calls = 0
+        self.new_calls = []
+
+    def new_panel(self, window):
+        self.new_calls.append(window)
+        return SimpleNamespace(top=lambda: None)
+
+    def update_panels(self):
+        self.update_calls += 1
+
+
+class FakeWindow:
+    def __init__(self):
+        self.add_calls = []
+        self.bkgd_calls = []
+
+    def bkgd(self, ch, colour):
+        self.bkgd_calls.append((ch, colour))
+
+    def addstr(self, y_pos, x_pos, line, colour):
+        self.add_calls.append((y_pos, x_pos, line, colour))
+
+
+class FakeScreen:
+    def __init__(self, keys):
+        self.keys = list(keys)
+        self.getch_calls = 0
+        self.refresh_calls = 0
+
+    def getmaxyx(self):
+        return (24, 80)
+
+    def refresh(self):
+        self.refresh_calls += 1
+
+    def getch(self):
+        self.getch_calls += 1
+        return self.keys.pop(0)
+
+
+def test_waitkey_occurs_on_exit(monkeypatch):
+    fake_panel = FakePanel()
+
+    fake_curses = SimpleNamespace(
+        KEY_RESIZE=999,
+        panel=fake_panel,
+    )
+
+    fake_curses.color_pair = lambda colour: f'colour-{colour}'
+    fake_curses.newwin = lambda h, w, y, x: FakeWindow()
+
+    monkeypatch.setattr(popup, 'curses', fake_curses)
+
+    keys = [fake_curses.KEY_RESIZE, ord('a')]
+    screen = FakeScreen(keys)
+
+    with popup.PopUp(screen, 'hello', 3, waitkey=True):
+        enter_updates = fake_panel.update_calls
+        assert screen.getch_calls == 0
+
+    assert fake_panel.update_calls == enter_updates + 1
+    assert screen.getch_calls == 2
+    assert screen.refresh_calls >= 1

skilleter_modules-0.0.5/tests/test_popup.py

@@ -1,4 +0,0 @@
-import skilleter_modules.popup as popup
-
-def test_popup():
-    pass