diff --git a/Changelog b/Changelog index b1465c3e6..0da6c16b3 100644 --- a/Changelog +++ b/Changelog @@ -64,6 +64,7 @@ - BUGFIX: Prevent downloadFromUrl flooding - BUGFIX: ETA was wrong for torrents with filtered files - BUGFIX: Fixed drag'n drop on non-KDE systems + - BUGFIX: Removed build dependency on Python - COSMETIC: Redesigned torrent properties a little - COSMETIC: Totally redesigned program preferences - COSMETIC: Display more logs messages concerning features diff --git a/TODO b/TODO index 045b0c4e8..76567aa8d 100644 --- a/TODO +++ b/TODO @@ -57,4 +57,5 @@ - Translations update (IN PROGRESS) rc6->rc7 changelog: +- Removed build dependency on Python - I18N: Updated Turkish translation \ No newline at end of file diff --git a/configure b/configure index 2e0ffaa59..533754184 100755 --- a/configure +++ b/configure @@ -723,26 +723,6 @@ public: return true; } }; -#line 1 "python.qcm" -/* ------BEGIN QCMOD----- -name: python ------END QCMOD----- -*/ -class qc_python : public ConfObj -{ -public: - qc_python(Conf *c) : ConfObj(c) {} - QString name() const { return "python >= 2.3"; } - QString shortname() const { return "python"; } - bool exec(){ - int r = conf->doCommand("python testpython.py"); - if(r == 0) - return true; - else - return false; - } -}; EOT cat >$1/modules_new.cpp <$1/modules_new.cpp <required = false; o->disabled = false; - o = new qc_python(conf); - o->required = true; - o->disabled = false; EOT cat >$1/conf4.h < - - - diff --git a/qcm/python.qcm b/qcm/python.qcm deleted file mode 100644 index 0aa673faf..000000000 --- a/qcm/python.qcm +++ /dev/null @@ -1,19 +0,0 @@ -/* ------BEGIN QCMOD----- -name: python ------END QCMOD----- -*/ -class qc_python : public ConfObj -{ -public: - qc_python(Conf *c) : ConfObj(c) {} - QString name() const { return "python >= 2.3"; } - QString shortname() const { return "python"; } - bool exec(){ - int r = conf->doCommand("python testpython.py"); - if(r == 0) - return true; - else - return false; - } -}; diff --git a/testpython.py b/testpython.py deleted file mode 100755 index 0c6e3297e..000000000 --- a/testpython.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -# Test imports needed by our python search engine nova.py -# Christophe Dumez - chris@qbittorrent.org - -import sys -import urllib -import sgmllib -from xml.dom import minidom - -if __name__ == '__main__': - pass