Get ipython to work again in 3.9 (#6603)

microsoft · Jul 13, 2021 · f08d6e1 · f08d6e1
1 parent 5f6f82a
commit f08d6e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Python/Product/Core/Core.csproj b/Python/Product/Core/Core.csproj
@@ -138,11 +138,4 @@
     <Compile Include="ProvideRawCodeBaseAttribute.cs" />
   </ItemGroup>
   <Import Project="..\ProjectAfter.settings" />
-  <!-- Temporary workaround for the interop DLL not being available in 15.5 -->
-  <Target Name="_IncludeVSCodeInterop" Condition="!$(ReleaseBuild) and $(DeployExtension)" BeforeTargets="BeforeBuild">
-    <ItemGroup>
-      <_InteropDll Include="$(DevEnvDir)Extensions\*\Microsoft.VisualStudio.Debugger.DebugAdapterHost.Interfaces.dll" />
-      <Content Include="..\..\References\Dev$(VSTarget)\Microsoft.VisualStudio.Debugger.DebugAdapterHost.Interfaces.dll;VSCodeInterop.pkgdef" Condition="@(_InteropDll) == ''" />
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/Python/Product/PythonTools/ptvsd/repl/ipython_client.py b/Python/Product/PythonTools/ptvsd/repl/ipython_client.py
@@ -28,7 +28,10 @@
 except:
     import _thread as thread    # Renamed as Py3k
 
-from base64 import decodestring
+try:
+    from base64 import decodestring
+except:
+    from base64 import decodebytes as decodestring # Deprecated in 3.9
 
 try:
     import IPython
@@ -185,7 +188,7 @@ def write_data(self, data, execution_count = None):
             try:
                 if isinstance(output_xaml, str) and sys.version_info[0] >= 3:
                     output_xaml = output_xaml.encode('ascii')
-                self._vs_backend.write_xaml(decodestring(output_xaml))
+                self._vs_backend.write_xaml(str(decodestring(output_xaml)))
                 self._vs_backend.write_stdout('\n') 
                 return
             except:
@@ -196,7 +199,7 @@ def write_data(self, data, execution_count = None):
             try:
                 if isinstance(output_png, str) and sys.version_info[0] >= 3:
                     output_png = output_png.encode('ascii')
-                self._vs_backend.write_png(decodestring(output_png))
+                self._vs_backend.write_png(str(decodestring(output_png)))
                 self._vs_backend.write_stdout('\n') 
                 return
             except: