diff options
| -rw-r--r-- | configuration.py | 7 | ||||
| -rw-r--r-- | decorators.py | 11 | ||||
| -rw-r--r-- | deprecation.py | 15 | ||||
| -rw-r--r-- | shellutils.py | 1 |
4 files changed, 19 insertions, 15 deletions
diff --git a/configuration.py b/configuration.py index b555529..271afcc 100644 --- a/configuration.py +++ b/configuration.py @@ -878,9 +878,8 @@ def merge_options(options): for i in range(len(options)-1, -1, -1): optname, optdict = options[i] if optname in alloptions: - options.pop(alloptions[optname][1]) - alloptions[optname][0].update(optdict) - alloptions[optname][1] = i + options.pop(i) + alloptions[optname].update(optdict) else: - alloptions[optname] = [optdict, i] + alloptions[optname] = optdict return tuple(options) diff --git a/decorators.py b/decorators.py index 7cf5a6c..fb9c818 100644 --- a/decorators.py +++ b/decorators.py @@ -1,6 +1,3 @@ -# Copyright (c) 2006-2007 LOGILAB S.A. (Paris, FRANCE). -# http://www.logilab.fr/ -- mailto:contact@logilab.fr -# # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later @@ -13,7 +10,13 @@ # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""this module contains some function/method decorators""" +"""this module contains some function/method decorators + +:author: Logilab +:copyright: 2006-2008 LOGILAB S.A. (Paris, FRANCE) +:contact: http://www.logilab.fr/ -- mailto:python-projects@logilab.org +""" +__docformat__ = "restructuredtext en" # XXX rewrite so we can use the decorator syntax when keyarg has to be specified diff --git a/deprecation.py b/deprecation.py index 3513954..c140055 100644 --- a/deprecation.py +++ b/deprecation.py @@ -1,19 +1,22 @@ -# Copyright (c) 2005-2008 LOGILAB S.A. (Paris, FRANCE). -# http://www.logilab.fr/ -- mailto:contact@logilab.fr - # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. - +# # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""Deprecation utilities""" +"""Deprecation utilities + +:author: Logilab +:copyright: 2006-2008 LOGILAB S.A. (Paris, FRANCE) +:contact: http://www.logilab.fr/ -- mailto:python-projects@logilab.org +""" +__docformat__ = "restructuredtext en" from warnings import warn diff --git a/shellutils.py b/shellutils.py index 99c305f..4417d56 100644 --- a/shellutils.py +++ b/shellutils.py @@ -18,7 +18,6 @@ scripts :copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE) :contact: http://www.logilab.fr/ -- mailto:python-projects@logilab.org """ - __docformat__ = "restructuredtext en" import os |