Skip to content

Commit 1f243c9

Browse files
authored
Fix typos in disconnect functions (#48)
* Fix typos in disconnect functions * Fix unit tests * Add Python 3.14 to tests
1 parent c107fd3 commit 1f243c9

5 files changed

Lines changed: 595 additions & 567 deletions

File tree

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
matrix:
3737
os: [ubuntu-latest] #, mac-latest]
38-
python-version: ["3.10", "3.11", "3.12", "3.13"]
38+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
3939
runs-on: ${{ matrix.os }}
4040
continue-on-error: true
4141
steps:

p4pillon/composite_handler.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ def on_first_connect(self, pv: SharedPV):
8686
def onFirstConnect(self, pv: Value):
8787
self.on_first_connect(pv)
8888

89-
def on_last_connect(self, pv: SharedPV):
89+
def on_last_disconnect(self, pv: SharedPV):
9090
"""Called when the last client channel is closed."""
9191
for handler in self.values():
92-
handler.onFirstConnect(pv)
92+
handler.onLastDisconnect(pv)
9393

9494
def onLastDisconnect(self, pv: Value):
95-
self.on_last_connect(pv)
95+
self.on_last_disconnect(pv)
9696

9797
def close(self, pv: SharedPV):
9898
for handler in self.values():

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,4 @@ extend-select = [
8484
"I", # isort
8585
]
8686

87-
[tool.uv.sources]
88-
p4p = { git = "https://github.com/epics-base/p4p" }
89-
9087

tests/unit/test_composite_handler.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def rpc(self, pv, op):
2929
def onFirstConnect(self, pv):
3030
self.calls.append(("onFirstConnect", pv))
3131

32+
def onLastDisconnect(self, pv):
33+
self.calls.append(("onLastDisconnect", pv))
34+
3235
def close(self, pv):
3336
self.calls.append(("close", pv))
3437

@@ -136,18 +139,18 @@ def test_onFirstConnect_deprecated(self):
136139
self.comp.onFirstConnect(self.pv)
137140
self.assertEqual(self.h1.calls[0], ("onFirstConnect", self.pv))
138141

139-
def test_on_last_connect_calls_all(self):
140-
self.comp.on_last_connect(self.pv)
141-
self.assertEqual(self.h1.calls[0], ("onFirstConnect", self.pv))
142-
self.assertEqual(self.h2.calls[0], ("onFirstConnect", self.pv))
142+
def test_on_last_disconnect_calls_all(self):
143+
self.comp.on_last_disconnect(self.pv)
144+
self.assertEqual(self.h1.calls[0], ("onLastDisconnect", self.pv))
145+
self.assertEqual(self.h2.calls[0], ("onLastDisconnect", self.pv))
143146

144-
def test_on_last_connect_no_handlers(self):
147+
def test_on_last_disconnect_no_handlers(self):
145148
comp = CompositeHandler()
146-
comp.on_last_connect(self.pv) # Should not raise
149+
comp.on_last_disconnect(self.pv) # Should not raise
147150

148151
def test_onLastDisconnect_deprecated(self):
149152
self.comp.onLastDisconnect(self.pv)
150-
self.assertEqual(self.h1.calls[0], ("onFirstConnect", self.pv))
153+
self.assertEqual(self.h1.calls[0], ("onLastDisconnect", self.pv))
151154

152155
def test_close_calls_all(self):
153156
self.comp.close(self.pv)

0 commit comments

Comments
 (0)