Skip to content

Commit

Permalink
Updated to psutil 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AcidWeb committed Mar 13, 2014
1 parent e491fca commit d774984
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ You can find the latest released binary at the following links:
- 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)
- [psutil](https://pypi.python.org/pypi/psutil) 2.0+
- [python-slugify](http://pypi.python.org/pypi/python-slugify)

On Debian based distributions these two commands should install all dependencies:
Expand Down
2 changes: 1 addition & 1 deletion kcc-c2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
missing = []
try:
# noinspection PyUnresolvedReferences
from psutil import TOTAL_PHYMEM, Popen
from psutil import virtual_memory, Popen
except ImportError:
missing.append('psutil')
try:
Expand Down
2 changes: 1 addition & 1 deletion kcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
missing.append('PyQt5')
try:
# noinspection PyUnresolvedReferences
from psutil import TOTAL_PHYMEM, Popen
from psutil import virtual_memory, Popen
except ImportError:
missing.append('psutil')
try:
Expand Down
4 changes: 2 additions & 2 deletions kcc/KCC_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from PyQt5 import QtGui, QtCore, QtWidgets
from xml.dom.minidom import parse
from html.parser import HTMLParser
from psutil import TOTAL_PHYMEM, Popen
from psutil import virtual_memory, Popen
from .shared import md5Checksum
from . import comic2ebook
from . import kindlesplit
Expand Down Expand Up @@ -338,7 +338,7 @@ def __init__(self):
self.kindlegenErrorCode = [0]
self.workerOutput = []
# Let's make sure that we don't fill the memory
availableMemory = TOTAL_PHYMEM/1000000000
availableMemory = virtual_memory().total/1000000000
if availableMemory <= 2:
self.threadNumber = 1
elif 2 < availableMemory <= 4:
Expand Down
4 changes: 0 additions & 4 deletions requirements.txt

This file was deleted.

0 comments on commit d774984

Please sign in to comment.