From f0140fa044486d594697114f68f8a43adaaa95f4 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Fri, 30 Mar 2018 15:30:22 -0700
Subject: [PATCH 1/4] Minor fixes to system info

---
 ptvsd/wrapper.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index e7c0084d..1f6a943c 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -1455,15 +1455,33 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
             except AttributeError:
                 impl_desc = 'Python'
 
+        def version_str(v):
+            return '{}.{}.{}{}{}'.format(
+                v.major,
+                v.minor,
+                v.micro,
+                v.releaselevel,
+                v.serial)
+
+        try:
+            impl_name = sys.implementation.name
+        except AttributeError:
+            impl_name = 'Python'
+
+        try:
+            impl_version = version_str(sys.implementation.version)
+        except AttributeError: 
+            impl_version =  version_str(sys.version_info)
+
         sys_info = {
             'ptvsd': {
                 'version': __version__,
             },
             'python': {
-                'version': list(sys.version_info),
+                'version': version_str(sys.version_info),
                 'implementation': {
-                    'name': sys.implementation.name,
-                    'version': list(sys.implementation.version),
+                    'name': impl_name,
+                    'version': impl_version,
                     'description': impl_desc,
                 },
             },
@@ -1475,9 +1493,6 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
                 'executable': sys.executable,
                 'bitness': 64 if sys.maxsize > 2**32 else 32,
             },
-            'user': {
-                'name': username,
-            },
         }
         self.send_response(request, **sys_info)
 

From 2cef331e5174f3968bd228b5b51d6f7b659e3bb7 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Fri, 30 Mar 2018 15:46:41 -0700
Subject: [PATCH 2/4] Switching except cases in system info to use None

---
 ptvsd/wrapper.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index 1f6a943c..18115121 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -1453,7 +1453,7 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
             try:
                 impl_desc = sys.implementation.name
             except AttributeError:
-                impl_desc = 'Python'
+                impl_desc = None
 
         def version_str(v):
             return '{}.{}.{}{}{}'.format(
@@ -1466,12 +1466,12 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
         try:
             impl_name = sys.implementation.name
         except AttributeError:
-            impl_name = 'Python'
+            impl_name = None
 
         try:
             impl_version = version_str(sys.implementation.version)
         except AttributeError: 
-            impl_version =  version_str(sys.version_info)
+            impl_version =  None
 
         sys_info = {
             'ptvsd': {

From 9071c3ab9b8e9f37b8ea420558ddc435a9574fac Mon Sep 17 00:00:00 2001
From: Karthik Nadig <karthik.nadig@live.com>
Date: Fri, 30 Mar 2018 19:21:12 -0700
Subject: [PATCH 3/4] Linting fixes

---
 ptvsd/wrapper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index 18115121..0c6a14fa 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -1470,8 +1470,8 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
 
         try:
             impl_version = version_str(sys.implementation.version)
-        except AttributeError: 
-            impl_version =  None
+        except AttributeError:
+            impl_version = None
 
         sys_info = {
             'ptvsd': {

From 3df3b67b9112971a8d6b0dd0d9a601e252a91ecb Mon Sep 17 00:00:00 2001
From: Karthik Nadig <karthik.nadig@live.com>
Date: Fri, 30 Mar 2018 19:24:23 -0700
Subject: [PATCH 4/4] Removing unused variable

---
 ptvsd/wrapper.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index 0c6a14fa..79b10d69 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -7,7 +7,6 @@ from __future__ import print_function, absolute_import
 import atexit
 import contextlib
 import errno
-import getpass
 import io
 import os
 import platform
@@ -1442,11 +1441,6 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
         except AttributeError:
             pid = None
 
-        try:
-            username = getpass.getuser()
-        except AttributeError:
-            username = None
-
         try:
             impl_desc = platform.python_implementation()
         except AttributeError: