summaryrefslogtreecommitdiff
path: root/bvggrabber/api/__init__.py
diff options
context:
space:
mode:
authorChristian Struck <christian@struck.se>2013-01-31 15:40:58 +0100
committerChristian Struck <christian@struck.se>2013-01-31 15:40:58 +0100
commit6a71307e5affd7653db04d9943c77cccf30c3886 (patch)
tree88775b2cbe07dc79e4f648444aebdf23eb400152 /bvggrabber/api/__init__.py
parentc10021e4d0e7f3cc54ecc796a4b979d92d666eb5 (diff)
downloadbvg-grabber-6a71307e5affd7653db04d9943c77cccf30c3886.tar.gz
bvg-grabber-6a71307e5affd7653db04d9943c77cccf30c3886.tar.bz2
bvg-grabber-6a71307e5affd7653db04d9943c77cccf30c3886.zip
added function dateformat and renamed function hourformat to timeformat and removed wrong enc in actualdeparture
Diffstat (limited to 'bvggrabber/api/__init__.py')
-rw-r--r--bvggrabber/api/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bvggrabber/api/__init__.py b/bvggrabber/api/__init__.py
index ba68450..b13f756 100644
--- a/bvggrabber/api/__init__.py
+++ b/bvggrabber/api/__init__.py
@@ -65,9 +65,9 @@ class Departure(object):
'end': self.end,
'line': self.line,
'now_full': fullformat(self.now),
- 'now_hour': hourformat(self.now),
+ 'now_hour': timeformat(self.now),
'when_full': fullformat(self.when),
- 'when_hour': hourformat(self.when),
+ 'when_hour': timeformat(self.when),
'remaining': round(self.remaining)})
def __eq__(self, other):
@@ -92,5 +92,5 @@ class Departure(object):
def __str__(self):
return "Start: %s, End: %s, when: %s, now: %s, line: %s" % (
- self.start, self.end, hourformat(self.when),
- hourformat(self.now), self.line)
+ self.start, self.end, timeformat(self.when),
+ timeformat(self.now), self.line)