Upgrade usort to `1.0.2` and black to 22.3.0 (#5106)

* upgrade usort to

* Also update black

* Actually use 1.0.2

* Apply pre-commit
Co-authored-by: Nicolas Hug <contact@nicolas-hug.com>

torchvision/prototype/datasets/_builtin/cub200.py

 import csv
 import functools
 import pathlib
-from typing import Any, Dict, List, Optional, Tuple, BinaryIO, Callable, Union
+from typing import Any, BinaryIO, Callable, Dict, List, Optional, Tuple, Union
 
 from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Mapper,
+    CSVDictParser,
+    CSVParser,
+    Demultiplexer,
     Filter,
+    IterDataPipe,
     IterKeyZipper,
-    Demultiplexer,
     LineReader,
-    CSVParser,
-    CSVDictParser,
+    Mapper,
 )
 from torchvision.prototype.datasets.utils import Dataset, GDriveResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    INFINITE_BUFFER_SIZE,
-    read_mat,
+    getitem,
     hint_sharding,
     hint_shuffling,
-    getitem,
+    INFINITE_BUFFER_SIZE,
+    path_accessor,
     path_comparator,
     read_categories_file,
-    path_accessor,
+    read_mat,
 )
-from torchvision.prototype.features import Label, BoundingBox, _Feature, EncodedImage
+from torchvision.prototype.features import _Feature, BoundingBox, EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/dtd.py

 import enum
 import pathlib
-from typing import Any, Dict, List, Optional, Tuple, BinaryIO, Union
+from typing import Any, BinaryIO, Dict, List, Optional, Tuple, Union
 
-from torchdata.datapipes.iter import IterDataPipe, Mapper, Filter, IterKeyZipper, Demultiplexer, LineReader, CSVParser
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    HttpResource,
-    OnlineResource,
-)
+from torchdata.datapipes.iter import CSVParser, Demultiplexer, Filter, IterDataPipe, IterKeyZipper, LineReader, Mapper
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    INFINITE_BUFFER_SIZE,
+    getitem,
     hint_sharding,
+    hint_shuffling,
+    INFINITE_BUFFER_SIZE,
     path_comparator,
-    getitem,
     read_categories_file,
-    hint_shuffling,
 )
-from torchvision.prototype.features import Label, EncodedImage
+from torchvision.prototype.features import EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/fer2013.py

@@ -2,17 +2,10 @@ import pathlib
 from typing import Any, Dict, List, Union
 
 import torch
-from torchdata.datapipes.iter import IterDataPipe, Mapper, CSVDictParser
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    OnlineResource,
-    KaggleDownloadResource,
-)
-from torchvision.prototype.datasets.utils._internal import (
-    hint_sharding,
-    hint_shuffling,
-)
-from torchvision.prototype.features import Label, Image
+from torchdata.datapipes.iter import CSVDictParser, IterDataPipe, Mapper
+from torchvision.prototype.datasets.utils import Dataset, KaggleDownloadResource, OnlineResource
+from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling
+from torchvision.prototype.features import Image, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/food101.py

 from pathlib import Path
-from typing import Any, Tuple, List, Dict, Optional, BinaryIO, Union
-
-from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Filter,
-    Mapper,
-    LineReader,
-    Demultiplexer,
-    IterKeyZipper,
-)
+from typing import Any, BinaryIO, Dict, List, Optional, Tuple, Union
+
+from torchdata.datapipes.iter import Demultiplexer, Filter, IterDataPipe, IterKeyZipper, LineReader, Mapper
 from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    hint_shuffling,
-    hint_sharding,
-    path_comparator,
     getitem,
+    hint_sharding,
+    hint_shuffling,
     INFINITE_BUFFER_SIZE,
+    path_comparator,
     read_categories_file,
 )
-from torchvision.prototype.features import Label, EncodedImage
+from torchvision.prototype.features import EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/gtsrb.py

 import pathlib
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-from torchdata.datapipes.iter import IterDataPipe, Mapper, Filter, CSVDictParser, Zipper, Demultiplexer
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    OnlineResource,
-    HttpResource,
-)
+from torchdata.datapipes.iter import CSVDictParser, Demultiplexer, Filter, IterDataPipe, Mapper, Zipper
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    path_comparator,
     hint_sharding,
     hint_shuffling,
     INFINITE_BUFFER_SIZE,
