ceph-disk: Compatibility fixes for Python 3 #9936
Conversation
| @@ -4092,7 +4091,7 @@ def list_devices(): | |||
|
|
|||
| uuid_map = {} | |||
| space_map = {} | |||
| for base, parts in sorted(six.iteritems(partmap)): | |||
| for base, parts in sorted(partmap.items()): | |||
There was a problem hiding this comment.
could you squash this commit into the previous one introducing six?
| @@ -18,6 +18,8 @@ | |||
| # GNU Library Public License for more details. | |||
There was a problem hiding this comment.
minor: the commit message lists some commit subjects that you squashed - you can delete those
|
these fixes look good to me - as discussed on irc, I think we should use py34 as the python 3 env, and add python34 to install-deps.sh so 'make check' passes on centos 7 and ubuntu trusty |
| for line in proc_mounts: | ||
| fields = line.split() | ||
| if len(fields) < 3: | ||
| continue | ||
| mounts_dev = fields[0] | ||
| path = fields[1] | ||
| if mounts_dev.startswith('/') and os.path.exists(mounts_dev): | ||
| if mounts_dev.startswith(b'/') and os.path.exists(mounts_dev): |
There was a problem hiding this comment.
could use os.path.isabs(mounts_dev) instead of mounts_dev.startswith(b'/')
|
needs rebase. |
onyb
force-pushed
the
wip-ceph-disk-py3
branch
4 times, most recently
from
07668c3
to
3e39ce2
Compare
| @@ -1987,6 +1987,7 @@ def prepare_file(self): | |||
| 'not the same device as the osd data' % | |||
| self.name) | |||
| self.space_symlink = space_file | |||
There was a problem hiding this comment.
it looks like space_symlink should be set to the path, not the file object
|
lgtm |
| @@ -213,7 +212,6 @@ def is_dmcrypt(ptype, name): | |||
| 'upstart', | |||
| 'sysvinit', | |||
| 'systemd', | |||
| 'openrc', | |||
There was a problem hiding this comment.
@onyb is this change on purpose? if yes, could you put the rationales in the commit message? and i guess it's not part of the pep8ifying.
|
tests passed, but this needs a rebase now |
onyb
force-pushed
the
wip-ceph-disk-py3
branch
from
beda375
to
9c41668
Compare
ceph-disk: Misc cleanups Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Python fcntl.lockf() accepts a file descriptor, not a file object Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
acquire and release methods of FileLock are dropped Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
onyb
force-pushed
the
wip-ceph-disk-py3
branch
from
9c41668
to
f7a15cc
Compare
|
lgtm. |
|
@jdurgin
good to merge then, i guess. |
ghost
mentioned this pull request
No description provided.