vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Differentiate between _private and builtin_

1.3
IceArmy 2011-08-24 17:01:45 -07:00
parent e4dfb406f0
commit 84f53357f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/pyphantomjs/filesystem.py
View File

@ -269,7 +269,7 @@ class FileSystem(QObject):
##
@pyqtSlot(str, name='list', result='QStringList')
def _list(self, path):
def list_(self, path):
try:
p = os.listdir(path)
p[0:2] = ('.', '..')
@ -283,8 +283,8 @@ class FileSystem(QObject):
try:
listing = []
for root, dirs, files in os.walk(path):
for _file in files:
listing.append(os.path.join(root, _file))
for file_ in files:
listing.append(os.path.join(root, file_))
return listing
except OSError as (t, e):
qDebug("FileSystem.listTree - %s: '%s'" % (e, path))
@ -295,8 +295,8 @@ class FileSystem(QObject):
try:
listing = []
for root, dirs, files in os.walk(path):
for _dir in dirs:
listing.append(os.path.join(root, _dir))
for dir_ in dirs:
listing.append(os.path.join(root, dir_))
return listing
except OSError as (t, e):
qDebug("FileSystem.listDirectoryTree - %s: '%s'" % (e, path))