From e828b3a3987a93ec6f84878cf4265aeeb9a404fb Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sun, 4 Oct 2015 12:14:36 +0300 Subject: [PATCH] Fix python detection when the 'Anaconda' software is installed. Closes #3731. --- src/core/misc.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/misc.cpp b/src/core/misc.cpp index 543888c9c..1fb30cd41 100644 --- a/src/core/misc.cpp +++ b/src/core/misc.cpp @@ -338,9 +338,15 @@ QString misc::pythonVersionComplete() { QByteArray output = pythonProc.readAllStandardOutput(); if (output.isEmpty()) output = pythonProc.readAllStandardError(); - const QByteArray versionStr = output.split(' ').last(); - version = versionStr.trimmed(); - Logger::instance()->addMessage(QCoreApplication::translate("misc", "Python version: %1").arg(version), Log::INFO); + + // Software 'Anaconda' installs its own python interpreter + // and `python --version` returns a string like this: + // `Python 3.4.3 :: Anaconda 2.3.0 (64-bit)` + const QList verSplit = output.split(' '); + if (verSplit.size() > 1) { + version = verSplit.at(1).trimmed(); + Logger::instance()->addMessage(QCoreApplication::translate("misc", "Python version: %1").arg(version), Log::INFO); + } } } return version;