From 3bf12282733669beeae68076edfc27922ff4f0c1 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 24 Feb 2013 18:35:11 -0500
Subject: [PATCH 1/3] Add the Python version and system to --version

Re: #78 on BitBucket
---
 flake8/engine.py | 7 +++++--
 flake8/util.py   | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/flake8/engine.py b/flake8/engine.py
index ca20f88..3980fab 100644
--- a/flake8/engine.py
+++ b/flake8/engine.py
@@ -4,7 +4,7 @@ import re
 import pep8
 
 from flake8 import __version__
-from flake8.util import OrderedSet
+from flake8.util import OrderedSet, get_python_version
 
 _flake8_noqa = re.compile(r'flake8[:=]\s*noqa', re.I).search
 
@@ -37,7 +37,10 @@ def get_parser():
     """
     (extensions, parser_hooks, options_hooks) = _register_extensions()
     details = ', '.join(['%s: %s' % ext for ext in extensions])
-    parser = pep8.get_parser('flake8', '%s (%s)' % (__version__, details))
+    python_version = get_python_version()
+    parser = pep8.get_parser('flake8', '%s (%s) %s' % (
+        __version__, details, python_version
+    ))
     for opt in ('--repeat', '--testsuite', '--doctest'):
         try:
             parser.remove_option(opt)
diff --git a/flake8/util.py b/flake8/util.py
index 050fe4d..8351c70 100644
--- a/flake8/util.py
+++ b/flake8/util.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import platform
 
 try:
     import ast
@@ -35,3 +36,10 @@ class OrderedSet(list):
     def add(self, value):
         if value not in self:
             self.append(value)
+
+
+def get_python_version():
+    return '%s %s on %s' % (
+        platform.python_implementation(), platform.python_version(),
+        platform.system()
+    )

From 2c896cfffba5afae5a52fbdf9749c25a85b729f4 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 24 Feb 2013 18:37:10 -0500
Subject: [PATCH 2/3] Make the organization more logical

No need to put that in util when it's only used in one place.
---
 flake8/engine.py | 8 ++++++++
 flake8/util.py   | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flake8/engine.py b/flake8/engine.py
index 3980fab..4680574 100644
--- a/flake8/engine.py
+++ b/flake8/engine.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
+import platform
 
 import pep8
 
@@ -81,3 +82,10 @@ def get_style_guide(**kwargs):
     for options_hook in options_hooks:
         options_hook(options)
     return styleguide
+
+
+def get_python_version():
+    return '%s %s on %s' % (
+        platform.python_implementation(), platform.python_version(),
+        platform.system()
+    )
diff --git a/flake8/util.py b/flake8/util.py
index 8351c70..050fe4d 100644
--- a/flake8/util.py
+++ b/flake8/util.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import platform
 
 try:
     import ast
@@ -36,10 +35,3 @@ class OrderedSet(list):
     def add(self, value):
         if value not in self:
             self.append(value)
-
-
-def get_python_version():
-    return '%s %s on %s' % (
-        platform.python_implementation(), platform.python_version(),
-        platform.system()
-    )

From 38396f8cc6ec41b56115e2877d823d61c27f150e Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 24 Feb 2013 19:50:29 -0500
Subject: [PATCH 3/3] Fix a spurious import

---
 flake8/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake8/engine.py b/flake8/engine.py
index 4680574..cd2b62c 100644
--- a/flake8/engine.py
+++ b/flake8/engine.py
@@ -5,7 +5,7 @@ import platform
 import pep8
 
 from flake8 import __version__
-from flake8.util import OrderedSet, get_python_version
+from flake8.util import OrderedSet
 
 _flake8_noqa = re.compile(r'flake8[:=]\s*noqa', re.I).search