From: Julian Gilbey <jdg@debian.org>
Date: Mon, 8 Aug 2022 19:07:18 +0000 (+0100)
Subject: Use bytecode package rather than local version
X-Git-Tag: archive/raspbian/2.8.0+git20220826.8ee4065+ds-1+rpi1~1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=44e296f0f9fbcc5283dc0f4e0aa16aa92ad763e7;p=pydevd.git

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 e8c9f54..5af12f1 100644
--- 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 ba84b5c..39ccd83 100644
--- 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 453f06c..4a0e737 100644
--- a/setup.py
+++ b/setup.py
@@ -50,8 +50,6 @@ args = dict(
         '_pydevd_bundle._debug_adapter',
         '_pydevd_bundle.pydevd_concurrency_analyser',
         '_pydevd_frame_eval',
-        '_pydevd_frame_eval.vendored',
-        '_pydevd_frame_eval.vendored.bytecode',
         'pydev_ipython',
 
         # 'pydev_sitecustomize', -- Not actually a package (not added)