summaryrefslogtreecommitdiffstats
path: root/deluge/ui/common.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2015-09-05 19:23:20 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2015-09-05 23:18:56 +0100
commitdd764a09a89d65da37a95499f3c63327626eda0f (patch)
tree6f03d6a8458d4abb31c392eaf53e2292e0dbab7e /deluge/ui/common.py
parentcaf35bcdf470c3c59fbde1d47126e06d74c3e10a (diff)
downloaddeluge-dd764a09a89d65da37a95499f3c63327626eda0f.tar.gz
deluge-dd764a09a89d65da37a95499f3c63327626eda0f.tar.bz2
deluge-dd764a09a89d65da37a95499f3c63327626eda0f.zip
[GTKUI] Remove old and unneeded code
* Notifications now handled by plugin so remove gtkui code. * path_join is better done by os.path.join and replace.
Diffstat (limited to 'deluge/ui/common.py')
-rw-r--r--deluge/ui/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index b3b2c0db1..6087cc8c0 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -18,7 +18,7 @@ from hashlib import sha1 as sha
import deluge.configmanager
from deluge import bencode
-from deluge.common import path_join, utf8_encoded
+from deluge.common import utf8_encoded
log = logging.getLogger(__name__)
@@ -304,7 +304,7 @@ class FileTree2(object):
"""
def walk(directory, parent_path):
for path in directory["contents"].keys():
- full_path = path_join(parent_path, path)
+ full_path = os.path.join(parent_path, path).replace("\\", "/")
if directory["contents"][path]["type"] == "dir":
directory["contents"][path] = callback(full_path, directory["contents"][path]
) or directory["contents"][path]