x/deb-oslo.utils
Code Issues Proposed changes

Merge "Add missing doc index for imageutils and fnmatch"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 18:02:48 +00:00 committed by Gerrit Code Review
commit 36de45dd52
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/index.rst
View File

@ -23,6 +23,8 @@ API Documentation
api/excutils api/excutils
api/fileutils api/fileutils
api/fixture api/fixture
api/fnmatch
api/imageutils
api/importutils api/importutils
api/netutils api/netutils
api/reflection api/reflection

2
oslo_utils/fnmatch.py
View File

@ -15,6 +15,8 @@
Standard library fnmatch in Python versions <= 2.7.9 has thread safe Standard library fnmatch in Python versions <= 2.7.9 has thread safe
issue, this module is created for such case. see: issue, this module is created for such case. see:
https://bugs.python.org/issue23191 https://bugs.python.org/issue23191
.. versionadded:: 3.3
""" """
from __future__ import absolute_import from __future__ import absolute_import

8
oslo_utils/imageutils.py
View File

@ -17,6 +17,8 @@
""" """
Helper methods to deal with images. Helper methods to deal with images.
.. versionadded:: 3.1
""" """
import re import re
@ -26,6 +28,12 @@ from oslo_utils import strutils
class QemuImgInfo(object): class QemuImgInfo(object):
"""Parse Qemu image information from command `qemu-img info`'s output.
The instance of :class:`QemuImgInfo` has properties: `image`,
`backing_file`, `file_format`, `virtual_size`, `cluster_size`,
`disk_size`, `snapshots` and `encrypted`.
"""
BACKING_FILE_RE = re.compile((r"^(.*?)\s*\(actual\s+path\s*:" BACKING_FILE_RE = re.compile((r"^(.*?)\s*\(actual\s+path\s*:"
r"\s+(.*?)\)\s*$"), re.I) r"\s+(.*?)\)\s*$"), re.I)
TOP_LEVEL_RE = re.compile(r"^([\w\d\s\_\-]+):(.*)$") TOP_LEVEL_RE = re.compile(r"^([\w\d\s\_\-]+):(.*)$")