Merge pull request #191 from DimitriPapadopoulos/refurb

Apply refurb suggestions

Author: jaraco

distutils/_collections.py

@@ -185,7 +185,7 @@ def bounds(self):
         return (sorted_keys[RangeMap.first_item], sorted_keys[RangeMap.last_item])
 
     # some special values for the RangeMap
-    undefined_value = type(str('RangeValueUndefined'), (), {})()
+    undefined_value = type('RangeValueUndefined', (), {})()
 
     class Item(int):
         "RangeMap Item"

distutils/_msvccompiler.py

@@ -413,8 +413,7 @@ def compile(  # noqa: C901
             args = [self.cc] + compile_opts + pp_opts
             if add_cpp_opts:
                 args.append('/EHsc')
-            args.append(input_opt)
-            args.append("/Fo" + obj)
+            args.extend((input_opt, "/Fo" + obj))
             args.extend(extra_postargs)
 
             try:

distutils/bcppcompiler.py

@@ -294,8 +294,7 @@ def link(  # noqa: C901
                     ld_args.append(libfile)
 
             # some default libraries
-            ld_args.append('import32')
-            ld_args.append('cw32mt')
+            ld_args.extend(('import32', 'cw32mt'))
 
             # def file for export symbols
             ld_args.extend([',', def_file])

distutils/command/install.py

@@ -609,7 +609,7 @@ def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
-                if os.name == 'posix' or os.name == 'nt':
+                if os.name in ('posix', 'nt'):
                     val = os.path.expanduser(val)
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)

distutils/core.py

@@ -132,7 +132,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # our Distribution (see below).
     klass = attrs.get('distclass')
     if klass:
-        del attrs['distclass']
+        attrs.pop('distclass')
     else:
         klass = Distribution
 

distutils/cygwinccompiler.py

@@ -133,7 +133,7 @@ def gcc_version(self):
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         """Compiles the source by spawning GCC and windres if needed."""
-        if ext == '.rc' or ext == '.res':
+        if ext in ('.rc', '.res'):
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
                 self.spawn(["windres", "-i", src, "-o", obj])

distutils/dir_util.py

@@ -227,7 +227,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
             if abspath in _path_created:
-                del _path_created[abspath]
+                _path_created.pop(abspath)
         except OSError as exc:
             log.warning("error removing %s: %s", directory, exc)
 

distutils/dist.py

@@ -700,7 +700,7 @@ def handle_display_options(self, option_order):
             if val and is_display_option.get(opt):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_" + opt)()
-                if opt in ['keywords', 'platforms']:
+                if opt in ('keywords', 'platforms'):
                     print(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires', 'obsoletes'):
                     print('\n'.join(value))

distutils/msvc9compiler.py

@@ -391,7 +391,7 @@ def initialize(self, plat_name=None):  # noqa: C901
             # to cross compile, you use 'x86_amd64'.
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
-            if plat_name == get_platform() or plat_name == 'win32':
+            if plat_name in (get_platform(), 'win32'):
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
             else:

distutils/tests/test_archive_util.py

@@ -289,7 +289,7 @@ def _breaks(*args, **kw):
                 pass
             assert os.getcwd() == current_dir
         finally:
-            del ARCHIVE_FORMATS['xxx']
+            ARCHIVE_FORMATS.pop('xxx')
 
     def test_make_archive_tar(self):
         base_dir = self._create_files()