[codemod][usort] apply import merging for fbcode (8 of 11)

Summary:
Applies new import merging and sorting from µsort v1.0.

When merging imports, µsort will make a best-effort to move associated
comments to match merged elements, but there are known limitations due to
the diynamic nature of Python and developer tooling. These changes should
not produce any dangerous runtime changes, but may require touch-ups to
satisfy linters and other tooling.

Note that µsort uses case-insensitive, lexicographical sorting, which
results in a different ordering compared to isort. This provides a more
consistent sorting order, matching the case-insensitive order used when
sorting import statements by module name, and ensures that "frog", "FROG",
and "Frog" always sort next to each other.

For details on µsort's sorting and merging semantics, see the user guide:
https://usort.readthedocs.io/en/stable/guide.html#sorting

Reviewed By: lisroach

Differential Revision: D36402214

fbshipit-source-id: b641bfa9d46242188524d4ae2c44998922a62b4c

test/torchaudio_unittest/transforms/torchscript_consistency_impl.py

@@ -4,11 +4,7 @@ import torch
 import torchaudio.transforms as T
 from parameterized import parameterized
 from torchaudio_unittest import common_utils
-from torchaudio_unittest.common_utils import (
-    skipIfRocm,
-    TestBaseMixin,
-    torch_script,
-)
+from torchaudio_unittest.common_utils import skipIfRocm, TestBaseMixin, torch_script
 
 
 class Transforms(TestBaseMixin):

test/torchaudio_unittest/transforms/transforms_cuda_test.py

 import torch
-from torchaudio_unittest.common_utils import (
-    PytorchTestCase,
-    skipIfNoCuda,
-)
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 
 from .transforms_test_impl import TransformsTestBase
 

test/torchaudio_unittest/transforms/transforms_test_impl.py

 import torch
 import torchaudio.transforms as T
-from parameterized import parameterized, param
+from parameterized import param, parameterized
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    get_whitenoise,
     get_spectrogram,
+    get_whitenoise,
     nested_params,
+    TestBaseMixin,
 )
 from torchaudio_unittest.common_utils.psd_utils import psd_numpy
 

test/torchaudio_unittest/utils/sox_utils_test.py

 from torchaudio.utils import sox_utils
-from torchaudio_unittest.common_utils import (
-    PytorchTestCase,
-    skipIfNoSox,
-)
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoSox
 
 
 @skipIfNoSox

tools/convert_voxpopuli_models.py

@@ -93,7 +93,9 @@ def _main(args):
 
     import torch
     import torchaudio
-    from torchaudio.models.wav2vec2.utils.import_fairseq import _convert_state_dict as _convert
+    from torchaudio.models.wav2vec2.utils.import_fairseq import (
+        _convert_state_dict as _convert,
+    )
 
     cfg, state_dict = _load(args.input_file)
     params = _parse_model_param(cfg, state_dict)

torchaudio/__init__.py

