updatet info about python2
This commit is contained in:
parent
4a6f140980
commit
5035f1cae2
3 changed files with 11 additions and 6 deletions
|
@ -16,13 +16,13 @@ License: BSD
|
|||
|
||||
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):
|
||||
`sudo python setup.py install`
|
||||
On Linux you can just do (if you have PyQt4, python2 and python2-autotools already installed):
|
||||
`sudo python2 setup.py install`
|
||||
|
||||
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)
|
||||
- [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)
|
||||
- [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)
|
||||
- [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.
|
||||
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
#!/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 threading import Thread
|
||||
from sys import platform as _platform
|
||||
|
|
2
setup.py
2
setup.py
|
@ -16,7 +16,7 @@ is_linux = not is_osx and not is_win
|
|||
|
||||
if is_linux:
|
||||
setup(
|
||||
name = "feedthemonkey",
|
||||
name = "FeedTheMonkey",
|
||||
version = VERSION,
|
||||
author = "Jeena Paradies",
|
||||
author_email = "spam@jeenaparadies.net",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue