From: Shyamsundar Ranganathan <srangana@redhat.com>
Date: Wed, 26 Aug 2020 23:22:09 +0000 (-0400)
Subject: mgr/volumes: Address python breakage in python 2
X-Git-Tag: v14.2.12~111^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8d053b7e9e016fd8fe9fbb8a2aef8c8f3fb97ba;p=ceph.git

mgr/volumes: Address python breakage in python 2

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 284dd3c4829f95b9618d98da49e59ec1c56dde61)
---

diff --git a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
index ee86bdc85ca1..f2cca47183c7 100644
--- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
+++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
@@ -4,7 +4,6 @@ import uuid
 import errno
 import logging
 from hashlib import md5
-from typing import Dict, Union
 
 import cephfs
 
@@ -126,7 +125,7 @@ class SubvolumeBase(object):
 
     def get_attrs(self, pathname):
         # get subvolume attributes
-        attrs = {} # type: Dict[str, Union[int, str, None]]
+        attrs = {}
         stx = self.fs.statx(pathname,
                             cephfs.CEPH_STATX_UID | cephfs.CEPH_STATX_GID | cephfs.CEPH_STATX_MODE,
                             cephfs.AT_SYMLINK_NOFOLLOW)