From 9caefee9893048f169bc451cd9c454e0af668deb Mon Sep 17 00:00:00 2001 From: Markus Holtermann Date: Thu, 31 Jan 2013 19:50:34 +0100 Subject: Fixup travis#25 Signed-off-by: Christian Struck --- bvggrabber/api/__init__.py | 2 +- bvggrabber/api/scheduleddeparture.py | 4 ++-- bvggrabber/utils/format.py | 38 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'bvggrabber') diff --git a/bvggrabber/api/__init__.py b/bvggrabber/api/__init__.py index b13f756..36c913b 100644 --- a/bvggrabber/api/__init__.py +++ b/bvggrabber/api/__init__.py @@ -8,7 +8,7 @@ from math import floor from dateutil.parser import parse -from bvggrabber.utils.format import hourformat, fullformat +from bvggrabber.utils.format import fullformat, timeformat def compute_remaining(start, end): diff --git a/bvggrabber/api/scheduleddeparture.py b/bvggrabber/api/scheduleddeparture.py index 61c4b57..ba8a453 100644 --- a/bvggrabber/api/scheduleddeparture.py +++ b/bvggrabber/api/scheduleddeparture.py @@ -5,9 +5,9 @@ import datetime from bs4 import BeautifulSoup -from bvggrabber.api import QueryApi, Departure, hourformat +from bvggrabber.api import QueryApi, Departure -from bvggrabber.utils.format import int2bin +from bvggrabber.utils.format import dateformat, int2bin, timeformat SCHEDULED_API_ENDPOINT = 'http://mobil.bvg.de/Fahrinfo/bin/stboard.bin/dox' diff --git a/bvggrabber/utils/format.py b/bvggrabber/utils/format.py index d39868a..5f20e42 100644 --- a/bvggrabber/utils/format.py +++ b/bvggrabber/utils/format.py @@ -1,37 +1,26 @@ #-*- coding: utf-8 -*- -def fullformat(dt): - """Formats a datetime object as YYYY-MM-DD HH:MM:SS - - :param datetime dt: The datetime.datetime object to format - :return: A formattet string - :rtype: str - - """ - return dt.strftime('%Y-%m-%d %H:%M:%S') - - -def timeformat(dt): - """Formats a datetime object as HH:MM +def dateformat(dt): + """Formats a datetime object as dd.mm.yyyy :param datetime dt: The datetime.datetime object to format - :return: A formattet string + :return: A formatted string :rtype: str """ - return dt.strftime('%H:%M') + return dt.strftime('%d.%m.%Y') -def dateformat(dt): - """Formats a datetime object as dd.mm.yyyy +def fullformat(dt): + """Formats a datetime object as YYYY-MM-DD HH:MM:SS :param datetime dt: The datetime.datetime object to format - :return: A formattet string + :return: A formatted string :rtype: str """ - return dt.strftime('%d.%m.%Y') + return dt.strftime('%Y-%m-%d %H:%M:%S') def int2bin(i, length=8): @@ -49,3 +38,14 @@ def int2bin(i, length=8): if not isinstance(length, int): raise ValueError("expected int for length") return ('{:0>' + str(length) + 'b}').format(i) + + +def timeformat(dt): + """Formats a datetime object as HH:MM + + :param datetime dt: The datetime.datetime object to format + :return: A formatted string + :rtype: str + + """ + return dt.strftime('%H:%M') -- cgit v1.2.3