Revision: 6457
Author: nicdumz
Date: 2009-03-01 05:23:10 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Adding two conversion functions, to and from python's datetime/mediawiki timestamp.
Modified Paths:
--------------
branches/rewrite/pywikibot/date.py
branches/rewrite/pywikibot/site.py
Modified: branches/rewrite/pywikibot/date.py
===================================================================
--- branches/rewrite/pywikibot/date.py 2009-03-01 03:26:14 UTC (rev 6456)
+++ branches/rewrite/pywikibot/date.py 2009-03-01 05:23:10 UTC (rev 6457)
@@ -1509,7 +1509,13 @@
else:
return formats['YearAD'][lang](year)
+mediawikiFormat = "%Y%m%d%H%M%S"
+def timestamp2datetime(ts):
+ from datetime import datetime
+ return datetime.strptime(ts, mediawikiFormat)
+def datetime2timestamp(dt):
+ return dt.strftime(mediawikiFormat)
#
#
Modified: branches/rewrite/pywikibot/site.py
===================================================================
--- branches/rewrite/pywikibot/site.py 2009-03-01 03:26:14 UTC (rev 6456)
+++ branches/rewrite/pywikibot/site.py 2009-03-01 05:23:10 UTC (rev 6457)
@@ -28,7 +28,6 @@
import sys
import threading
import urllib
-from datetime import datetime
logger = logging.getLogger("wiki.site")
@@ -793,7 +792,8 @@
def getcurrenttime(self):
"""Returns a datetime object representing server time"""
ts = self.getcurrenttimestamp()
- return datetime.strptime(ts, "%Y%m%d%H%M%S")
+ from date import timestamp2datetime
+ return timestamp2datetime(ts)
def _getsiteinfo(self):
"""Retrieve siteinfo and namespaces from site."""