Cleanup: Swap pymock for unittest.mock. Remove references to six.

PiperOrigin-RevId: 420060001

glazier/autobuild_test.py

@@ -14,12 +14,13 @@
 """Unit tests for autobuild."""
 
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier import autobuild
 from glazier.lib import buildinfo
 from glazier.lib import title
 from glazier.lib import winpe
-import mock
 from pyfakefs import fake_filesystem
 
 

glazier/chooser/chooser.py

@@ -28,11 +28,11 @@ file, to be consumed by the caller.
 """
 
 import logging
+
 # do not remove: internal placeholder 1
 from glazier.chooser import fields
 from glazier.lib import resources
-
-from six.moves import tkinter as tk
+import tkinter as tk
 
 
 class Chooser(object):

glazier/chooser/chooser_test.py

@@ -14,11 +14,10 @@
 
 """Tests for glazier.chooser.chooser."""
 
+from unittest import mock
+
 from absl.testing import absltest
-
 from glazier.chooser import chooser
-
-import mock
 from pyfakefs import fake_filesystem
 
 _TEST_CONF = [{

glazier/chooser/fields.py

@@ -24,7 +24,7 @@ This is called at the UI exit for final response storage.
 """
 # do not remove: internal placeholder 1
 
-from six.moves import tkinter as tk
+import tkinter as tk
 
 
 class RadioMenu(tk.Frame):

glazier/chooser/fields_test.py

@@ -14,9 +14,10 @@
 
 """Tests for glazier.chooser.fields."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.chooser import fields
-import mock
 
 
 @mock.patch.object(fields, 'tk', autospec=True)

glazier/lib/actions/abort_test.py

@@ -14,9 +14,10 @@
 
 """Tests for glazier.lib.actions.abort."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.lib.actions import abort
-import mock
 
 
 class AbortTest(absltest.TestCase):

glazier/lib/actions/tpm_test.py

@@ -14,9 +14,10 @@
 
 """Tests for glazier.lib.actions.tpm."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.lib.actions import tpm
-import mock
 
 
 class TpmTest(absltest.TestCase):

glazier/lib/config/base_test.py

@@ -14,10 +14,11 @@
 
 """Tests for glazier.lib.config.base."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.lib import buildinfo
 from glazier.lib.config import base
-import mock
 
 
 class BaseTest(absltest.TestCase):

glazier/lib/config/builder_test.py

@@ -13,11 +13,13 @@
 # limitations under the License.
 """Tests for glazier.lib.config.builder."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.lib import buildinfo
 from glazier.lib.config import builder
 from glazier.lib.config import files
-import mock
+
 from glazier.lib import actions
 
 

glazier/lib/config/files_test.py

@@ -14,12 +14,11 @@
 
 """Tests for glazier.lib.config.files."""
 
-from absl.testing import absltest
+from unittest import mock
 
+from absl.testing import absltest
 from glazier.lib import file_util
 from glazier.lib.config import files
-
-import mock
 from pyfakefs import fake_filesystem
 
 

glazier/lib/config/runner_test.py

@@ -14,13 +14,12 @@
 
 """Tests for glazier.lib.config.runner."""
 
-from absl.testing import absltest
+from unittest import mock
 
+from absl.testing import absltest
 from glazier.lib import buildinfo
 from glazier.lib import constants
 from glazier.lib.config import runner
-
-import mock
 from pyfakefs import fake_filesystem
 from pyfakefs import fake_filesystem_shutil
 

glazier/lib/download.py

@@ -33,12 +33,12 @@ import time
 
 import typing
 from typing import List, Optional
+import urllib.request
 
 from absl import flags
 from glazier.lib import beyondcorp
 from glazier.lib import file_util
 from glazier.lib import winpe
-from six.moves import urllib
 
 if typing.TYPE_CHECKING:
   import http.client

glazier/lib/download_test.py

@@ -15,16 +15,16 @@
 
 """Tests for glazier.lib.download."""
 
+import io
+from unittest import mock
+
 from absl import flags
 from absl.testing import absltest
 from glazier.lib import beyondcorp
 from glazier.lib import buildinfo
 from glazier.lib import download
 from glazier.lib import file_util
-
-import mock
 from pyfakefs import fake_filesystem
-import six
 
 
 _TEST_INI = """
@@ -235,7 +235,7 @@ class DownloadTest(absltest.TestCase):
   @mock.patch.object(download.BaseDownloader, '_StoreDebugInfo', autospec=True)
   def testStreamToDisk(self, store_info):
     # setup
-    http_stream = six.BytesIO()
+    http_stream = io.BytesIO()
     http_stream.write(b'First line.\nSecond line.\n')
     http_stream.seek(0)
     download.CHUNK_BYTE_SIZE = 5

glazier/lib/identifier_test.py

@@ -14,11 +14,10 @@
 # limitations under the License.
 """Tests for glazier.lib.winpe."""
 
+from unittest import mock
+
 from absl.testing import absltest
-
 from glazier.lib import identifier
-
-import mock
 from pyfakefs import fake_filesystem
 
 from glazier.lib import constants

glazier/lib/interact.py

@@ -15,16 +15,11 @@
 
 """Glazier user interaction."""
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import logging
 import re
 import time
 from typing import Optional
 
-from six.moves import input
-
 
 def GetUsername(purpose: Optional[str] = None) -> str:
   """Prompt the user for their username.

glazier/lib/interact_test.py

@@ -23,7 +23,7 @@ from glazier.lib import interact
 
 class InteractTest(absltest.TestCase):
 
-  @mock.patch.object(interact, 'input', autospec=True)
+  @mock.patch('builtins.input', autospec=True)
   def testGetUsername(self, raw):
     raw.side_effect = iter(['invalid-name', '', '  ', 'username1'])
     self.assertEqual(interact.GetUsername(), 'username1')
@@ -62,7 +62,7 @@ class InteractTest(absltest.TestCase):
     result = interact.Keystroke('mesg', validator='[0-9]')
     self.assertEqual(result, None)
 
-  @mock.patch.object(interact, 'input', autospec=True)
+  @mock.patch('builtins.input', autospec=True)
   def testPrompt(self, raw):
     raw.return_value = 'user*name'
     result = interact.Prompt('mesg', '^\\w+$')

glazier/lib/log_copy_test.py

@@ -17,12 +17,11 @@
 import datetime
 import shutil
 import sys
+from unittest import mock
 
 from absl.testing import absltest
-
 from glazier.lib import log_copy
 from glazier.lib import winpe
-import mock
 
 from glazier.lib import constants
 

glazier/lib/power_test.py

@@ -14,9 +14,10 @@
 
 """Tests for glazier.lib.power."""
 
+from unittest import mock
+
 from absl.testing import absltest
 from glazier.lib import power
-import mock
 
 
 class PowerTest(absltest.TestCase):

requirements.txt

@@ -4,5 +4,4 @@ ntplib
 pyfakefs
 PyYAML
 requests
-six
 git+git://github.com/google/winops@master#egg=gwinpy