-from torchaudio import _extension  # noqa: F401
-from torchaudio import (
-    io,
+from torchaudio import (  # noqa: F401
+    _extension,
     compliance,
     datasets,
     functional,
+    io,
+    kaldi_io,
     models,
     pipelines,
-    kaldi_io,
-    utils,
     sox_effects,
     transforms,
+    utils,
 )
-from torchaudio.backend import (
-    list_audio_backends,
-    get_audio_backend,
-    set_audio_backend,
-)
+from torchaudio.backend import get_audio_backend, list_audio_backends, set_audio_backend
 
 try:
     from .version import __version__, git_version  # noqa: F401

torchaudio/_internal/__init__.py

-from torch.hub import load_state_dict_from_url, download_url_to_file
+from torch.hub import download_url_to_file, load_state_dict_from_url
 
 
 __all__ = [

torchaudio/backend/__init__.py

 # flake8: noqa
 from . import utils
-from .utils import (
-    list_audio_backends,
-    get_audio_backend,
-    set_audio_backend,
-)
+from .utils import get_audio_backend, list_audio_backends, set_audio_backend
 
 
 utils._init_audio_backend()

torchaudio/backend/soundfile_backend.py

 """The new soundfile backend which will become default in 0.8.0 onward"""
 import warnings
-from typing import Tuple, Optional
+from typing import Optional, Tuple
 
 import torch
 from torchaudio._internal import module_utils as _mod_utils

torchaudio/backend/sox_io_backend.py

 import os
-from typing import Tuple, Optional
+from typing import Optional, Tuple
 
 import torch
 import torchaudio
-from torchaudio._internal import (
-    module_utils as _mod_utils,
-)
+from torchaudio._internal import module_utils as _mod_utils
 
 from .common import AudioMetaData
 

torchaudio/backend/utils.py

 """Defines utilities for switching audio backends"""
 import warnings
-from typing import Optional, List
+from typing import List, Optional
 
 import torchaudio
 from torchaudio._internal import module_utils as _mod_utils
 
-from . import (
-    no_backend,
-    sox_io_backend,
-    soundfile_backend,
-)
+from . import no_backend, soundfile_backend, sox_io_backend
 
 __all__ = [
     "list_audio_backends",

torchaudio/datasets/cmuarctic.py

@@ -7,9 +7,7 @@ import torchaudio
 from torch import Tensor
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
-from torchaudio.datasets.utils import (
-    extract_archive,
-)
+from torchaudio.datasets.utils import extract_archive
 
 URL = "aew"
 FOLDER_IN_ARCHIVE = "ARCTIC"

torchaudio/datasets/cmudict.py

 import os
 import re
 from pathlib import Path
-from typing import Iterable, Tuple, Union, List
+from typing import Iterable, List, Tuple, Union
 
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset

torchaudio/datasets/commonvoice.py

 import csv
 import os
 from pathlib import Path
-from typing import List, Dict, Tuple, Union
+from typing import Dict, List, Tuple, Union
 
 import torchaudio
 from torch import Tensor

torchaudio/datasets/dr_vctk.py

@@ -5,9 +5,7 @@ import torchaudio
 from torch import Tensor
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
-from torchaudio.datasets.utils import (
-    extract_archive,
-)
+from torchaudio.datasets.utils import extract_archive
 
 
 _URL = "https://datashare.ed.ac.uk/bitstream/handle/10283/3038/DR-VCTK.zip"

torchaudio/datasets/gtzan.py

 import os
 from pathlib import Path
-from typing import Tuple, Optional, Union
+from typing import Optional, Tuple, Union
 
 import torchaudio
 from torch import Tensor
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
-from torchaudio.datasets.utils import (
-    extract_archive,
-)
+from torchaudio.datasets.utils import extract_archive
 
 # The following lists prefixed with `filtered_` provide a filtered split
 # that:

torchaudio/datasets/librimix.py

 from pathlib import Path
-from typing import Union, Tuple, List
+from typing import List, Tuple, Union
 
 import torch
 import torchaudio

torchaudio/datasets/libritts.py

@@ -6,9 +6,7 @@ import torchaudio
 from torch import Tensor
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
-from torchaudio.datasets.utils import (
-    extract_archive,
-)
+from torchaudio.datasets.utils import extract_archive
 
 URL = "train-clean-100"
 FOLDER_IN_ARCHIVE = "LibriTTS"

torchaudio/datasets/quesst14.py

 import os
 import re
 from pathlib import Path
-from typing import Tuple, Union, Optional
+from typing import Optional, Tuple, Union
 
 import torch
 import torchaudio

torchaudio/datasets/speechcommands.py

 import os
 from pathlib import Path
-from typing import Tuple, Optional, Union
+from typing import Optional, Tuple, Union
 
 import torchaudio
 from torch import Tensor
 from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
-from torchaudio.datasets.utils import (
-    extract_archive,
-)
+from torchaudio.datasets.utils import extract_archive
 
 FOLDER_IN_ARCHIVE = "SpeechCommands"
 URL = "speech_commands_v0.02"