Whym has uploaded a new change for review.
https://gerrit.wikimedia.org/r/122099
Change subject: Use pytz for daylight saving time and remove tzoneFixedOffset
......................................................................
Use pytz for daylight saving time and remove tzoneFixedOffset
Change-Id: I932fe76122a30a849ec131067b1c906142f07205
---
M pywikibot/textlib.py
M scripts/archivebot.py
M tests/timestripper_tests.py
3 files changed, 6 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/99/122099/1
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index fdcda92..3ad074f 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -22,6 +22,7 @@
import datetime
import re
import sys
+import pytz
if sys.version_info[0] == 2:
from HTMLParser import HTMLParser
else:
@@ -1131,34 +1132,6 @@
# Time parsing functionality (Archivebot)
#---------------------------------
-class tzoneFixedOffset(datetime.tzinfo):
- """
- Class building tzinfo objects for fixed-offset time zones
-
- @offset: a number indicating fixed offset in minutes east from UTC
- @name: a string with name of the timezone"""
-
- def __init__(self, offset, name):
- self.__offset = datetime.timedelta(minutes=offset)
- self.__name = name
-
- def utcoffset(self, dt):
- return self.__offset
-
- def tzname(self, dt):
- return self.__name
-
- def dst(self, dt):
- return ZERO
-
- def __repr__(self):
- return "%s(%s, %s)" % (
- self.__class__.__name__,
- self.__offset.days * 86400 + self.__offset.seconds,
- self.__name
- )
-
-
class TimeStripper(object):
"""
Find timetstamp in page text and returns it as timezone aware datetime
object
@@ -1253,8 +1226,7 @@
pass
#find timezone
- dateDict['tzinfo'] =
tzoneFixedOffset(self.site.siteinfo['timeoffset'],
-
self.site.siteinfo['timezone'])
+ dateDict['tzinfo'] = pytz.timezone(self.site.siteinfo['timezone'])
timestamp = datetime.datetime(**dateDict)
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index c970c5f..eeb3ad1 100644
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -74,7 +74,7 @@
#
import pywikibot
from pywikibot import i18n, pagegenerators
-from pywikibot.textlib import tzoneFixedOffset, TimeStripper
+from pywikibot.textlib import TimeStripper
import datetime
import time
import os
diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py
index f72e59f..be314cd 100644
--- a/tests/timestripper_tests.py
+++ b/tests/timestripper_tests.py
@@ -12,9 +12,9 @@
import datetime
import pywikibot
+from pytz import timezone
from utils import PywikibotTestCase, unittest
-from pywikibot.textlib import TimeStripper, tzoneFixedOffset
-
+from pywikibot.textlib import TimeStripper
class TestTimeStripper(unittest.TestCase):
"""Test cases for Link objects"""
@@ -53,7 +53,7 @@
txtNoMatch = u'3 March 2010 19:48 (CET) 7 March 2010 19:48 (CET)'
res = datetime.datetime(2010, 2, 7, 19, 48,
- tzinfo=tzoneFixedOffset(60, 'Europe/Paris'))
+ tzinfo=timezone('Europe/Paris'))
self.assertEqual(self.ts.timestripper(txtMatch), res)
self.assertEqual(self.ts.timestripper(txtNoMatch), None)
--
To view, visit https://gerrit.wikimedia.org/r/122099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I932fe76122a30a849ec131067b1c906142f07205
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Whym <w...@whym.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
