Merge branch 'kd2718/os_scandir_prep' of github.com:kd2718/ipython into kd2718/os_scandir_prep

IPython/core/magics/osm.py

@@ -47,7 +47,7 b' class OSMagics(Magics):'
             self.execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
 
         # call up the chain
-        super(OSMagics, self).__init__(shell=shell, **kwargs)
+        super().__init__(shell=shell, **kwargs)
 
 
     @skip_doctest
@@ -520,7 +520,6 b' class OSMagics(Magics):'
 
         dh = self.shell.user_ns['_dh']
         if parameter_s:
-            args = []
             try:
                 args = map(int,parameter_s.split())
             except: