← Back to branch summary

~ubuntu-branches/ubuntu/wily/spyder/wily-proposed

« back to all changes in this revision

Viewing changes to spyderlib/widgets/status.py

  • Committer: Package Import Robot
  • Author(s): Picca Frédéric-Emmanuel
  • Date: 2014-07-18 11:15:00 UTC
  • mfrom: (1.2.7) (18.1.6 experimental)
  • Revision ID: package-import@ubuntu.com-20140718111500-72rz4fp5tysypx20
Tags: 2.3.0+dfsg-1
Imported Upstream version 2.3.0+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
spyderlib/widgets/status.py
12
12
# Local import
13
13
from spyderlib.baseconfig import _
14
14
from spyderlib.guiconfig import get_font
 
15
from spyderlib.py3compat import to_text_string
 
16
from spyderlib import dependencies
 
17
 
 
18
 
 
19
PSUTIL_REQVER = '>=0.3'
 
20
dependencies.add("psutil", _("CPU and memory usage info in the status bar"),
 
21
                 required_version=PSUTIL_REQVER)
15
22
 
16
23
 
17
24
class StatusBarWidget(QWidget):
136
143
        layout.addSpacing(20)
137
144
        
138
145
    def eol_changed(self, os_name):
139
 
        os_name = unicode(os_name)
 
146
        os_name = to_text_string(os_name)
140
147
        self.eol.setText({"nt": "CRLF", "posix": "LF"}.get(os_name, "CR"))
141
148
 
142
149
class EncodingStatus(StatusBarWidget):