Merge branch 'python3.8' into disentangling_only_py3.8

# Conflicts:
#	models/hpm.py
#	models/layers.py
#	models/model.py
#	models/part_net.py
#	models/rgb_part_net.py
#	utils/configuration.py

1 files changed, 2 insertions, 3 deletions

diff --git a/utils/sampler.py b/utils/sampler.py
index cdf1984..0977f94 100644
--- a/utils/sampler.py
+++ b/utils/sampler.py
@@ -1,6 +1,5 @@
 import random
-from collections.abc import Iterator
-from typing import Union
+from typing import Union, Tuple, Iterator
 
 import numpy as np
 from torch.utils import data
@@ -12,7 +11,7 @@ class TripletSampler(data.Sampler):
     def __init__(
             self,
             data_source: Union[CASIAB],
-            batch_size: tuple[int, int]
+            batch_size: Tuple[int, int]
     ):
         super().__init__(data_source)
         self.metadata_labels = data_source.metadata['labels']