Skip to content

Commit 6cf03e2

Browse files
authored
Merge pull request #117 from SmithSamuelM/main
Adding support for signing to Memoer, Fix deprecated utcnow()
2 parents 9947825 + f77c492 commit 6cf03e2

File tree

17 files changed

+2570
-500
lines changed

17 files changed

+2570
-500
lines changed

src/hio/base/multidoing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ def serviceRxMemos(self):
568568
Override in subclass to handle result(s) and put them somewhere
569569
"""
570570
while self.rxms:
571-
memo, src, vid = self._serviceOneRxMemo()
571+
memo, src, oid = self._serviceOneRxMemo()
572572
self.logger.debug("Boss Peer RX: name=%s rx from src=%s memo=%s.",
573573
self.name, src, memo)
574574

@@ -797,7 +797,7 @@ def serviceRxMemos(self):
797797
Override in subclass to handle result(s) and put them somewhere
798798
"""
799799
while self.rxms:
800-
memo, src, vid = self._serviceOneRxMemo()
800+
memo, src, oid = self._serviceOneRxMemo()
801801
self.logger.debug("Hand Peer RX: name=%s rx from src=%s memo=%s.",
802802
self.name, src, memo)
803803

src/hio/base/tyming.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,16 @@ class Tymee(hioing.Mixin):
104104
Tymee has .tyme property that returns the artificial or simulated or cycle time
105105
from its referenced Tymist instance ._tymist.
106106
107+
Class Attributes:
108+
107109
Attributes:
108110
109111
Properties:
110-
.tyme (float | None): relative cycle time of associated Tymist which is
112+
tyme (float | None): relative cycle time of associated Tymist which is
111113
provided by calling .tymth function wrapper closure which is obtained
112114
from Tymist.tymen().
113115
None means not assigned yet.
114-
.tymth (Callable | None): function wrapper closure returned by
116+
tymth (Callable | None): function wrapper closure returned by
115117
Tymist.tymen() method. When .tymth is called it returns associated
116118
Tymist.tyme. Provides injected dependency on Tymist cycle tyme base.
117119
None means not assigned yet.
@@ -120,7 +122,7 @@ class Tymee(hioing.Mixin):
120122
.wind injects ._tymth dependency from associated Tymist to get its .tyme
121123
122124
Hidden:
123-
._tymth is injected function wrapper closure returned by .tymen() of
125+
_tymth is injected function wrapper closure returned by .tymen() of
124126
associated Tymist instance that returns Tymist .tyme. when called.
125127
126128
"""
@@ -184,17 +186,17 @@ class Tymer(Tymee):
184186
Attributes:
185187
186188
Inherited Properties:
187-
.tyme is float relative cycle time of associated Tymist .tyme obtained
189+
tyme is float relative cycle time of associated Tymist .tyme obtained
188190
via injected .tymth function wrapper closure.
189-
.tymth is function wrapper closure returned by Tymist .tymeth() method.
191+
tymth is function wrapper closure returned by Tymist .tymeth() method.
190192
When .tymth is called it returns associated Tymist .tyme.
191193
.tymth provides injected dependency on Tymist tyme base.
192194
193195
Properties:
194-
.duration = tyme duration of tymer in seconds from ._start to ._stop
195-
.elaspsed = tyme elasped in seconds since ._start
196-
.remaining = tyme remaining in seconds until ._stop
197-
.expired = True if expired, False otherwise, i.e. .tyme >= ._stop
196+
duration (float): tyme duration in seconds from ._start to ._stop
197+
elaspsed (float): tyme elasped in seconds since ._start
198+
remaining (float): tyme remaining in seconds until ._stop
199+
expired (bool): True if expired, False otherwise, i.e. .tyme >= ._stop
198200
199201
Inherited Methods:
200202
.wind is injects ._tymth dependency
@@ -204,10 +206,10 @@ class Tymer(Tymee):
204206
.restart() = restart tymer at last ._stop so no time lost
205207
206208
Hidden:
207-
._tymth is injected function wrapper closure returned by .tymen() of
209+
_tymth (closure): injected function wrapper closure returned by .tymen() of
208210
associated Tymist instance that returns Tymist .tyme. when called.
209-
._start is start tyme in seconds
210-
._stop is stop tyme in seconds
211+
_start (float): start tyme in seconds
212+
_stop (float): stop tyme in seconds
211213
212214
"""
213215
Duration = 0.0 # default duration when not provided

src/hio/core/coring.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def arpCreate(ether, host, interface="en0", temp=True):
8383
"""
8484
temp = "temp" if temp else ""
8585
console.terse("{0}: Creating {1} arp entry for {2} at {3} on {4}\n".format(
86-
datetime.datetime.utcnow().isoformat(),
86+
datetime.datetime.now(datetime.UTC).isoformat(),
8787
temp,
8888
ether,
8989
host,
@@ -103,7 +103,7 @@ def arpCreate(ether, host, interface="en0", temp=True):
103103
check=True)
104104
except subprocess.SubprocessError as ex:
105105
console.terse("{0}: Failed Creation of {1} arp entry for {2} at {3} on {4}\n".format(
106-
datetime.datetime.utcnow().isoformat(),
106+
datetime.datetime.now(datetime.UTC).isoformat(),
107107
temp,
108108
ether,
109109
host,

src/hio/core/http/httping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def httpDate1123(dt):
277277
278278
The supplied date must be in UTC.
279279
import datetime
280-
httpDate1123(datetime.datetime.utcnow())
280+
httpDate1123(datetime.datetime.now(datetime.UTC))
281281
'Wed, 30 Sep 2015 14:29:18 GMT'
282282
"""
283283
weekday = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][dt.weekday()]

src/hio/core/http/serving.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ def build(self):
353353
self.headers[u'server'] = "Ioflo WSGI Server"
354354

355355
if u'date' not in self.headers: # create Date header
356-
self.headers[u'date'] = httping.httpDate1123(datetime.datetime.utcnow())
356+
self.headers[u'date'] = httping.httpDate1123(datetime.datetime.now(datetime.UTC))
357357

358358
if self.chunkable and ('transfer-encoding' not in self.headers or
359359
self.headers['transfer-encoding'] == 'chunked'):
@@ -949,7 +949,7 @@ def build(self,
949949
self.headers[u'server'] = "Ioflo Server"
950950

951951
if u'date' not in self.headers: # create Date header
952-
self.headers[u'date'] = httping.httpDate1123(datetime.datetime.utcnow())
952+
self.headers[u'date'] = httping.httpDate1123(datetime.datetime.now(datetime.UTC))
953953

954954
if self.data is not None:
955955
body = json.dumps(self.data, separators=(',', ':')).encode("utf-8")

src/hio/core/memo/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""
55

66

7-
from .memoing import (Versionage, Sizage, GramDex, SGDex,
7+
from .memoing import (Versionage, Sizage, GramDex, SGDex, Keyage,
88
openMemoer, Memoer, MemoerDoer,
9-
openTM, TymeeMemoer, TymeeMemoerDoer)
9+
openSM, SureMemoer, SureMemoerDoer)
1010

0 commit comments

Comments
 (0)