While we're at it, some other PEP8 stuff.

[obama] Except too long lines, because big screens.
This commit is contained in:
enkore 2013-10-09 09:58:38 +02:00
parent d63896d465
commit cdbb2f3e36
11 changed files with 21 additions and 35 deletions

17
.idea/misc.xml generated
View File

@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.3.2 (/usr/bin/python3.3)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.3.2 (/usr/bin/python3.3)" project-jdk-type="Python SDK" />
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="mySSHConnectionTimeout" value="30000" />
<option name="mySSHReadTimeout" value="30000" />
<option name="LAST_MERGED_REVISION" />
<option name="MERGE_DRY_RUN" value="false" />
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
<option name="FORCE_UPDATE" value="false" />
<option name="IGNORE_EXTERNALS" value="false" />
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
</component>
</project> </project>

View File

@ -297,7 +297,7 @@ __Settings:__
* `alert_format_title` — The title of the notification, all formatters can be used (default: `Low battery`) * `alert_format_title` — The title of the notification, all formatters can be used (default: `Low battery`)
* `alert_format_body` — The body text of the notification, all formatters can be used (default: `Battery {battery_ident} has only {percentage:.2f}% ({remaining:%E%hh:%Mm}) remaining!`) * `alert_format_body` — The body text of the notification, all formatters can be used (default: `Battery {battery_ident} has only {percentage:.2f}% ({remaining:%E%hh:%Mm}) remaining!`)
* `path` — Override the default-generated path (default: `None`) * `path` — Override the default-generated path (default: `None`)
* `status` — A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: `{'FULL': 'FULL', 'DIS': 'DIS', 'CHR': 'CHR'}`) * `status` — A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: `{'DIS': 'DIS', 'CHR': 'CHR', 'FULL': 'FULL'}`)
@ -503,7 +503,7 @@ __Settings:__
* `host` — (default: `localhost`) * `host` — (default: `localhost`)
* `port` — MPD port (default: `6600`) * `port` — MPD port (default: `6600`)
* `format` — formatp string (default: `{title} {status}`) * `format` — formatp string (default: `{title} {status}`)
* `status` — Dictionary mapping pause, play and stop to output (default: `{'pause': '▷', 'stop': '◾', 'play': '▶'}`) * `status` — Dictionary mapping pause, play and stop to output (default: `{'stop': '◾', 'play': '▶', 'pause': '▷'}`)

View File

@ -1,11 +1,15 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os, locale, datetime import os
import locale
import datetime
from i3pystatus import IntervalModule from i3pystatus import IntervalModule
class Clock(IntervalModule): class Clock(IntervalModule):
""" """
This class shows a clock This class shows a clock
""" """

View File

@ -23,8 +23,6 @@ class Disk(IntervalModule):
divisor = 1024 ** 3 divisor = 1024 ** 3
def run(self): def run(self):
cdict = {}
stat = os.statvfs(self.path) stat = os.statvfs(self.path)
cdict = { cdict = {
"total": (stat.f_bsize * stat.f_blocks) / self.divisor, "total": (stat.f_bsize * stat.f_blocks) / self.divisor,

View File

@ -3,6 +3,7 @@ from psutil import virtual_memory
MEGABYTE = 1024**2 MEGABYTE = 1024**2
class Mem(IntervalModule): class Mem(IntervalModule):
""" """
Shows memory load Shows memory load
@ -24,9 +25,9 @@ class Mem(IntervalModule):
def run(self): def run(self):
vm = virtual_memory() vm = virtual_memory()
self.output = { self.output = {
"full_text" : self.format.format( "full_text": self.format.format(
used_mem=int(round(vm.used/MEGABYTE, 0)), used_mem=int(round(vm.used / MEGABYTE, 0)),
avail_mem=int(round(vm.available/MEGABYTE, 0)), avail_mem=int(round(vm.available / MEGABYTE, 0)),
total_mem=int(round(vm.total/MEGABYTE, 0)), total_mem=int(round(vm.total / MEGABYTE, 0)),
percent_used_mem=vm.percent) percent_used_mem=vm.percent)
} }