From ae8a1cb79f0027e7ef6e842c8c60cec002dc02b6 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 27 Sep 2011 12:58:23 +0200 Subject: [PATCH] Remove deprecated calls to apply() apply() has been deprecated since Python 2.3, and won't be working in python 3 anymore. Use the functional equivalent throughout. Signed-off-by: Sebastian Spaeth --- offlineimap/CustomConfig.py | 13 ++++++------- offlineimap/threadutil.py | 3 +-- offlineimap/ui/Curses.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/offlineimap/CustomConfig.py b/offlineimap/CustomConfig.py index 42132f8..dae20b6 100644 --- a/offlineimap/CustomConfig.py +++ b/offlineimap/CustomConfig.py @@ -24,26 +24,25 @@ class CustomConfigParser(SafeConfigParser): """Same as config.get, but returns the "default" option if there is no such option specified.""" if self.has_option(section, option): - return apply(self.get, [section, option] + list(args), kwargs) + return self.get(*(section, option) + args, **kwargs) else: return default def getdefaultint(self, section, option, default, *args, **kwargs): if self.has_option(section, option): - return apply(self.getint, [section, option] + list(args), kwargs) + return self.getint (*(section, option) + args, **kwargs) else: return default def getdefaultfloat(self, section, option, default, *args, **kwargs): if self.has_option(section, option): - return apply(self.getfloat, [section, option] + list(args), kwargs) + return self.getfloat(*(section, option) + args, **kwargs) else: return default def getdefaultboolean(self, section, option, default, *args, **kwargs): if self.has_option(section, option): - return apply(self.getboolean, [section, option] + list(args), - kwargs) + return self.getboolean(*(section, option) + args, **kwargs) else: return default @@ -91,9 +90,9 @@ class ConfigHelperMixin: def _confighelper_runner(self, option, default, defaultfunc, mainfunc): """Return config value for getsection()""" if default == CustomConfigDefault: - return apply(mainfunc, [self.getsection(), option]) + return mainfunc(*[self.getsection(), option]) else: - return apply(defaultfunc, [self.getsection(), option, default]) + return defaultfunc(*[self.getsection(), option, default]) def getconf(self, option, diff --git a/offlineimap/threadutil.py b/offlineimap/threadutil.py index bb3b63c..38387e9 100644 --- a/offlineimap/threadutil.py +++ b/offlineimap/threadutil.py @@ -214,8 +214,7 @@ def initInstanceLimit(instancename, instancemax): class InstanceLimitedThread(ExitNotifyThread): def __init__(self, instancename, *args, **kwargs): self.instancename = instancename - - apply(ExitNotifyThread.__init__, (self,) + args, kwargs) + super(InstanceLimitedThread, self).__init__(*args, **kwargs) def start(self): instancelimitedsems[self.instancename].acquire() diff --git a/offlineimap/ui/Curses.py b/offlineimap/ui/Curses.py index afe3acb..84b0e9a 100644 --- a/offlineimap/ui/Curses.py +++ b/offlineimap/ui/Curses.py @@ -66,7 +66,7 @@ class CursesUtil: """Perform an operation with full locking.""" self.lock() try: - apply(target, args, kwargs) + target(*args, **kwargs) finally: self.unlock()