Merge "Remove some Python 2.6 compatibility code in ring"

Code Issues Proposed changes

This commit is contained in:

Zuul

2018年05月31日 23:55:57 +00:00

committed by Gerrit Code Review

parent 4790ac61e6 844bba8aaf

commit 78126b2555

1 changed files with 1 additions and 4 deletions

@@ -104,10 +104,7 @@ class RingData(object):

:param bool metadata_only: If True, only load `devs` and `part_shift`.

:returns: A RingData instance containing the loaded data.

"""

gz_file = GzipFile(filename, 'rb')

# Python 2.6 GzipFile doesn't support BufferedIO

if hasattr(gz_file, '_checkReadable'):

gz_file = BufferedReader(gz_file)

gz_file = BufferedReader(GzipFile(filename, 'rb'))

# See if the file is in the new format

magic = gz_file.read(4)