54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
|
Subject: Remove deprecated statvfs module
|
||
|
|
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:35:47 2017 +0100
|
||
|
|
Date: Fri Oct 20 11:49:14 2017 -0400:
|
||
|
|
Git: dff00d4fc02aa88036d0c7aa13324276fe08f14f
|
||
|
|
|
||
|
|
The statvfs module has been removed in Python 3. [1]
|
||
|
|
It is replaced by os.statvfs which is also available in Pyhton 2.
|
||
|
|
|
||
|
|
[1] https://docs.python.org/2/library/statvfs.html#module-statvfs
|
||
|
|
[2] https://docs.python.org/3/library/os.html#os.statvfs
|
||
|
|
|
||
|
|
diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py
|
||
|
|
index cdfd78e1..c137e2b3 100644
|
||
|
|
--- a/virtManager/addstorage.py
|
||
|
|
+++ b/virtManager/addstorage.py
|
||
|
|
@@ -19,7 +19,6 @@
|
||
|
|
|
||
|
|
import logging
|
||
|
|
import os
|
||
|
|
-import statvfs
|
||
|
|
|
||
|
|
from gi.repository import GObject
|
||
|
|
from gi.repository import Gtk
|
||
|
|
@@ -81,7 +80,7 @@ class vmmAddStorage(vmmGObjectUI):
|
||
|
|
|
||
|
|
elif not self.conn.is_remote() and os.path.exists(path):
|
||
|
|
vfs = os.statvfs(os.path.dirname(path))
|
||
|
|
- avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
||
|
|
+ avail = vfs.f_frsize * vfs.f_bavail
|
||
|
|
|
||
|
|
return float(avail / 1024.0 / 1024.0 / 1024.0)
|
||
|
|
|
||
|
|
diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py
|
||
|
|
index a08a23e5..636aa51f 100644
|
||
|
|
--- a/virtinst/diskbackend.py
|
||
|
|
+++ b/virtinst/diskbackend.py
|
||
|
|
@@ -22,7 +22,6 @@ import logging
|
||
|
|
import os
|
||
|
|
import re
|
||
|
|
import stat
|
||
|
|
-import statvfs
|
||
|
|
|
||
|
|
import libvirt
|
||
|
|
|
||
|
|
@@ -391,7 +390,7 @@ class CloneStorageCreator(_StorageCreator):
|
||
|
|
avail = _stat_disk(self._path)[1]
|
||
|
|
else:
|
||
|
|
vfs = os.statvfs(os.path.dirname(self._path))
|
||
|
|
- avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
||
|
|
+ avail = vfs.f_frsize * vfs.f_bavail
|
||
|
|
need = long(self._size * 1024 * 1024 * 1024)
|
||
|
|
if need > avail:
|
||
|
|
if self._sparse:
|