shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-26 17:25:22 +03:00
Code Issues Projects Releases Wiki Activity

Enable some more basic pylint checks and clean the code

Browse Source
This commit is contained in:
Cole Robinson 2010-11-29 14:06:43 -05:00
parent 5939ed46ea
commit 716bec3e56
18 changed files with 84 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/virt-manager.py.in
View File

@ -183,7 +183,8 @@ def setup_logging(debug_stdout):
def parse_commandline():
optParser = OptionParser(version=appversion)
optParser.add_option("--profile", dest="profile", help="Generate runtime performance profile stats", metavar="FILE")
optParser.add_option("--profile", dest="profile",
help="Generate runtime performance profile stats", metavar="FILE")
optParser.set_defaults(uuid=None)
optParser.add_option("-c", "--connect", dest="uri",
help="Connect to hypervisor at URI", metavar="URI")
@ -199,12 +200,15 @@ def parse_commandline():
help="Do not autostart connections")
optParser.add_option("--show-domain-creator", action="callback",
callback=opt_show_cb, dest="show", help="Create a new virtual machine")
optParser.add_option("--show-domain-editor", type="string", metavar="UUID",
action="callback", callback=opt_show_cb, help="Edit a domain configuration")
optParser.add_option("--show-domain-performance", type="string", metavar="UUID",
action="callback", callback=opt_show_cb, help="Show a domain performance")
optParser.add_option("--show-domain-console", type="string", metavar="UUID",
action="callback", callback=opt_show_cb, help="Show a domain console")
optParser.add_option("--show-domain-editor", type="string",
metavar="UUID", action="callback", callback=opt_show_cb,
help="Edit a domain configuration")
optParser.add_option("--show-domain-performance", type="string",
metavar="UUID", action="callback", callback=opt_show_cb,
help="Show a domain performance")
optParser.add_option("--show-domain-console", type="string",
metavar="UUID", action="callback", callback=opt_show_cb,
help="Show a domain console")
optParser.add_option("--show-host-summary", action="callback",
callback=opt_show_cb, help="Show a host summary")
@ -294,7 +298,7 @@ def dbus_config(engine):
# This routine stores UUID to options.uuid for all --show-* options
# where is metavar="UUID" and also sets options.show
def opt_show_cb(option, opt_str, value, parser):
if option.metavar=="UUID":
if option.metavar == "UUID":
setattr(parser.values, "uuid", value)
s = str(option)
show = s[s.rindex('-')+1:]

2
src/virtManager/about.py
View File

@ -50,6 +50,6 @@ class vmmAbout:
dialog.set_version(self.config.get_appversion())
dialog.present()
def close(self,ignore1=None,ignore2=None):
def close(self, ignore1=None, ignore2=None):
self.window.get_widget("vmm-about").hide()
return 1

22
src/virtManager/addhardware.py
View File

