ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
Subject: Replace 'StandardError' with 'Exception'
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:36:01 2017 +0100
|
|
Date: Fri Oct 20 13:18:31 2017 -0400:
|
|
Git: 37ea520773bc7339e114915daac1ca1a8a0334bd
|
|
|
|
Python 2 has an exception class called StandardError that has
|
|
been removed in Python 3. Use Exception instead. [1]
|
|
|
|
[1] http://python3porting.com/differences.html#standarderror
|
|
|
|
diff --git a/virtconv/ovf.py b/virtconv/ovf.py
|
|
index 3ba21313..16ec5681 100644
|
|
--- a/virtconv/ovf.py
|
|
+++ b/virtconv/ovf.py
|
|
@@ -269,10 +269,9 @@ def _import_file(doc, ctx, conn, input_file):
|
|
|
|
if not bool_val(env_node.prop("required")):
|
|
continue
|
|
- raise StandardError(_("OVF section '%s' is listed as "
|
|
- "required, but parser doesn't know "
|
|
- "how to handle it.") %
|
|
- env_node.name)
|
|
+ raise Exception(_("OVF section '%s' is listed as "
|
|
+ "required, but parser doesn't know "
|
|
+ "how to handle it.") % env_node.name)
|
|
|
|
disk_buses = {}
|
|
for node in ctx.xpathEval(vhbase % DEVICE_IDE_BUS):
|