Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Added test_format.py, added floating point formatting to format, and fixed a bug in the %t format.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-02-01 11:57:50 +00:00
parent 2a62e79fab
commit f6e132dde4
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf.py
View File

@ -285,7 +285,7 @@ def timestamp(t):
if t is None: if t is None:
t = time.time() t = time.time()
t = time.localtime(t) t = time.localtime(t)
format = conf.get(supybot.reply.format.time, dynamic.channel) format = get(supybot.reply.format.time, dynamic.channel)
return time.strftime(format, t) return time.strftime(format, t)
utils.str.timestamp = timestamp utils.str.timestamp = timestamp

7
src/utils/str.py
View File

@ -338,7 +338,7 @@ def timestamp(t):
t = time.time() t = time.time()
return time.ctime(t) return time.ctime(t)
_formatRe = re.compile('%([bfhiLnpqstu%])') _formatRe = re.compile('%(\.\d+f|[bfhiLnpqstu%])')
def format(s, *args, **kwargs): def format(s, *args, **kwargs):
"""w00t. """w00t.
@ -364,9 +364,8 @@ def format(s, *args, **kwargs):
elif char == 'i': elif char == 'i':
# XXX Improve me! # XXX Improve me!
return str(args.pop()) return str(args.pop())
elif char == 'f': elif char.endswith('f'):
# XXX Improve me! return ('%'+char) % args.pop()
return str(args.pop())
elif char == 'b': elif char == 'b':
return be(args.pop()) return be(args.pop())
elif char == 'h': elif char == 'h':

40
test/test_format.py Normal file
View File

@ -0,0 +1,40 @@
###
# Copyright (c) 2005, Jeremiah Fincher
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions, and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions, and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of the author of this software nor the name of
# contributors to this software may be used to endorse or promote products
# derived from this software without specific prior written consent.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
###
from supybot.test import *
class FormatTestCase(SupyTestCase):
def test_t_acceptsNone(self):
self.failUnless(format('%t', None))
def testFloatingPoint(self):
self.assertEqual(format('%.2f', 0.12345), '0.12')
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: