From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 11 May 2016 19:19:49 +0000 (+0300)
Subject: Issue #26881: Restored the name of scan_opcodes_25().
X-Git-Tag: v3.6.0a1~43^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec5d54575f176b0c198db4cd7aa306fb69152088;p=thirdparty%2FPython%2Fcpython.git

Issue #26881: Restored the name of scan_opcodes_25().
It is better to not change this in bugfix release.
---

diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index b8cce1f766b7..8103502404d3 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -336,7 +336,8 @@ class ModuleFinder:
                         fullname = name + "." + sub
                         self._add_badmodule(fullname, caller)
 
-    def scan_opcodes(self, co):
+    def scan_opcodes_25(self, co,
+                     unpack = struct.unpack):
         # Scan the code, and yield 'interesting' opcode combinations
         code = co.co_code
         names = co.co_names
@@ -359,7 +360,7 @@ class ModuleFinder:
 
     def scan_code(self, co, m):
         code = co.co_code
-        scanner = self.scan_opcodes
+        scanner = self.scan_opcodes_25
         for what, args in scanner(co):
             if what == "store":
                 name, = args