diff options
| author | David Douard <david.douard@logilab.fr> | 2010-02-12 15:30:41 +0100 |
|---|---|---|
| committer | David Douard <david.douard@logilab.fr> | 2010-02-12 15:30:41 +0100 |
| commit | b547a4656ba90b7f8cae18bf93cf3e2049a0048d (patch) | |
| tree | 567686787d314273002db887fe8e54c62d448117 | |
| parent | c892f84eadb08dd9853f0334a1e2d219cd2dfb25 (diff) | |
| parent | 12636a562d820233654b9f7936ceb0c80b6d6366 (diff) | |
| download | logilab-common-b547a4656ba90b7f8cae18bf93cf3e2049a0048d.tar.gz | |
merge
| -rw-r--r-- | __pkginfo__.py | 6 | ||||
| -rw-r--r-- | configuration.py | 6 | ||||
| -rw-r--r-- | date.py | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | setup.py | 2 |
5 files changed, 15 insertions, 11 deletions
diff --git a/__pkginfo__.py b/__pkginfo__.py index c6db903..0eb93d5 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -1,6 +1,6 @@ """logilab.common packaging information. -:copyright: 2000-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2000-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :license: General Public License version 2 - http://www.gnu.org/licenses """ @@ -8,12 +8,10 @@ __docformat__ = "restructuredtext en" distname = 'logilab-common' modname = 'common' -numversion = (0, 46, 1) +numversion = (0, 47, 0) version = '.'.join([str(num) for num in numversion]) license = 'GPL' -copyright = '''Copyright (c) 2003-2009 LOGILAB S.A. (Paris, FRANCE). -http://www.logilab.fr/ -- mailto:contact@logilab.fr''' author = "Logilab" author_email = "devel@logilab.fr" diff --git a/configuration.py b/configuration.py index 6d03af1..7dcc0e4 100644 --- a/configuration.py +++ b/configuration.py @@ -781,9 +781,9 @@ class OptionsProviderMixIn(object): def get_option_def(self, opt_name): """return the dictionary defining an option given it's name""" assert self.options - for opt in self.options: - if opt[0] == opt_name: - return opt[1] + for option in self.options: + if option[0] == opt_name: + return option[1] raise opt.OptionError('no such option in section %r' % self.name, opt_name) @@ -9,8 +9,8 @@ __docformat__ = "restructuredtext en" import math from locale import getpreferredencoding from datetime import date, time, datetime, timedelta -from time import strptime as time_strptime, mktime -from calendar import monthrange +from time import strptime as time_strptime +from calendar import monthrange, timegm try: from mx.DateTime import RelativeDateTime, Date @@ -206,7 +206,7 @@ def todatetime(somedate): return datetime(somedate.year, somedate.month, somedate.day) def datetime2ticks(somedate): - return mktime(somedate.timetuple()) * 1000 + return timegm(somedate.timetuple()) * 1000 ONEDAY = timedelta(days=1) ONEWEEK = timedelta(days=7) diff --git a/debian/changelog b/debian/changelog index d8f91c1..c95e535 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +logilab-common (0.47.0-1) unstable; urgency=low + + * new upstream release + + -- Sylvain Thénault <sylvain.thenault@logilab.fr> Wed, 10 Feb 2010 08:42:00 +0100 + logilab-common (0.46.1-1) unstable; urgency=low * new upstream release @@ -2,7 +2,7 @@ # pylint: disable-msg=W0404,W0622,W0704,W0613,W0152 """Generic Setup script, takes package info from __pkginfo__.py file. -:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :license: General Public License version 2 - http://www.gnu.org/licenses """ |