diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/flake8/options/manager.py | 6 | ||||
| -rw-r--r-- | src/flake8/utils.py | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/flake8/options/manager.py b/src/flake8/options/manager.py index fe3b13b..c6a3fcb 100644 --- a/src/flake8/options/manager.py +++ b/src/flake8/options/manager.py @@ -236,8 +236,10 @@ class OptionManager(object): def update_version_string(self): """Update the flake8 version string.""" - self.parser.version = (self.version + ' (' + - self.generate_versions() + ')') + self.parser.version = ( + self.version + ' (' + self.generate_versions() + ') ' + + utils.get_python_version() + ) def generate_epilog(self): """Create an epilog with the version and name of each of plugin.""" diff --git a/src/flake8/utils.py b/src/flake8/utils.py index fbd15b9..68ed530 100644 --- a/src/flake8/utils.py +++ b/src/flake8/utils.py @@ -4,6 +4,7 @@ import fnmatch as _fnmatch import inspect import io import os +import platform import re import sys @@ -290,3 +291,19 @@ def parameters_for(plugin): parameters.pop('self', None) return parameters + + +def get_python_version(): + """Find and format the python implementation and version. + + :returns: + Implementation name, version, and platform as a string. + :rtype: + str + """ + # The implementation isn't all that important. + try: + impl = platform.python_implementation() + " " + except AttributeError: # Python 2.5 + impl = '' + return '%s%s on %s' % (impl, platform.python_version(), platform.system()) |