From fa1122a39c67fe99bccf79605616902cf9ff6f32 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 16 Sep 2012 21:06:41 +0530 Subject: [PATCH] Output platform info during device debug --- src/calibre/devices/__init__.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py index 2c1d628566..9fa0ab355c 100644 --- a/src/calibre/devices/__init__.py +++ b/src/calibre/devices/__init__.py @@ -62,7 +62,7 @@ def debug(ioreg_to_tmp=False, buf=None, plugins=None): already have been called (for example in the main GUI), pass in the list of device plugins as the plugins parameter. ''' - import textwrap + import textwrap, platform from calibre.customize.ui import device_plugins from calibre.devices.scanner import DeviceScanner, win_pnp_drives from calibre.constants import iswindows, isosx, __version__ @@ -85,7 +85,21 @@ def debug(ioreg_to_tmp=False, buf=None, plugins=None): out('Startup failed for device plugin: %s'%d) try: - out('Version:', __version__) + out('Calibre Version:', __version__) + out(platform.platform(), platform.system()) + out(platform.system_alias(platform.system(), platform.release(), + platform.version())) + out('Python', platform.python_version()) + try: + if iswindows: + out('Windows:', platform.win32_ver()) + elif isosx: + out('OSX:', platform.mac_ver()) + else: + out('Linux:', platform.linux_distribution()) + except: + pass + s = DeviceScanner() s.scan() devices = (s.devices)