@ -159,7 +159,7 @@ class vmmAddHardware(gobject.GObject):
self.reset_state()
self.topwin.present()
def close(self, ignore1=None,ignore2=None):
def close(self, ignore1=None, ignore2=None):
self.topwin.hide()
self.remove_timers()
return 1
@ -189,7 +189,7 @@ class vmmAddHardware(gobject.GObject):
black = gtk.gdk.color_parse("#000")
for num in range(PAGE_SUMMARY+1):
name = "page" + str(num) + "-title"
self.window.get_widget(name).modify_bg(gtk.STATE_NORMAL,black)
self.window.get_widget(name).modify_bg(gtk.STATE_NORMAL, black)
# Main HW list
hw_list = self.window.get_widget("hardware-type")
@ -247,7 +247,7 @@ class vmmAddHardware(gobject.GObject):
# Graphics type
graphics_list = self.window.get_widget("graphics-type")
graphics_model = gtk.ListStore(str,str)
graphics_model = gtk.ListStore(str, str)
graphics_list.set_model(graphics_model)
text = gtk.CellRendererText()
graphics_list.pack_start(text, True)
@ -461,11 +461,11 @@ class vmmAddHardware(gobject.GObject):
model.append([bus, device, icon, desc, gtk.ICON_SIZE_BUTTON])
if self.vm.is_hvm():
add_dev("ide", virtinst.VirtualDisk.DEVICE_DISK, "IDE disk")
add_dev("ide", virtinst.VirtualDisk.DEVICE_CDROM, "IDE cdrom")
add_dev("fdc", virtinst.VirtualDisk.DEVICE_FLOPPY, "Floppy disk")
add_dev("scsi",virtinst.VirtualDisk.DEVICE_DISK, "SCSI disk")
add_dev("usb", virtinst.VirtualDisk.DEVICE_DISK, "USB disk")
add_dev("ide", virtinst.VirtualDisk.DEVICE_DISK, "IDE disk")
add_dev("ide", virtinst.VirtualDisk.DEVICE_CDROM, "IDE cdrom")
add_dev("fdc", virtinst.VirtualDisk.DEVICE_FLOPPY, "Floppy disk")
add_dev("scsi", virtinst.VirtualDisk.DEVICE_DISK, "SCSI disk")
add_dev("usb", virtinst.VirtualDisk.DEVICE_DISK, "USB disk")
if self.vm.get_hv_type() == "kvm":
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
if self.vm.get_connection().is_xen():
@ -913,7 +913,7 @@ class vmmAddHardware(gobject.GObject):
self.window.get_widget("create-mac-address").set_sensitive(False)
# Graphics listeners
def change_graphics_type(self,ignore=None):
def change_graphics_type(self, ignore=None):
graphics = self.get_config_graphics()
if graphics == "vnc":
self.window.get_widget("graphics-port-auto").set_sensitive(True)
@ -929,7 +929,7 @@ class vmmAddHardware(gobject.GObject):
self.window.get_widget("graphics-keymap-chk").set_sensitive(False)
self.window.get_widget("graphics-keymap").set_sensitive(False)
def change_port_auto(self,ignore=None):
def change_port_auto(self, ignore=None):
if self.window.get_widget("graphics-port-auto").get_active():
self.window.get_widget("graphics-port").set_sensitive(False)
else:
@ -1112,7 +1112,7 @@ class vmmAddHardware(gobject.GObject):
readonly = False
if device == virtinst.VirtualDisk.DEVICE_CDROM:
readonly=True
readonly = True
try:
# This can error out

4
src/virtManager/asyncjob.py
View File

@ -108,7 +108,7 @@ class vmmAsyncJob(gobject.GObject):
# callback for progress meter when file size is known
gtk.gdk.threads_enter()
try:
self.is_pulsing=False
self.is_pulsing = False
if stage is not None:
self.stage.set_text(stage)
else:
@ -127,7 +127,7 @@ class vmmAsyncJob(gobject.GObject):
#callback for progress meter when progress is done
gtk.gdk.threads_enter()
try:
self.is_pulsing=False
self.is_pulsing = False
if stage is not None:
self.stage.set_text(stage)
else:

6
src/virtManager/choosecd.py
View File

@ -67,11 +67,11 @@ class vmmChooseCD(gobject.GObject):
self.initialize_opt_media()
self.reset_state()
def close(self,ignore1=None,ignore2=None):
def close(self, ignore1=None, ignore2=None):
self.window.get_widget("vmm-choose-cd").hide()
return 1
def cancel(self,ignore1=None,ignore2=None):
def cancel(self, ignore1=None, ignore2=None):
self.window.get_widget("vmm-choose-cd").hide()
def show(self):
@ -88,7 +88,7 @@ class vmmChooseCD(gobject.GObject):
else:
self.window.get_widget("iso-image").set_active(True)
def ok(self,ignore1=None, ignore2=None):
def ok(self, ignore1=None, ignore2=None):
path = None
if self.window.get_widget("iso-image").get_active():

6
src/virtManager/clone.py
View File

