updatet info about python2

This commit is contained in:
Jeena 2014-08-21 23:39:27 +02:00
parent 4a6f140980
commit 5035f1cae2
3 changed files with 11 additions and 6 deletions

View file

@ -16,13 +16,13 @@ License: BSD
Download the [ZIP](https://github.com/jeena/feedthemonkey/archive/master.zip)-file, unzip it and then run: Download the [ZIP](https://github.com/jeena/feedthemonkey/archive/master.zip)-file, unzip it and then run:
On Linux you can just do (if you have PyQt already installed): On Linux you can just do (if you have PyQt4, python2 and python2-autotools already installed):
`sudo python setup.py install` `sudo python2 setup.py install`
On Windows you need to install (those are links to the binary packages): On Windows you need to install (those are links to the binary packages):
- [Python x32](http://www.python.org/ftp/python/2.7.4/python-2.7.4.msi) or [Python x64](http://www.python.org/ftp/python/2.7.4/python-2.7.4.amd64.msi) - [Python2 x32](http://www.python.org/ftp/python/2.7.4/python-2.7.4.msi) or [Python x64](http://www.python.org/ftp/python/2.7.4/python-2.7.4.amd64.msi)
- [PyQt x32](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x32.exe) or [PyQt x64](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x64.exe) - [PyQt4 x32](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x32.exe) or [PyQt x64](http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.10.1/PyQt4-4.10.1-gpl-Py2.7-Qt4.8.4-x64.exe)
Then rename `feedthemonkey` to `feedthemonkey.pyw` and then you can run it by double-clicking. Then rename `feedthemonkey` to `feedthemonkey.pyw` and then you can run it by double-clicking.

View file

@ -1,6 +1,11 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
import sys, os, json, tempfile, urllib2, urllib, json try:
import urllib.request as urllib2
except:
import urllib2
import sys, os, json, tempfile, urllib, json
from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork
from threading import Thread from threading import Thread
from sys import platform as _platform from sys import platform as _platform

View file

@ -16,7 +16,7 @@ is_linux = not is_osx and not is_win
if is_linux: if is_linux:
setup( setup(
name = "feedthemonkey", name = "FeedTheMonkey",
version = VERSION, version = VERSION,
author = "Jeena Paradies", author = "Jeena Paradies",
author_email = "spam@jeenaparadies.net", author_email = "spam@jeenaparadies.net",