From b693555c877ad01b54357a038a8ae94107978e91 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 10 Dec 2018 12:44:10 -0500 Subject: [PATCH] 2018-12-10 Fred Gleason * Fixed a bug in 'PyPAD.Update::resolvePadFields()' that caused incorrect rendering of 'dddd' placeholders when processing '%d(
)' wildcards. --- ChangeLog | 4 ++++ apis/PyPAD/api/PyPAD.py | 33 ++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44829f2b..566c306f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18150,3 +18150,7 @@ * Added a 'cutNumber' field to the JSON PAD 'now' and 'next' objects. * Added a 'PyPAD.FIELD_CUT_NUMBER' define. * Added 'api/PyPAD/examples/pypad_test.py'. +2018-12-10 Fred Gleason + * Fixed a bug in 'PyPAD.Update::resolvePadFields()' that caused + incorrect rendering of 'dddd' placeholders when processing '%d(
)' + wildcards. diff --git a/apis/PyPAD/api/PyPAD.py b/apis/PyPAD/api/PyPAD.py index 42615e7d..df3c134f 100644 --- a/apis/PyPAD/api/PyPAD.py +++ b/apis/PyPAD/api/PyPAD.py @@ -165,19 +165,9 @@ class Update(object): dt_pattern=pattern[3:-1] try: - dt_pattern=dt_pattern.replace('dddd',dt.strftime('%A')) - dt_pattern=dt_pattern.replace('ddd',dt.strftime('%a')) - dt_pattern=dt_pattern.replace('dd',dt.strftime('%d')) - dt_pattern=dt_pattern.replace('d',str(dt.day)) - - dt_pattern=dt_pattern.replace('MMMM',dt.strftime('%B')) - dt_pattern=dt_pattern.replace('MMM',dt.strftime('%b')) - dt_pattern=dt_pattern.replace('MM',dt.strftime('%m')) - dt_pattern=dt_pattern.replace('M',str(dt.month)) - - dt_pattern=dt_pattern.replace('yyyy',dt.strftime('%Y')) - dt_pattern=dt_pattern.replace('yy',dt.strftime('%y')) - + # + # Process Times + # miltime=(dt_pattern.find('ap')<0)and(dt_pattern.find('AP')<0) if not miltime: if dt.hour<13: @@ -201,6 +191,23 @@ class Update(object): dt_pattern=dt_pattern.replace('ss',dt.strftime('%S')) dt_pattern=dt_pattern.replace('s',str(dt.second)) + + # + # Process Dates + # + dt_pattern=dt_pattern.replace('MMMM',dt.strftime('%B')) + dt_pattern=dt_pattern.replace('MMM',dt.strftime('%b')) + dt_pattern=dt_pattern.replace('MM',dt.strftime('%m')) + dt_pattern=dt_pattern.replace('M',str(dt.month)) + + dt_pattern=dt_pattern.replace('dddd',dt.strftime('%A')) + dt_pattern=dt_pattern.replace('ddd',dt.strftime('%a')) + dt_pattern=dt_pattern.replace('dd',dt.strftime('%d')) + dt_pattern=dt_pattern.replace('d',str(dt.day)) + + dt_pattern=dt_pattern.replace('yyyy',dt.strftime('%Y')) + dt_pattern=dt_pattern.replace('yy',dt.strftime('%y')) + except AttributeError: string=string.replace(pattern,'') return string