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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-26 22:53:04 +05:30
parent b2e79fe47b
commit 9262ceea75
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/debug.py
View File

@ -147,8 +147,10 @@ def print_basic_debug_info(out=None):
if out is None: out = sys.stdout if out is None: out = sys.stdout
out = functools.partial(prints, file=out) out = functools.partial(prints, file=out)
import platform import platform
from calibre.constants import __appname__, get_version, isportable, isosx from calibre.constants import (__appname__, get_version, isportable, isosx,
out(__appname__, get_version(), 'Portable' if isportable else '') isfrozen)
out(__appname__, get_version(), 'Portable' if isportable else '',
'isfrozen:', isfrozen)
out(platform.platform(), platform.system()) out(platform.platform(), platform.system())
out(platform.system_alias(platform.system(), platform.release(), out(platform.system_alias(platform.system(), platform.release(),
platform.version())) platform.version()))

5
src/calibre/devices/udisks.py
View File

@ -5,7 +5,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, dbus, re import os, re
def node_mountpoint(node): def node_mountpoint(node):
@ -25,6 +25,7 @@ class NoUDisks1(Exception):
class UDisks(object): class UDisks(object):
def __init__(self): def __init__(self):
import dbus
self.bus = dbus.SystemBus() self.bus = dbus.SystemBus()
try: try:
self.main = dbus.Interface(self.bus.get_object('org.freedesktop.UDisks', self.main = dbus.Interface(self.bus.get_object('org.freedesktop.UDisks',
@ -35,6 +36,7 @@ class UDisks(object):
raise raise
def device(self, device_node_path): def device(self, device_node_path):
import dbus
devpath = self.main.FindDeviceByDeviceFile(device_node_path) devpath = self.main.FindDeviceByDeviceFile(device_node_path)
return dbus.Interface(self.bus.get_object('org.freedesktop.UDisks', return dbus.Interface(self.bus.get_object('org.freedesktop.UDisks',
devpath), 'org.freedesktop.UDisks.Device') devpath), 'org.freedesktop.UDisks.Device')
@ -73,6 +75,7 @@ class UDisks2(object):
DRIVE = 'org.freedesktop.UDisks2.Drive' DRIVE = 'org.freedesktop.UDisks2.Drive'
def __init__(self): def __init__(self):
import dbus
self.bus = dbus.SystemBus() self.bus = dbus.SystemBus()
try: try:
self.bus.get_object('org.freedesktop.UDisks2', self.bus.get_object('org.freedesktop.UDisks2',