@ -470,8 +470,10 @@ class vmmCloneVM(gobject.GObject):
storage_box.show_all()
no_storage = not bool(len(self.target_list))
self.window.get_widget("clone-storage-box").set_property("visible",not no_storage)
self.window.get_widget("clone-no-storage-pass").set_property("visible", no_storage)
self.window.get_widget("clone-storage-box").set_property("visible",
not no_storage)
self.window.get_widget("clone-no-storage-pass").set_property("visible",
no_storage)
skip_targets = []
new_disks = []

2
src/virtManager/config.py
View File

@ -488,7 +488,7 @@ class vmmConfig:
if urls.count(url) == 0 and len(url) > 0 and not url.isspace():
# The url isn't already in the list, so add it
urls.insert(0,url)
urls.insert(0, url)
length = self.get_url_list_length()
if len(urls) > length:
del urls[len(urls) -1]

2
src/virtManager/connect.py
View File

@ -104,7 +104,7 @@ class vmmConnect(gobject.GObject):
self.reset_state()
def cancel(self,ignore1=None,ignore2=None):
def cancel(self, ignore1=None, ignore2=None):
self.close()
self.emit("cancelled")
return 1

12
src/virtManager/console.py
View File

@ -23,7 +23,6 @@ import gtk
import gtk.glade
import libvirt
import dbus
import gtkvnc
import os
@ -220,12 +219,15 @@ class vmmConsolePages(gobject.GObject):
grab = self.config.get_console_keygrab() == 2
self.vncViewer.set_keyboard_grab(grab)
def refresh_scaling(self,ignore1=None, ignore2=None, ignore3=None,
def refresh_scaling(self, ignore1=None, ignore2=None, ignore3=None,
ignore4=None):
self.scale_type = self.vm.get_console_scaling()
self.window.get_widget("details-menu-view-scale-always").set_active(self.scale_type == self.config.CONSOLE_SCALE_ALWAYS)
self.window.get_widget("details-menu-view-scale-never").set_active(self.scale_type == self.config.CONSOLE_SCALE_NEVER)
self.window.get_widget("details-menu-view-scale-fullscreen").set_active(self.scale_type == self.config.CONSOLE_SCALE_FULLSCREEN)
self.window.get_widget("details-menu-view-scale-always").set_active(
self.scale_type == self.config.CONSOLE_SCALE_ALWAYS)
self.window.get_widget("details-menu-view-scale-never").set_active(
self.scale_type == self.config.CONSOLE_SCALE_NEVER)
self.window.get_widget("details-menu-view-scale-fullscreen").set_active(
self.scale_type == self.config.CONSOLE_SCALE_FULLSCREEN)
self.update_scaling()

4
src/virtManager/createnet.py
View File

@ -92,7 +92,7 @@ class vmmCreateNetwork(gobject.GObject):
black = gtk.gdk.color_parse("#000")
for num in range(PAGE_SUMMARY+1):
name = "page" + str(num) + "-title"
self.window.get_widget(name).modify_bg(gtk.STATE_NORMAL,black)
self.window.get_widget(name).modify_bg(gtk.STATE_NORMAL, black)
fw_list = self.window.get_widget("net-forward")
# [ label, dev name ]
@ -317,7 +317,7 @@ class vmmCreateNetwork(gobject.GObject):
self.window.get_widget("create-finish").show()
self.window.get_widget("create-finish").grab_focus()
def close(self, ignore1=None,ignore2=None):
def close(self, ignore1=None, ignore2=None):
self.topwin.hide()
return 1

2
src/virtManager/details.py
View File

@ -674,7 +674,7 @@ class vmmDetails(gobject.GObject):
txtCol.add_attribute(text, 'text', BOOT_LABEL)
txtCol.add_attribute(text, 'sensitive', BOOT_ACTIVE)
no_default= not self.is_customize_dialog
no_default = not self.is_customize_dialog
# Disk cache combo
disk_cache = self.window.get_widget("disk-cache-combo")
uihelpers.build_cache_combo(self.vm, disk_cache)

10
src/virtManager/domain.py
View File

@ -698,11 +698,13 @@ class vmmDomainBase(vmmLibvirtObject):
def _get_cur_rate(self, what):
if len(self.record) > 1:
ret = float(self.record[0][what] - self.record[1][what]) / \
float(self.record[0]["timestamp"] - self.record[1]["timestamp"])
ret = (float(self.record[0][what] -
self.record[1][what]) /
float(self.record[0]["timestamp"] -
self.record[1]["timestamp"]))
else:
ret = 0.0
return max(ret, 0,0) # avoid negative values at poweroff
return max(ret, 0, 0) # avoid negative values at poweroff
def _set_max_rate(self, record, what):
if record[what] > self.maxRecord[what]:
@ -774,7 +776,7 @@ class vmmDomainBase(vmmLibvirtObject):
end = [l, limit][l > limit]
if l > limit:
data = data[0:end] + data[l:l+end]
d = map(lambda x,y: (x + y)/2, data[0:end], data[end:end*2])
d = map(lambda x, y: (x + y) / 2, data[0:end], data[end:end * 2])
return d
def cpu_time_vector(self):

2
src/virtManager/engine.py
View File

@ -408,7 +408,7 @@ class vmmEngine(gobject.GObject):
self.windowCreate.conn.get_uri() == hvuri):
self.windowCreate.close()
def reschedule_timer(self, ignore1,ignore2,ignore3,ignore4):
def reschedule_timer(self, ignore1, ignore2, ignore3, ignore4):
self.schedule_timer()
def schedule_timer(self):

