From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 21 Jul 2010 09:52:10 +0000 (+0000)
Subject: Backport r82456.
X-Git-Tag: v2.7.1rc1~578
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4fa1159173b3c8dc59f4cf1e73419eb2128961;p=python

Backport r82456.
---

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 6871d7e9fc..95edac9b8f 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -6,11 +6,17 @@
    :synopsis: Disassembler for Python bytecode.
 
 
-The :mod:`dis` module supports the analysis of Python :term:`bytecode` by disassembling
-it.  Since there is no Python assembler, this module defines the Python assembly
-language.  The Python bytecode which this module takes as an input is defined
-in the file  :file:`Include/opcode.h` and used by the compiler and the
-interpreter.
+The :mod:`dis` module supports the analysis of CPython :term:`bytecode` by
+disassembling it. The CPython bytecode which this module takes as an
+input is defined in the file :file:`Include/opcode.h` and used by the compiler
+and the interpreter.
+
+.. impl-detail::
+
+   Bytecode is an implementation detail of the CPython interpreter!  No
+   guarantees are made that bytecode will not be added, removed, or changed
+   between versions of Python.  Use of this module should not be considered to
+   work across Python VMs or Python releases.
 
 Example: Given the function :func:`myfunc`::
 
diff --git a/Misc/NEWS b/Misc/NEWS
index ec857acde1..45f81c39ca 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,6 +59,11 @@ Tests
 
 - Issue #8605: Skip test_gdb if Python is compiled with optimizations.
 
+Documentation
+-------------
+
+- Issue 7829: Document in dis that bytecode is an implementation detail.
+
 
 What's New in Python 2.7?
 =========================