From 65b8156aa2a0c86e8eb6d0d88e9f91c75b250960 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Mon, 3 Sep 2012 16:02:50 +0000 Subject: Allow 'disk-size' in system morphologies to be an integer This is needed for being able to write morphologies to disk programmatically after making automatic changes to them using morph. --- morphlib/morph2.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'morphlib/morph2.py') diff --git a/morphlib/morph2.py b/morphlib/morph2.py index a707030d..801b6c3a 100644 --- a/morphlib/morph2.py +++ b/morphlib/morph2.py @@ -96,14 +96,17 @@ class Morphology(object): if 'disk-size' in self: size = self['disk-size'] - size = size.lower() - if size.endswith('g'): - size = int(size[:-1]) * 1024 ** 3 - elif size.endswith('m'): # pragma: no cover - size = int(size[:-1]) * 1024 ** 2 - elif size.endswith('k'): # pragma: no cover - size = int(size[:-1]) * 1024 - else: # pragma: no cover + if isinstance(size, basestring): + size = size.lower() + if size.endswith('g'): + size = int(size[:-1]) * 1024 ** 3 + elif size.endswith('m'): # pragma: no cover + size = int(size[:-1]) * 1024 ** 2 + elif size.endswith('k'): # pragma: no cover + size = int(size[:-1]) * 1024 + else: # pragma: no cover + size = int(size) + else: # pragma: no cover size = int(size) self._dict['disk-size'] = size -- cgit v1.2.1