Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5487 (Error after sending books to PRS-600)

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-08 09:36:31 -06:00
parent 655fcb828a
commit e94a44b1a3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/__init__.py
View File

@ -202,7 +202,7 @@ def extract(path, dir):
def get_proxies(debug=True):
proxies = getproxies()
for key, proxy in list(proxies.items()):
if not proxy:
if not proxy or '..' in proxy:
del proxies[key]
continue
if proxy.startswith(key+'://'):

7
src/calibre/devices/prs505/books.py
View File

@ -284,7 +284,12 @@ class BookList(_BookList):
plitems = []
for pl in self.playlists():
for c in pl.childNodes:
if hasattr(c, 'tagName') and c.tagName.endswith('item'):
if hasattr(c, 'tagName') and c.tagName.endswith('item') and \
hasattr(c, 'getAttribute'):
try:
c.getAttribute('id')
except: # Unlinked node
continue
plitems.append(c)
return plitems