Correct minor PEP8 and update doc

NEWS

@@ -9,6 +9,12 @@ Enhancements and new features:
 
     * Add a connector to Riemann (issue #822 by Greogo Nagy)
 
+Bugs corrected:
+
+    * Browsing for servers which are in the [serverlist] is broken (issue #819)
+    * [WebUI] Glances will not get past loading screen (issue #815) opened 9 days ago
+    * Python error after upgrading from 2.5.1 to 2.6 bug (issue #813)
+
 Version 2.6
 ===========
 
@@ -41,6 +47,7 @@ Enhancements and new features:
     * InfluxDB > 0.9.3 needs float and not int for numerical value (issue#749 and issue#750 by nicolargo)
 
 Bugs corrected:
+
     * Can't read sensors on a Thinkpad (issue #711)
     * InfluxDB/OpenTSDB: tag parsing broken (issue #713)
     * Grafana Dashboard outdated for InfluxDB 0.9.x (issue #648)

README.rst

@@ -229,21 +229,19 @@ Known issue on RHEL/CentOS/Fedora installation
 
 For Python 2.6 RedHat-based distros there might be an issue with starting Glances:
 
-```
-Traceback (most recent call last):
-File "/usr/bin/glances", line 5, in <module>
-from pkg_resources import load_entry_point
-File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 2655, in <module>
-workingset.require(_requires)
-File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 648, in require
-needed = self.resolve(parse_requirements(requirements))
-File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 546, in resolve
-raise DistributionNotFound(req)
-pkg_resources.DistributionNotFound: argparse
-```
-
-Try upgrading setuptools, has been proven to solve the problem: 
-    
+    Traceback (most recent call last):
+    File "/usr/bin/glances", line 5, in <module>
+    from pkg_resources import load_entry_point
+    File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 2655, in <module>
+    workingset.require(_requires)
+    File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 648, in require
+    needed = self.resolve(parse_requirements(requirements))
+    File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 546, in resolve
+    raise DistributionNotFound(req)
+    pkg_resources.DistributionNotFound: argparse
+
+Try upgrading setuptools, has been proven to solve the problem:
+
     sudo pip install -U setuptools
 
 Usage

docs/man/glances.1

 .\" Man page generated from reStructuredText.
 .
-.TH "GLANCES" "1" "March 16, 2016" "2.6" "Glances"
+.TH "GLANCES" "1" "March 26, 2016" "2.6.1" "Glances"
 .SH NAME
 glances \- An eye on your system
 .

glances/__init__.py

@@ -27,7 +27,7 @@ import sys
 
 # Global name
 __appname__ = 'glances'
-__version__ = '2.7_BETA'
+__version__ = '2.6.1'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPL'
 

glances/exports/glances_riemann.py

@@ -84,10 +84,9 @@ class Export(GlancesExport):
             if not isinstance(points[i], Number):
                 continue
             else:
-                data = { 'host': self.hostname, 'service': name + " " + columns[i], 'metric': points[i] }
+                data = {'host': self.hostname, 'service': name + " " + columns[i], 'metric': points[i]}
                 logger.debug(data)
                 try:
                     self.client.send(data)
                 except Exception as e:
                     logger.error("Can not export stats to Riemann (%s)" % e)
-

glances/outputs/glances_curses_browser.py

@@ -271,4 +271,3 @@ class GlancesCursesBrowser(_GlancesCurses):
             line += 1
 
         return True
-

setup.py

@@ -50,13 +50,12 @@ def get_requires():
 
 setup(
     name='Glances',
-    version='2.6',
+    version='2.6.1',
     description="A cross-platform curses-based monitoring tool",
     long_description=open('README.rst').read(),
     author='Nicolas Hennion',
     author_email='nicolas@nicolargo.com',
     url='https://github.com/nicolargo/glances',
-    # download_url='https://s3.amazonaws.com/glances/glances-2.6.tar.gz',
     license="LGPL",
     keywords="cli curses monitoring system",
     install_requires=get_requires(),

sonar-project.properties

 # Required metadata
 sonar.projectKey=glances
 sonar.projectName=Glances
-sonar.projectVersion=2.6
+sonar.projectVersion=2.6.1
 
 # Path to the parent source code directory.
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.