+    path_comparator,
 )
-from torchvision.prototype.features import Label, BoundingBox, EncodedImage
+from torchvision.prototype.features import BoundingBox, EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/imagenet.py

@@ -2,33 +2,29 @@ import enum
 import functools
 import pathlib
 import re
-from typing import Any, Dict, List, Optional, Tuple, BinaryIO, Match, cast, Union
+from typing import Any, BinaryIO, cast, Dict, List, Match, Optional, Tuple, Union
 
 from torchdata.datapipes.iter import (
+    Demultiplexer,
+    Enumerator,
+    Filter,
     IterDataPipe,
-    LineReader,
     IterKeyZipper,
+    LineReader,
     Mapper,
-    Filter,
-    Demultiplexer,
     TarArchiveLoader,
-    Enumerator,
-)
-from torchvision.prototype.datasets.utils import (
-    OnlineResource,
-    ManualDownloadResource,
-    Dataset,
 )
+from torchvision.prototype.datasets.utils import Dataset, ManualDownloadResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    INFINITE_BUFFER_SIZE,
     getitem,
-    read_mat,
     hint_sharding,
     hint_shuffling,
-    read_categories_file,
+    INFINITE_BUFFER_SIZE,
     path_accessor,
+    read_categories_file,
+    read_mat,
 )
-from torchvision.prototype.features import Label, EncodedImage
+from torchvision.prototype.features import EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/mnist.py

@@ -3,12 +3,12 @@ import functools
 import operator
 import pathlib
 import string
-from typing import Any, Dict, Iterator, List, Optional, Tuple, cast, BinaryIO, Union, Sequence
+from typing import Any, BinaryIO, cast, Dict, Iterator, List, Optional, Sequence, Tuple, Union
 
 import torch
-from torchdata.datapipes.iter import IterDataPipe, Demultiplexer, Mapper, Zipper, Decompressor
+from torchdata.datapipes.iter import Decompressor, Demultiplexer, IterDataPipe, Mapper, Zipper
 from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
-from torchvision.prototype.datasets.utils._internal import INFINITE_BUFFER_SIZE, hint_sharding, hint_shuffling
+from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling, INFINITE_BUFFER_SIZE
 from torchvision.prototype.features import Image, Label
 from torchvision.prototype.utils._internal import fromfile
 

torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py

 import enum
 import pathlib
-from typing import Any, Dict, List, Optional, Tuple, BinaryIO, Union
+from typing import Any, BinaryIO, Dict, List, Optional, Tuple, Union
 
-from torchdata.datapipes.iter import IterDataPipe, Mapper, Filter, IterKeyZipper, Demultiplexer, CSVDictParser
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    HttpResource,
-    OnlineResource,
-)
+from torchdata.datapipes.iter import CSVDictParser, Demultiplexer, Filter, IterDataPipe, IterKeyZipper, Mapper
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    INFINITE_BUFFER_SIZE,
+    getitem,
     hint_sharding,
     hint_shuffling,
-    getitem,
+    INFINITE_BUFFER_SIZE,
     path_accessor,
-    read_categories_file,
     path_comparator,
+    read_categories_file,
 )
-from torchvision.prototype.features import Label, EncodedImage
+from torchvision.prototype.features import EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/pcam.py

 import io
 import pathlib
 from collections import namedtuple
-from typing import Any, Dict, List, Optional, Tuple, Iterator, Union
+from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
 from torchdata.datapipes.iter import IterDataPipe, Mapper, Zipper
 from torchvision.prototype import features
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    OnlineResource,
-    GDriveResource,
-)
-from torchvision.prototype.datasets.utils._internal import (
-    hint_sharding,
-    hint_shuffling,
-)
+from torchvision.prototype.datasets.utils import Dataset, GDriveResource, OnlineResource
+from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling
 from torchvision.prototype.features import Label
 
 from .._api import register_dataset, register_info

torchvision/prototype/datasets/_builtin/sbd.py

 import pathlib
 import re
-from typing import Any, Dict, List, Optional, Tuple, cast, BinaryIO, Union
+from typing import Any, BinaryIO, cast, Dict, List, Optional, Tuple, Union
 
 import numpy as np
-from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Mapper,
-    Demultiplexer,
-    Filter,
-    IterKeyZipper,
-    LineReader,
-)
+from torchdata.datapipes.iter import Demultiplexer, Filter, IterDataPipe, IterKeyZipper, LineReader, Mapper
 from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    INFINITE_BUFFER_SIZE,
-    read_mat,
     getitem,
-    path_accessor,
-    path_comparator,
     hint_sharding,
     hint_shuffling,
+    INFINITE_BUFFER_SIZE,
+    path_accessor,
+    path_comparator,
     read_categories_file,
+    read_mat,
 )
 from torchvision.prototype.features import _Feature, EncodedImage
 

torchvision/prototype/datasets/_builtin/semeion.py

@@ -2,16 +2,8 @@ import pathlib
 from typing import Any, Dict, List, Tuple, Union
 
 import torch
-from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Mapper,
-    CSVParser,
-)
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    HttpResource,
-    OnlineResource,
-)
+from torchdata.datapipes.iter import CSVParser, IterDataPipe, Mapper
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling
 from torchvision.prototype.features import Image, OneHotLabel
 

torchvision/prototype/datasets/_builtin/stanford_cars.py

 import pathlib
-from typing import Any, Dict, List, Tuple, Iterator, BinaryIO, Union
+from typing import Any, BinaryIO, Dict, Iterator, List, Tuple, Union
 
 from torchdata.datapipes.iter import Filter, IterDataPipe, Mapper, Zipper
 from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
@@ -7,8 +7,8 @@ from torchvision.prototype.datasets.utils._internal import (
     hint_sharding,
     hint_shuffling,
     path_comparator,
-    read_mat,
     read_categories_file,
+    read_mat,
 )
 from torchvision.prototype.features import BoundingBox, EncodedImage, Label
 

torchvision/prototype/datasets/_builtin/svhn.py

 import pathlib
-from typing import Any, Dict, List, Tuple, BinaryIO, Union
+from typing import Any, BinaryIO, Dict, List, Tuple, Union
 
 import numpy as np
-from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Mapper,
-    UnBatcher,
-)
-from torchvision.prototype.datasets.utils import (
-    Dataset,
-    HttpResource,
-    OnlineResource,
-)
-from torchvision.prototype.datasets.utils._internal import (
-    read_mat,
-    hint_sharding,
-    hint_shuffling,
-)
-from torchvision.prototype.features import Label, Image
+from torchdata.datapipes.iter import IterDataPipe, Mapper, UnBatcher
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
+from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling, read_mat
+from torchvision.prototype.features import Image, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_builtin/usps.py

@@ -2,8 +2,8 @@ import pathlib
 from typing import Any, Dict, List, Union
 
 import torch
-from torchdata.datapipes.iter import IterDataPipe, LineReader, Mapper, Decompressor
-from torchvision.prototype.datasets.utils import Dataset, OnlineResource, HttpResource
+from torchdata.datapipes.iter import Decompressor, IterDataPipe, LineReader, Mapper
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling
 from torchvision.prototype.features import Image, Label
 

torchvision/prototype/datasets/_builtin/voc.py

 import enum
 import functools
 import pathlib
-from typing import Any, Dict, List, Optional, Tuple, BinaryIO, cast, Union
+from typing import Any, BinaryIO, cast, Dict, List, Optional, Tuple, Union
 from xml.etree import ElementTree
 
-from torchdata.datapipes.iter import (
-    IterDataPipe,
-    Mapper,
-    Filter,
-    Demultiplexer,
-    IterKeyZipper,
-    LineReader,
-)
+from torchdata.datapipes.iter import Demultiplexer, Filter, IterDataPipe, IterKeyZipper, LineReader, Mapper
 from torchvision.datasets import VOCDetection
