From: Stefan Weil <sw@xxxxxxxxxxx> Signed-off-by: Stefan Weil <sw@xxxxxxxxxxx> --- NEWS.md | 2 +- tests/checkprops.py | 2 +- tests/clitest.py | 4 ++-- tests/uitests/details.py | 2 +- virtManager/choosecd.py | 2 +- virtManager/create.py | 8 ++++---- virtManager/details.py | 10 +++++----- virtManager/domain.py | 4 ++-- virtinst/cli.py | 2 +- virtinst/devices/disk.py | 2 +- virtinst/devices/filesystem.py | 2 +- virtinst/devices/interface.py | 2 +- virtinst/diskbackend.py | 2 +- virtinst/progress.py | 2 +- virtinst/urlfetcher.py | 2 +- virtinst/util.py | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NEWS.md b/NEWS.md index 46bf0563..2dc7b34e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -456,7 +456,7 @@ virtual console and even greater coverage for translations. The release focus has been on major bug fixing. This is also the first release in which (partial) translations are available for the UI in approximately 20 languages - thanks to the Fedora i18n -team for excellant progress on this. It is now possible to control +team for excellent progress on this. It is now possible to control the virt-manager UI with command line arguments as well as the DBus API & it DBus activation is no longer used by default which fixes interaction with GNOME keyring & AT-SPI accesibility. Numerous diff --git a/tests/checkprops.py b/tests/checkprops.py index 3e7e8977..ea27b77c 100644 --- a/tests/checkprops.py +++ b/tests/checkprops.py @@ -19,7 +19,7 @@ class CheckPropsTest(unittest.TestCase): try: # Accessing an internal detail of unittest, but it's only # to prevent incorrect output in the case that other tests - # failed or were skipped, which can give a false postive here + # failed or were skipped, which can give a false positive here result = self._outcome.result skip = bool(result.errors or result.failures or result.skipped) except Exception: diff --git a/tests/clitest.py b/tests/clitest.py index a62a9105..17c8917d 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -672,7 +672,7 @@ c = vinst.add_category("nodisk-install", "--nographics --noautoconsole --nodisks c.add_valid("--hvm --cdrom %(EXISTIMG1)s") # Simple cdrom install c.add_valid("--wait 0 --os-variant winxp --cdrom %(EXISTIMG1)s") # Windows (2 stage) install c.add_valid("--pxe --virt-type test") # Explicit virt-type -c.add_valid("--arch i686 --pxe") # Explicity fullvirt + arch +c.add_valid("--arch i686 --pxe") # Explicitly fullvirt + arch c.add_valid("--arch i486 --pxe") # Convert i*86 -> i686 c.add_valid("--location %(TREEDIR)s") # Directory tree URL install c.add_valid("--location %(TREEDIR)s --initrd-inject virt-install --extra-args ks=file:/virt-install") # initrd-inject @@ -872,7 +872,7 @@ c.add_valid("test-state-shutoff --edit --update --boot menu=on") # --update wit c.add_invalid("test --edit --hostdev driver_name=vfio") # Guest has no hostdev to edit c.add_invalid("test --edit --cpu host-passthrough --boot hd,network") # Specified more than 1 option c.add_invalid("test --edit") # specified no edit option -c.add_invalid("test --edit 2 --cpu host-passthrough") # specifing --edit number where it doesn't make sense +c.add_invalid("test --edit 2 --cpu host-passthrough") # specifying --edit number where it doesn't make sense c.add_invalid("test-for-virtxml --edit 5 --tpm /dev/tpm") # device edit out of range c.add_invalid("test-for-virtxml --add-device --host-device 0x04b3:0x4485 --update") # test driver doesn't support attachdevice... c.add_invalid("test-for-virtxml --remove-device --host-device 1 --update") # test driver doesn't support detachdevice... diff --git a/tests/uitests/details.py b/tests/uitests/details.py index b309c8c2..1dd83046 100644 --- a/tests/uitests/details.py +++ b/tests/uitests/details.py @@ -339,7 +339,7 @@ class Details(uiutils.UITestCase): def testDetailsMiscEdits(self): """ - Test misc editting behavior, like checking for unapplied + Test misc editing behavior, like checking for unapplied changes """ win = self._open_details_window(vmname="test-many-devices", diff --git a/virtManager/choosecd.py b/virtManager/choosecd.py index 5be91c96..e8eb891f 100644 --- a/virtManager/choosecd.py +++ b/virtManager/choosecd.py @@ -26,7 +26,7 @@ class vmmChooseCD(vmmGObjectUI): self.conn = self.vm.conn self.storage_browser = None - # This is also overwritten from details.py when targetting a new disk + # This is also overwritten from details.py when targeting a new disk self.disk = disk self.media_type = disk.device diff --git a/virtManager/create.py b/virtManager/create.py index 758980f7..8e0ceafa 100644 --- a/virtManager/create.py +++ b/virtManager/create.py @@ -295,7 +295,7 @@ class vmmCreate(vmmGObjectUI): # Lists for OS container bootstrap set_model_list("install-oscontainer-source-url-combo") - # Archtecture + # Architecture archList = self.widget("arch") # [label, guest.os.arch value] archModel = Gtk.ListStore(str, str) @@ -944,8 +944,8 @@ class vmmCreate(vmmGObjectUI): thread. """ if not self._is_os_detect_active(): - # If the user changed the OS detect checkbox inbetween, don't - # update the UI + # If the user changed the OS detect checkbox in the meantime, + # don't update the UI return name = self.widget("install-os-name") @@ -2369,7 +2369,7 @@ class vmmCreate(vmmGObjectUI): # Get virt-bootstrap logger vbLogger = logging.getLogger('virtBootstrap') vbLogger.setLevel(logging.DEBUG) - # Create hander to store log messages in the string buffer + # Create handler to store log messages in the string buffer hdlr = logging.StreamHandler(log_stream) hdlr.setFormatter(logging.Formatter('%(message)s')) # Use logging filter to show messages on GUI diff --git a/virtManager/details.py b/virtManager/details.py index b78a2385..0949d315 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -2329,7 +2329,7 @@ class vmmDetails(vmmGObjectUI): return # This function should only be called when the VM xml actually - # changes (not everytime it is refreshed). This saves us from blindly + # changes (not every time it is refreshed). This saves us from blindly # parsing the xml every tick # Add / remove new devices @@ -2475,13 +2475,13 @@ class vmmDetails(vmmGObjectUI): return ('<span color="#82003B">%s</span> ' '<span color="#295C45">%s</span>' % (text1, text2)) def _dsk_rx_tx_text(rx, tx, unit): - opts = {"received": rx, "transfered": tx, "units": unit} + opts = {"received": rx, "transferred": tx, "units": unit} return _multi_color(_("%(received)d %(units)s read") % opts, - _("%(transfered)d %(units)s write") % opts) + _("%(transferred)d %(units)s write") % opts) def _net_rx_tx_text(rx, tx, unit): - opts = {"received": rx, "transfered": tx, "units": unit} + opts = {"received": rx, "transferred": tx, "units": unit} return _multi_color(_("%(received)d %(units)s in") % opts, - _("%(transfered)d %(units)s out") % opts) + _("%(transferred)d %(units)s out") % opts) cpu_txt = _("Disabled") mem_txt = _("Disabled") diff --git a/virtManager/domain.py b/virtManager/domain.py index 1cc03682..1f1f6a0e 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -1781,8 +1781,8 @@ class vmmDomain(vmmLibvirtObject): return rd, wr def _set_mem_stats_period(self): - # QEMU requires we explicitly enable memory stats polling per VM - # if we wan't fine grained memory stats + # QEMU requires to explicitly enable memory stats polling per VM + # if we want fine grained memory stats if not self.conn.check_support( self.conn.SUPPORT_CONN_MEM_STATS_PERIOD): return diff --git a/virtinst/cli.py b/virtinst/cli.py index a2624e66..992d3460 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -865,7 +865,7 @@ class _VirtCLIArgument(object): Process the cli param against the pass inst. So if we are VirtCLIArgument for --disk device=, and the user - specified --disk device=foo, we were instanciated with + specified --disk device=foo, we were instantiated with key=device val=foo, so set inst.device = foo """ if support_cb: diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py index 5132f951..9fec6606 100644 --- a/virtinst/devices/disk.py +++ b/virtinst/devices/disk.py @@ -958,7 +958,7 @@ class DeviceDisk(Device): disk. :returns: str prefix, or None if no reasonable guess can be made """ - # The upper limits here aren't necessarilly 1024, but let the HV + # The upper limits here aren't necessarily 1024, but let the HV # error as appropriate. def _return(prefix): nummap = { diff --git a/virtinst/devices/filesystem.py b/virtinst/devices/filesystem.py index f00f1d91..aa691132 100644 --- a/virtinst/devices/filesystem.py +++ b/virtinst/devices/filesystem.py @@ -102,7 +102,7 @@ class DeviceFilesystem(Device): def _get_type(self): return getattr(self, '_type_prop') def _set_type(self, val): - # Get type/value of the attrubute of "source" property + # Get type/value of the attribute of "source" property old_source_type = self._type_to_source_prop() old_source_value = self.source diff --git a/virtinst/devices/interface.py b/virtinst/devices/interface.py index b7963d56..5463f6d8 100644 --- a/virtinst/devices/interface.py +++ b/virtinst/devices/interface.py @@ -163,7 +163,7 @@ class DeviceInterface(Device): def is_conflict_net(conn, searchmac): """ :returns: a two element tuple: - first element is True if fatal collision occured + first element is True if fatal collision occurred second element is a string description of the collision. Non fatal collisions (mac addr collides with inactive guest) will diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py index 56ab8761..0ff7d92f 100644 --- a/virtinst/diskbackend.py +++ b/virtinst/diskbackend.py @@ -100,7 +100,7 @@ def check_if_path_managed(conn, path): return None, None # We have the parent pool, but didn't find a volume on first lookup - # attempt. Refresh the pool and try again, incase we were just out + # attempt. Refresh the pool and try again, in case we were just out # of date. try: pool.refresh(0) diff --git a/virtinst/progress.py b/virtinst/progress.py index 013b9dfa..01e28640 100644 --- a/virtinst/progress.py +++ b/virtinst/progress.py @@ -327,7 +327,7 @@ class RateEstimator: if now is None: now = time.time() # libcurl calls the progress callback when fetching headers # too, thus amount_read = 0 .. hdr_size .. 0 .. content_size. - # Ocassionally we miss the 2nd zero and report avg speed < 0. + # Occasionally we miss the 2nd zero and report avg speed < 0. # Handle read_diff < 0 here. BZ 1001767. if amount_read == 0 or amount_read < self.last_amount_read: # if we just started this file, all bets are off diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py index afc461b0..a8ea2a39 100644 --- a/virtinst/urlfetcher.py +++ b/virtinst/urlfetcher.py @@ -204,7 +204,7 @@ class _HTTPURLFetcher(_URLFetcher): def _write(self, urlobj, fileobj): """ The requests object doesn't have a file-like read() option, so - we need to implemente it ourselves + we need to implement it ourselves """ total = 0 for data in urlobj.iter_content(chunk_size=self._block_size): diff --git a/virtinst/util.py b/virtinst/util.py index 8233a866..b5629e1b 100644 --- a/virtinst/util.py +++ b/virtinst/util.py @@ -129,7 +129,7 @@ def generate_name(base, collision_cb, suffix="", lib_collision=True, :param lib_collision: If true, the collision_cb is not a boolean function, and instead throws a libvirt error on failure :param start_num: The number to start at for generating non colliding names - :param sep: The seperator to use between the basename and the + :param sep: The separator to use between the basename and the generated number (default is "-") :param force_num: Force the generated name to always end with a number :param collidelist: An extra list of names to check for collision -- 2.17.0 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list