summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurie Clark-Michalek <bluepeppers@archlinux.us>2010-11-19 20:08:16 +0000
committerLaurie Clark-Michalek <bluepeppers@archlinux.us>2010-11-19 20:08:16 +0000
commit2572b4e4c55750ec92e4a6f0c00a9dd35db071b8 (patch)
tree63386cc21ce0176d8c440f26e57b06f06b0b608a
parent5f23927c3beaec3c0e14a7cae5e96eb6a0f97d3e (diff)
Removed 'key' from forced attributes when using @shell_command.
-rw-r--r--archey.new6
1 files changed, 3 insertions, 3 deletions
diff --git a/archey.new b/archey.new
index a6095c9..bb66030 100644
--- a/archey.new
+++ b/archey.new
@@ -319,9 +319,9 @@ class DesktopEnvironment(BaseDisplay):
de = ''
for key in DE_DICT.keys():
if key in PROCESSES:
- wm = DE_DICT[key]
+ de = DE_DICT[key]
break
- return wm
+ return de
def enviroment_variable(klass):
"""
@@ -381,7 +381,7 @@ def shell_command(klass):
stdout, stderr = cmd.communicate()
return self.process_output(stdout.decode('ascii'), stderr.decode('ascii'))
- if not all(hasattr(klass, name) for name in ('command', 'key', 'process_output')):
+ if not all(hasattr(klass, name) for name in ('command', 'process_output')):
raise ArcheyException("Classes decorated with @shell_command must have "
"a key and command attributes, and the process_output method")
else: