From 0ccffb6b503d7a285f3d5f7d7e44999d6eb60784 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 19 Dec 2006 02:22:44 +0000 Subject: [PATCH 1/1] fix imports --- lib/python/Components/DiskInfo.py | 4 ++-- lib/python/Components/Harddisk.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/python/Components/DiskInfo.py b/lib/python/Components/DiskInfo.py index 0b7e0bcb..ba04ea49 100644 --- a/lib/python/Components/DiskInfo.py +++ b/lib/python/Components/DiskInfo.py @@ -1,6 +1,6 @@ from GUIComponent import * from VariableText import * -import os +from os import statvfs from enigma import eLabel @@ -21,7 +21,7 @@ class DiskInfo(VariableText, GUIComponent): def update(self): try: - stat = os.statvfs(self.path) + stat = statvfs(self.path) except OSError: return -1 diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index fee1ed74..7ba468e9 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -1,4 +1,4 @@ -from os import system +from os import system, listdir, statvfs, popen from Tools.Directories import SCOPE_HDD, resolveFilename @@ -82,7 +82,7 @@ class Harddisk: if line.startswith(self.devidex): parts = line.strip().split(" ") try: - stat = os.statvfs(parts[1]) + stat = statvfs(parts[1]) except OSError: continue free = stat.f_bfree/1000 * stat.f_bsize/1000 @@ -92,7 +92,7 @@ class Harddisk: def numPartitions(self): try: - idedir = os.listdir(self.devidex) + idedir = listdir(self.devidex) except OSError: return -1 numPart = -1 @@ -110,7 +110,7 @@ class Harddisk: def createPartition(self): cmd = "/sbin/sfdisk -f " + self.devidex + "disc" - sfdisk = os.popen(cmd, "w") + sfdisk = popen(cmd, "w") sfdisk.write("0,\n;\n;\n;\ny\n") sfdisk.close() return 0 @@ -168,7 +168,7 @@ class Partition: self.description = description def stat(self): - return os.statvfs(self.mountpoint) + return statvfs(self.mountpoint) def free(self): try: -- 2.30.2