about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@vulturis.eu>2014-01-18 12:15:45 +0100
committerPaweł Jastrzębski <pawelj@vulturis.eu>2014-01-18 12:15:45 +0100
commitd99064596a6d3d20467647303582173a11d0fecf (patch)
treefa80f9cc9ff8e0133e770d0f99bef975462a1f1d
parentRemoving QFileDialog hack (diff)
downloadkcc-d99064596a6d3d20467647303582173a11d0fecf.tar.gz
kcc-d99064596a6d3d20467647303582173a11d0fecf.tar.bz2
kcc-d99064596a6d3d20467647303582173a11d0fecf.zip
Detect Python 2 + README update
-rw-r--r--README.md12
-rwxr-xr-x[-rw-r--r--]kcc-c2e.py6
-rwxr-xr-x[-rw-r--r--]kcc-c2p.py6
-rwxr-xr-x[-rw-r--r--]kcc.py6
-rwxr-xr-x[-rw-r--r--]setup.py0
-rwxr-xr-x[-rw-r--r--]setup.sh0
6 files changed, 22 insertions, 8 deletions
diff --git a/README.md b/README.md
index 5935b47..142a9c9 100644
--- a/README.md
+++ b/README.md
@@ -40,11 +40,11 @@ You can find the latest released binary at the following links:
 - [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
 
 ### For compiling/running from source:
-- Python 2.7 - Included in MacOS and Linux, follow the [official documentation](http://www.python.org/getit/windows/) to install on Windows.
-- [PyQt4](http://www.riverbankcomputing.co.uk/software/pyqt/download) - Please refer to official documentation for installing into your system.
-- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+ - For comic optimizations. Please refer to official documentation for installing into your system.
-- [Psutil](https://code.google.com/p/psutil/) - Please refer to official documentation for installing into your system.
-- **To build OS X release you need a modified QT:** [patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch)
+- Python 3.3
+- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5)
+- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+
+- [psutil](https://pypi.python.org/pypi/psutil)
+- [python-slugify](http://pypi.python.org/pypi/python-slugify)
 
 ## USAGE
 
@@ -312,6 +312,8 @@ The app relies and includes the following scripts/binaries:
 ####3.7.2:
 * Fixed problems with HQ mode
 
+####4.0:
+
 ## COPYRIGHT
 
 Copyright (c) 2012-2013 Ciro Mattia Gonano and Paweł Jastrzębski.  
diff --git a/kcc-c2e.py b/kcc-c2e.py
index 54b2e03..71a3936 100644..100755
--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -23,6 +23,11 @@ __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
 # Dependiences check
 missing = []
 try:
@@ -55,7 +60,6 @@ if len(missing) > 0:
         print('ERROR: ' + ', '.join(missing) + ' is not installed!')
     exit(1)
 
-import sys
 from multiprocessing import freeze_support
 from kcc.comic2ebook import main, Copyright
 
diff --git a/kcc-c2p.py b/kcc-c2p.py
index 8b3feaa..cf194d1 100644..100755
--- a/kcc-c2p.py
+++ b/kcc-c2p.py
@@ -18,6 +18,11 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
 __version__ = '4.0'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
@@ -45,7 +50,6 @@ if len(missing) > 0:
         print('ERROR: ' + ', '.join(missing) + ' is not installed!')
     exit(1)
 
-import sys
 from multiprocessing import freeze_support
 from kcc.comic2panel import main, Copyright
 
diff --git a/kcc.py b/kcc.py
index 727d075..71c5877 100644..100755
--- a/kcc.py
+++ b/kcc.py
@@ -23,6 +23,11 @@ __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
 # Dependiences check
 missing = []
 try:
@@ -60,7 +65,6 @@ if len(missing) > 0:
         print('ERROR: ' + ', '.join(missing) + ' is not installed!')
     exit(1)
 
-import sys
 import os
 from multiprocessing import freeze_support
 from kcc import KCC_gui
diff --git a/setup.py b/setup.py
index 3c83f75..3c83f75 100644..100755
--- a/setup.py
+++ b/setup.py
diff --git a/setup.sh b/setup.sh
index fe68a57..fe68a57 100644..100755
--- a/setup.sh
+++ b/setup.sh