Changeset 25:8e33103a7e36 in stamper

Timestamp:

Jul 30, 2014, 4:27:41 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Set two _FORMAT variables for DATE and DATETIME objects.
This naming is more consistent, now that we use both date and
datetime objects.

File:

• stamper/stamper.py (modified) (2 diffs)

stamper/stamper.py

@@ -9 +9 @@
 
 STAMPS_FILE = expanduser('~/.workstamps.json')
-DATE_FORMAT = '%Y-%m-%d %H:%M'
+DATE_FORMAT = '%Y-%m-%d'
+DATETIME_FORMAT = '%Y-%m-%d %H:%M'
 HOURS_DAY = 8
 SECS_DAY = HOURS_DAY * 60 * 60
@@ -51 +52 @@
 
     def worktime(self, start, end):
-        worktime = (datetime.strptime(end, DATE_FORMAT) -
-                    datetime.strptime(start, DATE_FORMAT))
+        worktime = (datetime.strptime(end, DATETIME_FORMAT) -
+                    datetime.strptime(start, DATETIME_FORMAT))
         return worktime.seconds