4
src/virtManager/host.py
View File

@ -311,7 +311,7 @@ class vmmHost(gobject.GObject):
return 1
return 0
def close(self,ignore1=None,ignore2=None):
def close(self, ignore1=None, ignore2=None):
if self.is_visible():
self.window.get_widget("vmm-host").hide()
self.engine.decrement_window_counter()
@ -1045,7 +1045,7 @@ class vmmHost(gobject.GObject):
addrstr = "-"
if ipv6[2]:
addrstr = reduce(lambda x,y: x + "\n" + y, ipv6[2])
addrstr = reduce(lambda x, y: x + "\n" + y, ipv6[2])
self.window.get_widget("interface-ipv6-mode").set_text(mode)
self.window.get_widget("interface-ipv6-address").set_text(addrstr)

4
src/virtManager/manager.py
View File

@ -540,7 +540,7 @@ class vmmManager(gobject.GObject):
uri = self.current_connection_uri(default_selection=True)
self.emit("action-show-host", uri)
def open_vm_console(self,ignore,ignore2=None,ignore3=None):
def open_vm_console(self, ignore, ignore2=None, ignore3=None):
if self.current_vmuuid():
self.emit("action-show-console",
self.current_connection_uri(), self.current_vmuuid())
@ -553,7 +553,7 @@ class vmmManager(gobject.GObject):
self.emit("action-clone-domain", self.current_connection_uri(),
self.current_vmuuid())
def show_vm_details(self,ignore):
def show_vm_details(self, ignore):
conn = self.current_connection()
if conn is None:
return

42
src/virtManager/preferences.py
View File

