Merge pull request #6972 from takluyver/fix-win-envvar-not-str

%set_env should ensure environment variables are bytes on Python 2

IPython/core/magics/osm.py

@@ -413,7 +413,7 b' class OSMagics(Magics):'
             err = "refusing to set env var with whitespace: '{0}'"
             err = err.format(val)
             raise UsageError(err)
-        os.environ[var] = val
+        os.environ[py3compat.cast_bytes_py2(var)] = py3compat.cast_bytes_py2(val)
         print('env: {0}={1}'.format(var,val))
 
     @line_magic