-from torchvision.prototype.datasets.utils import OnlineResource, HttpResource, Dataset
+from torchvision.prototype.datasets.utils import Dataset, HttpResource, OnlineResource
 from torchvision.prototype.datasets.utils._internal import (
-    path_accessor,
     getitem,
-    INFINITE_BUFFER_SIZE,
-    path_comparator,
     hint_sharding,
     hint_shuffling,
+    INFINITE_BUFFER_SIZE,
+    path_accessor,
+    path_comparator,
     read_categories_file,
 )
-from torchvision.prototype.features import BoundingBox, Label, EncodedImage
+from torchvision.prototype.features import BoundingBox, EncodedImage, Label
 
 from .._api import register_dataset, register_info
 

torchvision/prototype/datasets/_folder.py

@@ -2,11 +2,11 @@ import functools
 import os
 import os.path
 import pathlib
-from typing import BinaryIO, Optional, Collection, Union, Tuple, List, Dict, Any
+from typing import Any, BinaryIO, Collection, Dict, List, Optional, Tuple, Union
 
-from torchdata.datapipes.iter import IterDataPipe, FileLister, Mapper, Filter, FileOpener
+from torchdata.datapipes.iter import FileLister, FileOpener, Filter, IterDataPipe, Mapper
 from torchvision.prototype.datasets.utils._internal import hint_sharding, hint_shuffling
-from torchvision.prototype.features import Label, EncodedImage, EncodedData
+from torchvision.prototype.features import EncodedData, EncodedImage, Label
 
 
 __all__ = ["from_data_folder", "from_image_folder"]

torchvision/prototype/datasets/utils/__init__.py

 from . import _internal  # usort: skip
 from ._dataset import Dataset
-from ._resource import OnlineResource, HttpResource, GDriveResource, ManualDownloadResource, KaggleDownloadResource
+from ._resource import GDriveResource, HttpResource, KaggleDownloadResource, ManualDownloadResource, OnlineResource

torchvision/prototype/datasets/utils/_dataset.py

 import abc
 import importlib
 import pathlib
-from typing import Any, Dict, List, Optional, Sequence, Union, Collection, Iterator
+from typing import Any, Collection, Dict, Iterator, List, Optional, Sequence, Union
 
 from torch.utils.data import IterDataPipe
 from torchvision.datasets.utils import verify_str_arg

torchvision/prototype/datasets/utils/_internal.py

@@ -2,21 +2,7 @@ import csv
 import functools
 import pathlib
 import pickle
-from typing import BinaryIO
-from typing import (
-    Sequence,
-    Callable,
-    Union,
-    Any,
-    Tuple,
-    TypeVar,
-    List,
-    Iterator,
-    Dict,
-    IO,
-    Sized,
-)
-from typing import cast
+from typing import Any, BinaryIO, Callable, cast, Dict, IO, Iterator, List, Sequence, Sized, Tuple, TypeVar, Union
 
 import torch
 import torch.distributed as dist

torchvision/prototype/datasets/utils/_resource.py

@@ -2,26 +2,26 @@ import abc
 import hashlib
 import itertools
 import pathlib
-from typing import Optional, Sequence, Tuple, Callable, IO, Any, Union, NoReturn, Set
+from typing import Any, Callable, IO, NoReturn, Optional, Sequence, Set, Tuple, Union
 from urllib.parse import urlparse
 
 from torchdata.datapipes.iter import (
-    IterableWrapper,
     FileLister,
     FileOpener,
+    IterableWrapper,
     IterDataPipe,
-    ZipArchiveLoader,
-    TarArchiveLoader,
     RarArchiveLoader,
+    TarArchiveLoader,
+    ZipArchiveLoader,
 )
 from torchvision.datasets.utils import (
-    download_url,
-    _detect_file_type,
-    extract_archive,
     _decompress,
-    download_file_from_google_drive,
-    _get_redirect_url,
+    _detect_file_type,
     _get_google_drive_file_id,
+    _get_redirect_url,
+    download_file_from_google_drive,
+    download_url,
+    extract_archive,
 )
 from typing_extensions import Literal