Merge lp:~mgorven/ibid/timezone-335551 into lp:~ibid-core/ibid/old-trunk-1.6

[Michael Gorven]

[Michael Gorven (mgorven)]

Better searching for timezones and custom timezones.

[Stefano Rivera (stefanor)]

I'd still like to see some prettier output, but yes, it looks like good improvement :)

review: Approve

[Stefano Rivera (stefanor)]

Oh, if you do commit anything else, the tzutc import isn't used

[Stefano Rivera (stefanor)]

Whoops, I withdraw that approval:

os.path.relpath(path[, start])¶
Return a relative filepath to path either from the current directory or from an optional start point.

start defaults to os.curdir. Availability: Windows, Unix.

New in version 2.6.

review: Needs Fixing

[Michael Gorven (mgorven)]

On Wednesday 06 January 2010 21:52:35 Stefano Rivera wrote:
> New in version 2.6.

r849

[lp:~mgorven/ibid/timezone-335551]

849. By Michael Gorven on 2010-01-07

os.path.relpath() is only in 2.6.

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

Aiit.

review: Approve

=== modified file 'ibid/plugins/tools.py'
--- ibid/plugins/tools.py	2010-01-02 16:01:09 +0000
+++ ibid/plugins/tools.py	2010-01-07 08:10:24 +0000
@@ -3,12 +3,13 @@
 from subprocess import Popen, PIPE
 from datetime import datetime
 from os.path import exists, join
+from os import walk
 
 from dateutil.parser import parse
 from dateutil.tz import gettz, tzutc, tzlocal, tzoffset
 
 from ibid.plugins import Processor, match
-from ibid.config import Option
+from ibid.config import Option, DictOption
 from ibid.utils import file_in_path, unicode_output, human_join, format_date, json_webservice
 from ibid.compat import defaultdict
 
@@ -120,6 +121,13 @@
 MONTH_LONG = ('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December')
 OTHER_STUFF = ('am', 'pm', 'st', 'nd', 'rd', 'th')
 
+CUSTOM_ZONES = {
+    'PST': 'US/Pacific',
+    'MST': 'US/Mountain',
+    'CST': 'US/Central',
+    'EST': 'US/Eastern',
+}
+
 help['timezone'] = "Converts times between timezones."
 class TimeZone(Processor):
     u"""when is <time> <place|timezone> in <place|timezone>
@@ -127,13 +135,16 @@
     feature = 'timezone'
 
     zoneinfo = Option('zoneinfo', 'Timezone info directory', '/usr/share/zoneinfo')
+    custom_zones = DictOption('timezones', 'Custom timezone names', CUSTOM_ZONES)
 
     countries = {}
-    timezones = defaultdict(list)
+    timezones = {}
+    lowerzones = {}
 
     def setup(self):
         iso3166 = join(self.zoneinfo, 'iso3166.tab')
         if exists(iso3166):
+            self.countries = {}
             for line in open(iso3166).readlines():
                 if not line.startswith('#'):
                     code, name = line.strip().split('\t')
@@ -141,6 +152,7 @@
 
         zones = join(self.zoneinfo, 'zone.tab')
         if exists(zones):
+            self.timezones = defaultdict(list)
             for line in open(zones).readlines():
                 if not line.startswith('#'):
                     code, coordinates, zone = line.strip().split('\t', 2)
@@ -148,44 +160,59 @@
                         zone, comment = zone.split('\t')
                     self.timezones[code].append(zone)
 
+        lowerzones = {}
+        for path, directories, filenames in walk(self.zoneinfo):
+            if path.replace(self.zoneinfo, '').lstrip('/').split('/')[0] not in ('posix', 'right'):
+                for filename in filenames:
+                    name = join(path, filename).replace(self.zoneinfo, '').lstrip('/')
+                    self.lowerzones[name.lower().replace('etc/', '')] = name
+
     def _find_timezone(self, string):
+        for name, zonename in self.custom_zones.items():
+            if string.lower() == name.lower():
+                return gettz(zonename)
+
+        zone = gettz(string)
+        if zone:
+            return zone
+
+        zone = gettz(string.upper())
+        if zone:
+            return zone
+
+        if string.lower() in self.lowerzones:
+            return gettz(self.lowerzones[string.lower()])
+
         ccode = None
-
-        if string.upper() in ('GMT', 'UTC', 'UCT', 'ZULU'):
-            string = 'UTC'
-        zone = gettz(string)
-
-        if not zone:
-            for code, name in self.countries.items():
-                if name.lower() == string.lower():
-                    ccode = code
-            if not ccode:
-                if string.replace('.', '').upper() in self.timezones:
-                    ccode = string.replace('.', '').upper()
-
-            if ccode:
-                if len(self.timezones[ccode]) == 1:
-                    zone = gettz(self.timezones[ccode][0])
-                else:
-                    raise TimezoneException(u'%s has multiple timezones: %s' % (self.countries[ccode], human_join(self.timezones[ccode])))
-
+        for code, name in self.countries.items():
+            if name.lower() == string.lower():
+                ccode = code
+        if not ccode:
+            if string.replace('.', '').upper() in self.timezones:
+                ccode = string.replace('.', '').upper()
+
+        if ccode:
+            if len(self.timezones[ccode]) == 1:
+                return gettz(self.timezones[ccode][0])
             else:
-                possibles = []
-                for zones in self.timezones.values():
-                    for name in zones:
-                        if string.replace(' ', '_').lower() in name.lower():
-                            possibles.append(name)
-
-                if len(possibles) == 1:
-                    zone = gettz(possibles[0])
-                elif len(possibles) > 1:
-                    raise TimezoneException(u'Multiple timezones found: %s' % (human_join(possibles)))
-                else:
-                    zone = self._geonames_lookup(string)
-                    if not zone:
-                        raise TimezoneException(u"I don't know about the %s timezone" % (string,))
-
-        return zone
+                raise TimezoneException(u'%s has multiple timezones: %s' % (self.countries[ccode], human_join(self.timezones[ccode])))
+
+        possibles = []
+        for zones in self.timezones.values():
+            for name in zones:
+                if string.replace(' ', '_').lower() in [part.lower() for part in name.split('/')]:
+                    possibles.append(name)
+
+        if len(possibles) == 1:
+            return gettz(possibles[0])
+        elif len(possibles) > 1:
+            raise TimezoneException(u'Multiple timezones found: %s' % (human_join(possibles)))
+
+        zone = self._geonames_lookup(string)
+        if zone:
+            return zone
+
+        raise TimezoneException(u"I don't know about the %s timezone" % (string,))
 
     def _geonames_lookup(self, place):
         search = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': 1})
@@ -202,9 +229,13 @@
             offset = timezone['rawOffset']
             return tzoffset('UTC%s%s' % (offset>=0 and '+' or '', offset), offset*3600)
 
-    @match(r'^when\s+is\s+((?:[0-9.:/hT -]|%s)+)(?:\s+(.+))?\s+in\s+(.+)$' % '|'.join(MONTH_SHORT+MONTH_LONG+OTHER_STUFF))
+    @match(r'^when\s+is\s+((?:[0-9.:/hT -]|%s)+)(?:\s+in)?(?:\s+(.+))?\s+in\s+(.+)$' % '|'.join(MONTH_SHORT+MONTH_LONG+OTHER_STUFF))
     def convert(self, event, time, from_, to):
-        source = time and parse(time) or datetime.now()
+        try:
+            source = time and parse(time) or datetime.now()
+        except ValueError:
+            event.addresponse(u"That's not a real time")
+            return
 
         try:
             if from_: