From 899d146dd7cf408420f99a55d66b9770bf3195fe Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 4 Apr 2018 00:09:15 +0000
Subject: [PATCH] Always use a localhost addr in debug().

---
 ptvsd/debugger.py            |  4 +++-
 tests/ptvsd/test_debugger.py | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ptvsd/debugger.py b/ptvsd/debugger.py
index a157d84e..46573579 100644
--- a/ptvsd/debugger.py
+++ b/ptvsd/debugger.py
@@ -13,6 +13,8 @@ __version__ = "4.0.0a5"
 # TODO: not needed?
 DONT_DEBUG = []
 
+LOCALHOST = '127.0.0.1'
+
 RUNNERS = {
     'module': run_module,  # python -m spam
     'script': run_file,  # python spam.py
@@ -26,7 +28,7 @@ def debug(filename, port_num, debug_id, debug_options, run_as,
     # TODO: docstring
     if _extra is None:
         _extra = sys.argv[1:]
-    address = (None, port_num)
+    address = (LOCALHOST, port_num)
     try:
         run = _runners[run_as]
     except KeyError:
diff --git a/tests/ptvsd/test_debugger.py b/tests/ptvsd/test_debugger.py
index c209df23..d22a99b7 100644
--- a/tests/ptvsd/test_debugger.py
+++ b/tests/ptvsd/test_debugger.py
@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-from ptvsd.debugger import debug
+from ptvsd.debugger import debug, LOCALHOST
 
 
 class DebugTests(unittest.TestCase):
@@ -26,7 +26,7 @@ class DebugTests(unittest.TestCase):
 
     def test_module(self):
         filename = 'spam'
-        _, port = addr = (None, 8888)
+        _, port = addr = (LOCALHOST, 8888)
         debug_id = 1
         debug_options = {'x': 'y'}
         debug(filename, port, debug_id, debug_options, 'module',
@@ -38,7 +38,7 @@ class DebugTests(unittest.TestCase):
 
     def test_script(self):
         filename = 'spam.py'
-        _, port = addr = (None, 8888)
+        _, port = addr = (LOCALHOST, 8888)
         debug_id = 1
         debug_options = {'x': 'y'}
         debug(filename, port, debug_id, debug_options, 'script',
@@ -50,7 +50,7 @@ class DebugTests(unittest.TestCase):
 
     def test_code(self):
         filename = "print('spam')"
-        _, port = addr = (None, 8888)
+        _, port = addr = (LOCALHOST, 8888)
         debug_id = 1
         debug_options = {'x': 'y'}
         debug(filename, port, debug_id, debug_options, 'code',
@@ -62,7 +62,7 @@ class DebugTests(unittest.TestCase):
 
     def test_unsupported(self):
         filename = 'spam'
-        _, port = addr = (None, 8888)
+        _, port = addr = (LOCALHOST, 8888)
         debug_id = 1
         debug_options = {'x': 'y'}
         debug(filename, port, debug_id, debug_options, '???',
@@ -74,7 +74,7 @@ class DebugTests(unittest.TestCase):
 
     def test_extra_sys_argv(self):
         filename = 'spam.py'
-        _, port = addr = (None, 8888)
+        _, port = addr = (LOCALHOST, 8888)
         debug_id = 1
         debug_options = {'x': 'y'}
         extra = ['--eggs', 'abc']
@@ -112,6 +112,7 @@ class IntegrationTests(unittest.TestCase):
         self.assertEqual(self.argv, [
             'eggs',
             '--port', '8888',
+            '--client', LOCALHOST,
             '--module',
             '--file', 'spam:',
         ])
@@ -129,6 +130,7 @@ class IntegrationTests(unittest.TestCase):
         self.assertEqual(self.argv, [
             'eggs',
             '--port', '8888',
+            '--client', LOCALHOST,
             '--file', 'spam.py',
         ])
         self.assertEqual(self.kwargs, {})
@@ -145,6 +147,7 @@ class IntegrationTests(unittest.TestCase):
         self.assertEqual(self.argv, [
             'eggs',
             '--port', '8888',
+            '--client', LOCALHOST,
             '--file', filename,
         ])
         self.assertEqual(self.kwargs, {})
@@ -161,6 +164,7 @@ class IntegrationTests(unittest.TestCase):
         self.assertEqual(self.argv, [
             'eggs',
             '--port', '8888',
+            '--client', LOCALHOST,
             '--file', 'spam',
         ])
         self.assertEqual(self.kwargs, {})
@@ -177,6 +181,7 @@ class IntegrationTests(unittest.TestCase):
         self.assertEqual(self.argv, [
             'eggs',
             '--port', '8888',
+            '--client', LOCALHOST,
             '--file', 'spam.py',
             '--abc', 'xyz',
             '42',