From a5172401c9d5b7b3d7fc5f2b1b098e8942119438 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Apr 12 2018 01:22:17 +0000 Subject: Update dict calls. --- diff --git a/r2spec/r2spec_obj.py b/r2spec/r2spec_obj.py index 553e3a9..efe03f6 100644 --- a/r2spec/r2spec_obj.py +++ b/r2spec/r2spec_obj.py @@ -135,7 +135,7 @@ class Settings(object): except OSError: # os.getlogin() raises an exception when the session is not # in /var/run/utmp (non-login sessions) - if os.environ.has_key('LOGNAME'): + if 'LOGNAME' in os.environ: packager = os.environ['LOGNAME'] else: packager = pwd.getpwuid(os.getuid())[0] @@ -176,7 +176,7 @@ class Settings(object): :arg key, name of the parameter to set from the settings. :arg value, value of the parameter to set from the settings. """ - if not key in self._dict.keys(): + if key not in self._dict: raise KeyError(key) self._dict[key] = value @@ -185,7 +185,7 @@ class Settings(object): :arg key, name of the parameter to retrieve from the settings. """ - if not key in self._dict.keys(): + if key not in self._dict: raise KeyError(key) return self._dict[key] @@ -200,7 +200,7 @@ class Settings(object): else: opts = set() - for name in self._dict.iterkeys(): + for name in self._dict: value = None if name in opts: value = parser.get(section, name) diff --git a/r2spec/rpackage.py b/r2spec/rpackage.py index 485ddb7..2b00427 100644 --- a/r2spec/rpackage.py +++ b/r2spec/rpackage.py @@ -158,7 +158,7 @@ class RPackage(object): :arg key, the key to retrieve from the DESCRIPTION file of the R package """ - if key and key in self.description.keys(): + if key and key in self.description: return self.description[key] else: return '' diff --git a/r2spec/spec.py b/r2spec/spec.py index 25e1785..5922699 100644 --- a/r2spec/spec.py +++ b/r2spec/spec.py @@ -62,7 +62,7 @@ def format_dependencies(dependencies): ' ': ' ', } - for key in char.keys(): + for key in char: dependencies = dependencies.replace(key, char[key]) dep_list = []