[meld] filediff: Remove Python 2.6 compat
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Remove Python 2.6 compat
- Date: Sun, 14 Dec 2014 20:51:14 +0000 (UTC)
commit 2611ce85919c2a0db5f0b861c78531ea713df705
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Nov 30 06:29:15 2014 +1000
filediff: Remove Python 2.6 compat
meld/filediff.py | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 1156a82..c2c657d 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -66,13 +66,8 @@ class CachedSequenceMatcher(object):
if os.name == "nt":
CachedSequenceMatcher.process_pool = ThreadPool(None)
else:
- # maxtasksperchild is new in Python 2.7; this is for 2.6 compat
- try:
- CachedSequenceMatcher.process_pool = Pool(
- None, matchers.init_worker, maxtasksperchild=1)
- except TypeError:
- CachedSequenceMatcher.process_pool = Pool(
- None, matchers.init_worker)
+ CachedSequenceMatcher.process_pool = Pool(
+ None, matchers.init_worker, maxtasksperchild=1)
self.cache = {}
def match(self, text1, textn, cb):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]