Gentoo Archives: gentoo-commits

From: Vikraman Choudhury <vikraman.choudhury@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoostats:master commit in: client/bin/, client/
Date: Sun, 01 May 2011 09:51:13
Message-Id: 40c723a7581cda09900368747bc705614c7a90eb.vikraman@gentoo
1 commit: 40c723a7581cda09900368747bc705614c7a90eb
2 Author: Vikraman Choudhury <vikraman.choudhury <AT> gmail <DOT> com>
3 AuthorDate: Sun May 1 09:50:22 2011 +0000
4 Commit: Vikraman Choudhury <vikraman.choudhury <AT> gmail <DOT> com>
5 CommitDate: Sun May 1 09:50:22 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoostats.git;a=commit;h=40c723a7
7
8 fixed code style
9
10 ---
11 client/bin/client | 24 ++++++++++++------------
12 client/environment.py | 18 +++++++++---------
13 client/packages.py | 10 +++++-----
14 client/useflags.py | 8 ++++----
15 4 files changed, 30 insertions(+), 30 deletions(-)
16
17 diff --git a/client/bin/client b/client/bin/client
18 index 26edcb4..7d649d1 100755
19 --- a/client/bin/client
20 +++ b/client/bin/client
21 @@ -4,20 +4,20 @@ from packages import Packages
22 from useflags import UseFlags
23 from environment import Environment
24
25 -def main ():
26 - p = Packages ()
27 - u = UseFlags ()
28 - for cpv in p.getInstalledCPVs ():
29 +def main():
30 + p = Packages()
31 + u = UseFlags()
32 + for cpv in p.getInstalledCPVs():
33 print cpv,
34 - for x in u.getUseFlags (cpv):
35 + for x in u.getUseFlags(cpv):
36 print x,
37 print
38 - e = Environment ()
39 - print e.getVar ('CFLAGS')
40 - print e.getVar ('CXXFLAGS')
41 - print e.getVar ('LDFLAGS')
42 - print e.getVar ('CHOST')
43 - print e.getVar ('FEATURES')
44 + e = Environment()
45 + print e.getVar('CFLAGS')
46 + print e.getVar('CXXFLAGS')
47 + print e.getVar('LDFLAGS')
48 + print e.getVar('CHOST')
49 + print e.getVar('FEATURES')
50
51 if __name__ == "__main__":
52 - main ()
53 + main()
54
55 diff --git a/client/environment.py b/client/environment.py
56 index 5300bef..074c2d1 100644
57 --- a/client/environment.py
58 +++ b/client/environment.py
59 @@ -1,19 +1,19 @@
60
61 import logging
62 -from subprocess import *
63 +import subprocess
64
65 -class Environment:
66 +class Environment(object):
67
68 - def __init__ (self):
69 + def __init__(self):
70 try:
71 - p = Popen (['emerge', '--info'], stdout=PIPE)
72 - self.out = p.stdout.readlines ()
73 + p = subprocess.Popen(['emerge', '--info'], stdout=subprocess.PIPE)
74 + self.out = p.stdout.readlines()
75 except OSError, e:
76 - fatal ('Cannot run emerge --info')
77 + fatal('Cannot run emerge --info')
78 raise e
79
80 - def getVar (self, myvar):
81 + def getVar(self, myvar):
82 for line in self.out:
83 - if line.startswith (myvar):
84 - return line.strip ()
85 + if line.startswith(myvar):
86 + return line.strip()
87 return ''
88
89 diff --git a/client/packages.py b/client/packages.py
90 index 5d41061..4e2bdcd 100644
91 --- a/client/packages.py
92 +++ b/client/packages.py
93 @@ -2,11 +2,11 @@
94 import logging
95 from dbapi import VARDB
96
97 -class Packages:
98 - def getInstalledCPs (self):
99 - installed_cps = sorted (VARDB.cp_all ())
100 +class Packages(object):
101 + def getInstalledCPs(self):
102 + installed_cps = sorted(VARDB.cp_all())
103 return installed_cps
104
105 - def getInstalledCPVs (self):
106 - installed_cpvs = sorted (VARDB.cpv_all ())
107 + def getInstalledCPVs(self):
108 + installed_cpvs = sorted(VARDB.cpv_all())
109 return installed_cpvs
110
111 diff --git a/client/useflags.py b/client/useflags.py
112 index 40f453c..1dbda1e 100644
113 --- a/client/useflags.py
114 +++ b/client/useflags.py
115 @@ -1,7 +1,7 @@
116
117 -from gentoolkit.flag import *
118 +from gentoolkit import flag
119
120 -class UseFlags:
121 +class UseFlags(object):
122
123 - def getUseFlags (self, cpv):
124 - return get_flags (cpv, True)[1]
125 + def getUseFlags(self, cpv):
126 + return flag.get_flags(cpv, True)[1]