@ -114,19 +114,25 @@ class vmmPreferences(gobject.GObject):
val = self.config.get_view_system_tray()
self.window.get_widget("prefs-system-tray").set_active(bool(val))
def refresh_update_interval(self, ignore1=None,ignore2=None,ignore3=None,ignore4=None):
self.window.get_widget("prefs-stats-update-interval").set_value(self.config.get_stats_update_interval())
def refresh_history_length(self, ignore1=None,ignore2=None,ignore3=None,ignore4=None):
self.window.get_widget("prefs-stats-history-len").set_value(self.config.get_stats_history_length())
def refresh_update_interval(self, ignore1=None, ignore2=None,
ignore3=None, ignore4=None):
self.window.get_widget("prefs-stats-update-interval").set_value(
self.config.get_stats_update_interval())
def refresh_history_length(self, ignore1=None, ignore2=None,
ignore3=None,ignore4=None):
self.window.get_widget("prefs-stats-history-len").set_value(
self.config.get_stats_history_length())
def refresh_console_popup(self,ignore1=None,ignore2=None,ignore3=None,
ignore4=None):
self.window.get_widget("prefs-console-popup").set_active(self.config.get_console_popup())
def refresh_console_keygrab(self,ignore1=None,ignore2=None,ignore3=None,
ignore4=None):
self.window.get_widget("prefs-console-keygrab").set_active(self.config.get_console_keygrab())
def refresh_console_scaling(self,ignore1=None,ignore2=None,ignore3=None,
ignore4=None):
def refresh_console_popup(self, ignore1=None, ignore2=None,
ignore3=None, ignore4=None):
self.window.get_widget("prefs-console-popup").set_active(
self.config.get_console_popup())
def refresh_console_keygrab(self, ignore1=None, ignore2=None,
ignore3=None, ignore4=None):
self.window.get_widget("prefs-console-keygrab").set_active(
self.config.get_console_keygrab())
def refresh_console_scaling(self, ignore1=None, ignore2=None,
ignore3=None, ignore4=None):
val = self.config.get_console_scaling()
if val == None:
val = 0
@ -134,17 +140,21 @@ class vmmPreferences(gobject.GObject):
def refresh_sound_local(self, ignore1=None, ignore2=None, ignore=None,
ignore4=None):
self.window.get_widget("prefs-sound-local").set_active(self.config.get_local_sound())
self.window.get_widget("prefs-sound-local").set_active(
self.config.get_local_sound())
def refresh_sound_remote(self, ignore1=None, ignore2=None, ignore=None,
ignore4=None):
self.window.get_widget("prefs-sound-remote").set_active(self.config.get_remote_sound())
self.window.get_widget("prefs-sound-remote").set_active(
self.config.get_remote_sound())
def refresh_disk_poll(self, ignore1=None, ignore2=None, ignore3=None,
ignore4=None):
self.window.get_widget("prefs-stats-enable-disk").set_active(self.config.get_stats_enable_disk_poll())
self.window.get_widget("prefs-stats-enable-disk").set_active(
self.config.get_stats_enable_disk_poll())
def refresh_net_poll(self, ignore1=None, ignore2=None, ignore3=None,
ignore4=None):
self.window.get_widget("prefs-stats-enable-net").set_active(self.config.get_stats_enable_net_poll())
self.window.get_widget("prefs-stats-enable-net").set_active(
self.config.get_stats_enable_net_poll())
def refresh_grabkeys_combination(self, ignore1=None, ignore2=None,
ignore3=None, ignore4=None):

3
src/virtManager/util.py
View File

@ -354,7 +354,8 @@ def safe_timeout_add(timeout, func, *args):
return gobject.timeout_add(timeout, _safe_wrapper, func, *args)
def uuidstr(rawuuid):
hx = ['0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f']
hx = ['0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f']
uuid = []
for i in range(16):
uuid.append(hx[((ord(rawuuid[i]) >> 4) & 0xf)])

4
tests/pylint-virt-manager.sh
View File

@ -57,9 +57,7 @@ addmsg "C0103" # C0103: Name doesn't match some style regex
addmsg "C0111" # C0111: No docstring
addmsg "C0301" # C0301: Line too long
addmsg "C0302" # C0302: Too many lines in module
addmsg "C0324" # C0324: *Comma not followed by a space*
addmsg "R0201" # R0201: Method could be a function
addmsg "W0105" # W0105: String statement has no effect
addmsg "W0141" # W0141: Complaining about 'map' and 'filter'
addmsg "W0142" # W0142: *Used * or ** magic*
addmsg "W0403" # W0403: Relative imports
@ -69,8 +67,6 @@ addmsg "W0703" # W0703: Catch 'Exception'
addmsg "W0704" # W0704: Exception doesn't do anything
# Potentially useful messages, disabled for now
addmsg "C0322" # C0322: *Operator not preceded by a space*
addmsg "C0323" # C0323: *Operator not followed by a space*
addmsg "W0511" # W0511: FIXME and XXX: messages
addmsg "W0613" # W0613: Unused arguments
addmsg_support "W6501" # W6501: Using string formatters in logging message