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

pep8

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-18 08:16:13 +05:30
parent 0aa3c075e4
commit 488a99cba4
1 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/devices/scanner.py
View File

@ -157,7 +157,8 @@ class LibUSBScanner(object):
start = memory() start = memory()
for i in xrange(num): for i in xrange(num):
self() self()
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
print 'Mem consumption increased by:', memory() - start, 'MB', print 'Mem consumption increased by:', memory() - start, 'MB',
print 'after', num, 'repeats' print 'after', num, 'repeats'
@ -254,9 +255,9 @@ class FreeBSDScanner(object):
objif = dbus.Interface(obj, 'org.freedesktop.Hal.Device') objif = dbus.Interface(obj, 'org.freedesktop.Hal.Device')
try: try:
parentdriver = objif.GetProperty('freebsd.driver') parentdriver = objif.GetProperty('freebsd.driver')
except dbus.exceptions.DBusException, e: except dbus.exceptions.DBusException as e:
continue continue
except dbus.exceptions.DBusException, e: except dbus.exceptions.DBusException as e:
break break
if parentdriver != 'umass': if parentdriver != 'umass':
continue continue
@ -265,7 +266,7 @@ class FreeBSDScanner(object):
dev.append(objif.GetProperty('usb.vendor_id')) dev.append(objif.GetProperty('usb.vendor_id'))
dev.append(objif.GetProperty('usb.product_id')) dev.append(objif.GetProperty('usb.product_id'))
dev.append(objif.GetProperty('usb.device_revision_bcd')) dev.append(objif.GetProperty('usb.device_revision_bcd'))
except dbus.exceptions.DBusException, e: except dbus.exceptions.DBusException as e:
continue continue
try: try:
dev.append(objif.GetProperty('info.vendor')) dev.append(objif.GetProperty('info.vendor'))
@ -281,12 +282,11 @@ class FreeBSDScanner(object):
dev.append('') dev.append('')
dev.append(path) dev.append(path)
ans.add(tuple(dev)) ans.add(tuple(dev))
except dbus.exceptions.DBusException, e: except dbus.exceptions.DBusException as e:
print >>sys.stderr, "Execution failed:", e print >>sys.stderr, "Execution failed:", e
return ans return ans
if islinux: if islinux:
linux_scanner = LinuxScanner() linux_scanner = LinuxScanner()
@ -336,15 +336,18 @@ def test_for_mem_leak():
scanner = DeviceScanner() scanner = DeviceScanner()
scanner.scan() scanner.scan()
memory() # load the psutil library memory() # load the psutil library
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
for reps in (1, 10, 100, 1000): for reps in (1, 10, 100, 1000):
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
h1 = gc_histogram() h1 = gc_histogram()
startmem = memory() startmem = memory()
for i in xrange(reps): for i in xrange(reps):
scanner.scan() scanner.scan()
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
usedmem = memory(startmem) usedmem = memory(startmem)
prints('Memory used in %d repetitions of scan(): %.5f KB'%(reps, prints('Memory used in %d repetitions of scan(): %.5f KB'%(reps,
1024*usedmem)) 1024*usedmem))
@ -356,12 +359,14 @@ def test_for_mem_leak():
return return
for reps in (1, 10, 100, 1000): for reps in (1, 10, 100, 1000):
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
h1 = gc_histogram() h1 = gc_histogram()
startmem = memory() startmem = memory()
for i in xrange(reps): for i in xrange(reps):
win_pnp_drives() win_pnp_drives()
for i in xrange(3): gc.collect() for i in xrange(3):
gc.collect()
usedmem = memory(startmem) usedmem = memory(startmem)
prints('Memory used in %d repetitions of pnp_scan(): %.5f KB'%(reps, prints('Memory used in %d repetitions of pnp_scan(): %.5f KB'%(reps,
1024*usedmem)) 1024*usedmem))