From d8560f5c259c98c4f28f0ec364bcfd76fd81183e Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Sun, 20 Nov 2011 15:27:17 +0000 Subject: Fix #1944 : Use errno constants for portability --- deluge/core/torrentmanager.py | 3 ++- deluge/ui/gtkui/connectionmanager.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index ff6ba4faf..c49e8c901 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -790,7 +790,8 @@ class TorrentManager(component.Component): os.removedirs(os.path.join(root, name)) log.debug("Removed Empty Folder %s", os.path.join(root, name)) except OSError, (errno, strerror): - if errno == 39: + from errno import ENOTEMPTY + if errno == ENOTEMPTY: # Error raised if folder is not empty log.debug("%s", strerror) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index dc2f74285..f08af6ec8 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -17,9 +17,9 @@ # # You should have received a copy of the GNU General Public License # along with deluge. If not, write to: -# The Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301, USA. +# The Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301, USA. # # In addition, as a special exception, the copyright holders give # permission to link the code of portions of this program with the OpenSSL @@ -409,7 +409,8 @@ class ConnectionManager(component.Component): try: return client.start_daemon(port, config) except OSError, e: - if e.errno == 2: + from errno import ENOENT + if e.errno == ENOENT: dialogs.ErrorDialog( _("Unable to start daemon!"), _("Deluge cannot find the 'deluged' executable, it is likely \ -- cgit