Make get_lsb_information out of class

merge-requests/64/head
Huluti 2016-12-04 19:10:33 +01:00
parent 4f39df9388
commit ef2e4d10da
1 changed files with 19 additions and 19 deletions

View File

@ -58,26 +58,8 @@ class ManjaroHello(Gtk.Window):
self.window.show() self.window.show()
def get_lsb_information(self):
lsb = {}
try:
with open("/etc/lsb-release") as lsb_file:
for line in lsb_file:
if "=" in line:
var, arg = line.rstrip().split("=")
if var.startswith("DISTRIB_"):
var = var[8:]
if arg.startswith("\"") and arg.endswith("\""):
arg = arg[1:-1]
if arg:
lsb[var] = arg
except (IOError, OSError) as msg:
print(msg)
return lsb
def get_infos(self): def get_infos(self):
lsb = self.get_lsb_information() lsb = get_lsb_information()
infos = {} infos = {}
infos["codename"] = lsb.get("CODENAME", 0) infos["codename"] = lsb.get("CODENAME", 0)
infos["release"] = lsb.get("RELEASE", 0) infos["release"] = lsb.get("RELEASE", 0)
@ -152,5 +134,23 @@ class ManjaroHello(Gtk.Window):
def on_delete_window(self, *args): def on_delete_window(self, *args):
Gtk.main_quit(*args) Gtk.main_quit(*args)
def get_lsb_information():
lsb = {}
try:
with open("/etc/lsb-release") as lsb_file:
for line in lsb_file:
if "=" in line:
var, arg = line.rstrip().split("=")
if var.startswith("DISTRIB_"):
var = var[8:]
if arg.startswith("\"") and arg.endswith("\""):
arg = arg[1:-1]
if arg:
lsb[var] = arg
except (IOError, OSError) as msg:
print(msg)
return lsb
win = ManjaroHello() win = ManjaroHello()
Gtk.main() Gtk.main()