[Checkins] SVN: z3ext.formatter/trunk/src/z3ext/formatter/humandatetime.py fix humandatetime formatter

[Nikolay Kim]

Log message for revision 102625:
  fix humandatetime formatter

Changed:
  U   z3ext.formatter/trunk/src/z3ext/formatter/humandatetime.py

-=-
Modified: z3ext.formatter/trunk/src/z3ext/formatter/humandatetime.py
===================================================================
--- z3ext.formatter/trunk/src/z3ext/formatter/humandatetime.py	2009-08-10 11:27:27 UTC (rev 102624)
+++ z3ext.formatter/trunk/src/z3ext/formatter/humandatetime.py	2009-08-10 11:59:08 UTC (rev 102625)
@@ -20,11 +20,9 @@
 from zope import interface, component
 from zope.i18n import translate
 from zope.component import getUtility
-from zope.interface.common.idatetime import ITZInfo
 from zope.publisher.interfaces.http import IHTTPRequest
 
-from z3ext.formatter.interfaces import _, \
-    IFormatter, IFormatterFactory, IFormatterConfiglet
+from interfaces import IFormatter, IFormatterFactory, IFormatterConfiglet
 
 
 class HumanDatetimeFormatter(object):
@@ -35,21 +33,14 @@
 
     def format(self, value):
         configlet = getUtility(IFormatterConfiglet)
-        tz = None
-        if configlet.principalTimezone:
-            tz = ITZInfo(self.request.principal, None)
+        tz = timezone(configlet.timezone)
 
-        if tz is None:
-            tz = timezone(configlet.timezone)
-
         if value.tzinfo is None:
             value = datetime(value.year, value.month, value.day, value.hour,
-                             value.minute, value.second, value.microsecond, utc)
+                             value.minute, value.second, value.microsecond, tz)
 
         value = value.astimezone(tz)
 
-        timezoneFormat = configlet.timezoneFormat
-
         d1 = datetime.now(utc)
         d2 = value.astimezone(utc)