From: Andreas Sandberg <andreas.sandberg@arm.com>
Date: Mon, 18 Apr 2016 09:31:38 +0000 (+0100)
Subject: style: Fix Python 2.6 compatibility
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f81951815877874b212b1963e76af3596855c337;p=gem5.git

style: Fix Python 2.6 compatibility

The style checker code needs to disable autojunk when diffing source
files using Python's difflib. Support for this was only introduced in
Python 2.7, which leads to a TypeError exception on older Python
version. This changeset adds a fallback mechanism for old Python
versions.
---

diff --git a/util/style/verifiers.py b/util/style/verifiers.py
index 7650d3071..a55f5edd8 100644
--- a/util/style/verifiers.py
+++ b/util/style/verifiers.py
@@ -57,8 +57,12 @@ from region import *
 from file_types import lang_type
 
 def _modified_regions(old, new):
-    m = SequenceMatcher(a=old, b=new, autojunk=False)
-
+    try:
+        m = SequenceMatcher(a=old, b=new, autojunk=False)
+    except TypeError:
+        # autojunk was introduced in Python 2.7. We need a fallback
+        # mechanism to support old Python versions.
+        m = SequenceMatcher(a=old, b=new)
     regions = Regions()
     for tag, i1, i2, j1, j2 in m.get_opcodes():
         if tag != "equal":