Use bytecode package rather than local version

Forwarded: not-needed
Last-Update: 2022-02-12

 The vendored version of the package is removed in debian/copyright,
 and the Debian version of the package includes the patch from this
 package.

Gbp-Pq: Name use-bytecode-package.patch

diff --git a/_pydevd_bundle/pydevd_bytecode_utils.py b/_pydevd_bundle/pydevd_bytecode_utils.py
index e8c9f5479c0bb20aea64f4d0b808ed87a7539876..5af12f186d61a2cec979c0c4bc7df976b409930a 100644 (file)
--- a/_pydevd_bundle/pydevd_bytecode_utils.py
+++ b/_pydevd_bundle/pydevd_bytecode_utils.py
@@ -6,9 +6,9 @@ Note: not importable from Python 2.
 
 from _pydev_bundle import pydev_log
 from types import CodeType
-from _pydevd_frame_eval.vendored.bytecode.instr import _Variable
-from _pydevd_frame_eval.vendored import bytecode
-from _pydevd_frame_eval.vendored.bytecode import cfg as bytecode_cfg
+from bytecode.instr import _Variable
+import bytecode
+from bytecode import cfg as bytecode_cfg
 import dis
 import opcode as _opcode
 

diff --git a/_pydevd_frame_eval/pydevd_modify_bytecode.py b/_pydevd_frame_eval/pydevd_modify_bytecode.py
index ba84b5cc9616bf6b4985433d6df719a323f76f01..39ccd83194669cfebf00d8f04bbc3f3109e69aa6 100644 (file)
--- a/_pydevd_frame_eval/pydevd_modify_bytecode.py
+++ b/_pydevd_frame_eval/pydevd_modify_bytecode.py
@@ -5,8 +5,8 @@ import itertools
 import os.path
 import sys
 
-from _pydevd_frame_eval.vendored import bytecode
-from _pydevd_frame_eval.vendored.bytecode.instr import Instr, Label
+import bytecode
+from bytecode.instr import Instr, Label
 from _pydev_bundle import pydev_log
 from _pydevd_frame_eval.pydevd_frame_tracing import _pydev_stop_at_break, _pydev_needs_stop_at_break
 

diff --git a/setup.py b/setup.py
index 453f06cfec2e8450038f5350a3cba79621cb594c..4a0e737815f5658c49f7bd51a4d339ff4ee63d49 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -50,8 +50,6 @@ args = dict(
         '_pydevd_bundle._debug_adapter',\r
         '_pydevd_bundle.pydevd_concurrency_analyser',\r
         '_pydevd_frame_eval',\r
-        '_pydevd_frame_eval.vendored',\r
-        '_pydevd_frame_eval.vendored.bytecode',\r
         'pydev_ipython',\r
 \r
         # 'pydev_sitecustomize', -- Not actually a package (not added)\r