summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dickreuter <dickreuter@gmail.com>2019-01-11 14:22:04 +0000
committerClaudiu Popa <pcmanticore@gmail.com>2019-01-20 09:20:30 -0600
commit9cd65bd081b5d41a7d70e33c4ec4024e4d556813 (patch)
treed1b960e8057ab0ec2e275bbf3d80736bc398b56a
parent017a090472896f1163b819a9403af7a27a136534 (diff)
downloadpylint-git-9cd65bd081b5d41a7d70e33c4ec4024e4d556813.tar.gz
avoid popping __main__ for python version >= 3.3
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--ChangeLog4
-rw-r--r--pylint/lint.py2
3 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 2c5d9ead1..200e9651e 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -261,3 +261,5 @@ contributors:
* Sardorbek Imomaliev: contributor
* Justin Li (justinnhli)
+
+* Nicolas Dickreuter \ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index a7c2794b4..4e065a0f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,10 @@ Release date: TBA
Previous version incorrectly detects `a < b < c and b < d` and fails to
detect `a < b < c and c < d`.
+ * Avoid popping __main__ when using multiple jobs for python >= 3.3
+
+ Close #2689
+
What's New in Pylint 2.2.2?
===========================
diff --git a/pylint/lint.py b/pylint/lint.py
index fb8ac2598..a86471367 100644
--- a/pylint/lint.py
+++ b/pylint/lint.py
@@ -149,7 +149,7 @@ def _patch_sysmodules():
try:
yield
finally:
- if mock_main:
+ if mock_main and sys.version_info < (3, 3):
sys.modules.pop("__main__")