Revision 691744c4
b/lib/backend.py | ||
---|---|---|
811 | 811 |
"vg_free": int(round(float(valarr[1]), 0)), |
812 | 812 |
"pv_count": int(valarr[2]), |
813 | 813 |
} |
814 |
except ValueError, err:
|
|
814 |
except (TypeError, ValueError), err:
|
|
815 | 815 |
logging.exception("Fail to parse vgs output") |
816 | 816 |
else: |
817 | 817 |
logging.error("vgs output has the wrong number of fields (expected" |
b/lib/bdev.py | ||
---|---|---|
459 | 459 |
try: |
460 | 460 |
major = int(major) |
461 | 461 |
minor = int(minor) |
462 |
except ValueError, err:
|
|
462 |
except (TypeError, ValueError), err:
|
|
463 | 463 |
logging.error("lvs major/minor cannot be parsed: %s", str(err)) |
464 | 464 |
|
465 | 465 |
try: |
... | ... | |
874 | 874 |
result.fail_reason, result.output) |
875 | 875 |
try: |
876 | 876 |
sectors = int(result.stdout) |
877 |
except ValueError:
|
|
877 |
except (TypeError, ValueError):
|
|
878 | 878 |
_ThrowError("Invalid output from blockdev: '%s'", result.stdout) |
879 | 879 |
bytes = sectors * 512 |
880 | 880 |
if bytes < 128 * 1024 * 1024: # less than 128MiB |
b/lib/cli.py | ||
---|---|---|
827 | 827 |
if unitfields.Matches(fields[idx]): |
828 | 828 |
try: |
829 | 829 |
val = int(val) |
830 |
except ValueError:
|
|
830 |
except (TypeError, ValueError):
|
|
831 | 831 |
pass |
832 | 832 |
else: |
833 | 833 |
val = row[idx] = utils.FormatUnit(val, units) |
... | ... | |
902 | 902 |
if value[-1] not in suffix_map: |
903 | 903 |
try: |
904 | 904 |
value = int(value) |
905 |
except ValueError:
|
|
905 |
except (TypeError, ValueError):
|
|
906 | 906 |
raise errors.OpPrereqError("Invalid time specification '%s'" % value) |
907 | 907 |
else: |
908 | 908 |
multiplier = suffix_map[value[-1]] |
... | ... | |
912 | 912 |
" suffix passed)") |
913 | 913 |
try: |
914 | 914 |
value = int(value) * multiplier |
915 |
except ValueError:
|
|
915 |
except (TypeError, ValueError):
|
|
916 | 916 |
raise errors.OpPrereqError("Invalid time specification '%s'" % value) |
917 | 917 |
return value |
918 | 918 |
|
b/lib/cmdlib.py | ||
---|---|---|
4655 | 4655 |
raise errors.OpPrereqError("Missing disk size") |
4656 | 4656 |
try: |
4657 | 4657 |
size = int(size) |
4658 |
except ValueError:
|
|
4658 |
except (TypeError, ValueError):
|
|
4659 | 4659 |
raise errors.OpPrereqError("Invalid disk size '%s'" % size) |
4660 | 4660 |
self.disks.append({"size": size, "mode": mode}) |
4661 | 4661 |
|
... | ... | |
6012 | 6012 |
raise errors.OpPrereqError("Required disk parameter size missing") |
6013 | 6013 |
try: |
6014 | 6014 |
size = int(size) |
6015 |
except ValueError, err:
|
|
6015 |
except (TypeError, ValueError), err:
|
|
6016 | 6016 |
raise errors.OpPrereqError("Invalid disk size parameter: %s" % |
6017 | 6017 |
str(err)) |
6018 | 6018 |
disk_dict['size'] = size |
... | ... | |
6970 | 6970 |
" '%s'" % (nname, attr)) |
6971 | 6971 |
try: |
6972 | 6972 |
remote_info[attr] = int(remote_info[attr]) |
6973 |
except ValueError, err:
|
|
6973 |
except (TypeError, ValueError), err:
|
|
6974 | 6974 |
raise errors.OpExecError("Node '%s' returned invalid value" |
6975 | 6975 |
" for '%s': %s" % (nname, attr, err)) |
6976 | 6976 |
# compute memory used by primary instances |
b/lib/http/__init__.py | ||
---|---|---|
1002 | 1002 |
if hdr_content_length: |
1003 | 1003 |
try: |
1004 | 1004 |
self.content_length = int(hdr_content_length) |
1005 |
except ValueError:
|
|
1005 |
except (TypeError, ValueError):
|
|
1006 | 1006 |
self.content_length = None |
1007 | 1007 |
if self.content_length is not None and self.content_length < 0: |
1008 | 1008 |
self.content_length = None |
b/lib/http/client.py | ||
---|---|---|
122 | 122 |
status = int(status) |
123 | 123 |
if status < 100 or status > 999: |
124 | 124 |
status = -1 |
125 |
except ValueError:
|
|
125 |
except (TypeError, ValueError):
|
|
126 | 126 |
status = -1 |
127 | 127 |
|
128 | 128 |
if status == -1: |
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
118 | 118 |
data[2] = int(data[2]) |
119 | 119 |
data[3] = int(data[3]) |
120 | 120 |
data[5] = float(data[5]) |
121 |
except ValueError, err:
|
|
121 |
except (TypeError, ValueError), err:
|
|
122 | 122 |
raise errors.HypervisorError("Can't parse output of xm list," |
123 | 123 |
" line: %s, error: %s" % (line, err)) |
124 | 124 |
|
b/lib/objects.py | ||
---|---|---|
669 | 669 |
try: |
670 | 670 |
idx = int(idx) |
671 | 671 |
return self.disks[idx] |
672 |
except ValueError, err:
|
|
672 |
except (TypeError, ValueError), err:
|
|
673 | 673 |
raise errors.OpPrereqError("Invalid disk index: '%s'" % str(err)) |
674 | 674 |
except IndexError: |
675 | 675 |
raise errors.OpPrereqError("Invalid disk index: %d (instace has disks" |
b/lib/utils.py | ||
---|---|---|
502 | 502 |
|
503 | 503 |
try: |
504 | 504 |
pid = int(pf.read()) |
505 |
except ValueError, err:
|
|
505 |
except (TypeError, ValueError), err:
|
|
506 | 506 |
logging.info("Can't parse pid file contents", exc_info=True) |
507 | 507 |
return 0 |
508 | 508 |
|
b/scripts/gnt-backup | ||
---|---|---|
118 | 118 |
if opts.nics: |
119 | 119 |
try: |
120 | 120 |
nic_max = max(int(nidx[0])+1 for nidx in opts.nics) |
121 |
except ValueError, err:
|
|
121 |
except (TypeError, ValueError), err:
|
|
122 | 122 |
raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err)) |
123 | 123 |
nics = [{}] * nic_max |
124 | 124 |
for nidx, ndict in opts.nics: |
... | ... | |
146 | 146 |
opts.disks = [(0, {"size": opts.sd_size})] |
147 | 147 |
try: |
148 | 148 |
disk_max = max(int(didx[0])+1 for didx in opts.disks) |
149 |
except ValueError, err:
|
|
149 |
except (TypeError, ValueError), err:
|
|
150 | 150 |
raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err)) |
151 | 151 |
disks = [{}] * disk_max |
152 | 152 |
for didx, ddict in opts.disks: |
... | ... | |
155 | 155 |
raise errors.OpPrereqError("Missing size for disk %d" % didx) |
156 | 156 |
try: |
157 | 157 |
ddict["size"] = utils.ParseUnit(ddict["size"]) |
158 |
except ValueError, err:
|
|
158 |
except (TypeError, ValueError), err:
|
|
159 | 159 |
raise errors.OpPrereqError("Invalid disk size for disk %d: %s" % |
160 | 160 |
(didx, err)) |
161 | 161 |
disks[didx] = ddict |
b/scripts/gnt-instance | ||
---|---|---|
296 | 296 |
if opts.nics: |
297 | 297 |
try: |
298 | 298 |
nic_max = max(int(nidx[0])+1 for nidx in opts.nics) |
299 |
except ValueError, err:
|
|
299 |
except (TypeError, ValueError), err:
|
|
300 | 300 |
raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err)) |
301 | 301 |
nics = [{}] * nic_max |
302 | 302 |
for nidx, ndict in opts.nics: |
... | ... | |
324 | 324 |
opts.disks = [(0, {"size": opts.sd_size})] |
325 | 325 |
try: |
326 | 326 |
disk_max = max(int(didx[0])+1 for didx in opts.disks) |
327 |
except ValueError, err:
|
|
327 |
except (TypeError, ValueError), err:
|
|
328 | 328 |
raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err)) |
329 | 329 |
disks = [{}] * disk_max |
330 | 330 |
for didx, ddict in opts.disks: |
... | ... | |
333 | 333 |
raise errors.OpPrereqError("Missing size for disk %d" % didx) |
334 | 334 |
try: |
335 | 335 |
ddict["size"] = utils.ParseUnit(ddict["size"]) |
336 |
except ValueError, err:
|
|
336 |
except (TypeError, ValueError), err:
|
|
337 | 337 |
raise errors.OpPrereqError("Invalid disk size for disk %d: %s" % |
338 | 338 |
(didx, err)) |
339 | 339 |
disks[didx] = ddict |
... | ... | |
459 | 459 |
for elem in specs['disk_size']: |
460 | 460 |
try: |
461 | 461 |
size = utils.ParseUnit(elem) |
462 |
except ValueError, err:
|
|
462 |
except (TypeError, ValueError), err:
|
|
463 | 463 |
raise errors.OpPrereqError("Invalid disk size '%s' for" |
464 | 464 |
" instance %s: %s" % |
465 | 465 |
(elem, name, err)) |
... | ... | |
674 | 674 |
disk = args[1] |
675 | 675 |
try: |
676 | 676 |
disk = int(disk) |
677 |
except ValueError, err:
|
|
677 |
except (TypeError, ValueError), err:
|
|
678 | 678 |
raise errors.OpPrereqError("Invalid disk index: %s" % str(err)) |
679 | 679 |
amount = utils.ParseUnit(args[2]) |
680 | 680 |
op = opcodes.OpGrowDisk(instance_name=instance, disk=disk, amount=amount, |
... | ... | |
806 | 806 |
else: |
807 | 807 |
try: |
808 | 808 |
disks = [int(i) for i in opts.disks.split(",")] |
809 |
except ValueError, err:
|
|
809 |
except (TypeError, ValueError), err:
|
|
810 | 810 |
raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err)) |
811 | 811 |
cnt = [opts.on_primary, opts.on_secondary, |
812 | 812 |
new_2ndary is not None, iallocator is not None].count(True) |
... | ... | |
1211 | 1211 |
try: |
1212 | 1212 |
nic_op = int(nic_op) |
1213 | 1213 |
opts.nics[idx] = (nic_op, nic_dict) |
1214 |
except ValueError:
|
|
1214 |
except (TypeError, ValueError):
|
|
1215 | 1215 |
pass |
1216 | 1216 |
|
1217 | 1217 |
for idx, (disk_op, disk_dict) in enumerate(opts.disks): |
1218 | 1218 |
try: |
1219 | 1219 |
disk_op = int(disk_op) |
1220 | 1220 |
opts.disks[idx] = (disk_op, disk_dict) |
1221 |
except ValueError:
|
|
1221 |
except (TypeError, ValueError):
|
|
1222 | 1222 |
pass |
1223 | 1223 |
if disk_op == constants.DDM_ADD: |
1224 | 1224 |
if 'size' not in disk_dict: |
Also available in: Unified diff