Unverified Commit 24f16a33 authored by Philip Meier's avatar Philip Meier Committed by GitHub
Browse files

Remove python2 compability code (#2033)

* remove sys.version_info == 2

* remove sys.version_info < 3

* remove from __future__ imports
parent 42b8d462
from __future__ import print_function
from PIL import Image from PIL import Image
import os import os
import os.path import os.path
......
from __future__ import print_function
from .vision import VisionDataset from .vision import VisionDataset
from PIL import Image from PIL import Image
import os import os
......
from __future__ import print_function
from PIL import Image from PIL import Image
import os import os
import numpy as np import numpy as np
......
import os import os
import sys
import tarfile import tarfile
import collections import collections
from .vision import VisionDataset from .vision import VisionDataset
import xml.etree.ElementTree as ET
if sys.version_info[0] == 2:
import xml.etree.cElementTree as ET
else:
import xml.etree.ElementTree as ET
from PIL import Image from PIL import Image
from .utils import download_url, check_integrity, verify_str_arg from .utils import download_url, check_integrity, verify_str_arg
......
from __future__ import division
import math import math
import torch import torch
......
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
from __future__ import division
import torch import torch
from torch.jit.annotations import List, Tuple from torch.jit.annotations import List, Tuple
from torch import Tensor from torch import Tensor
......
from __future__ import division
import torch import torch
import torchvision import torchvision
......
from __future__ import division
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
import torch import torch
from torch.nn import functional as F from torch.nn import functional as F
......
from __future__ import division
import random import random
import math import math
import torch import torch
......
from __future__ import division
import warnings import warnings
from collections import namedtuple from collections import namedtuple
import torch import torch
......
from __future__ import division
from collections import namedtuple from collections import namedtuple
import warnings import warnings
import torch import torch
......
from __future__ import division
import torch import torch
from torch.jit.annotations import Tuple from torch.jit.annotations import Tuple
from torch import Tensor from torch import Tensor
......
from __future__ import division
from collections import OrderedDict from collections import OrderedDict
from torch.jit.annotations import Optional, List from torch.jit.annotations import Optional, List
from torch import Tensor from torch import Tensor
......
from __future__ import division
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
import torch import torch
import torch.nn.functional as F import torch.nn.functional as F
......
from __future__ import division
import torch import torch
import sys import sys
import math import math
......
from __future__ import division
import torch import torch
import torchvision.transforms.functional as F import torchvision.transforms.functional as F
from torch import Tensor from torch import Tensor
......
from __future__ import division
import torch import torch
import math import math
import sys import sys
......
...@@ -8,8 +8,6 @@ A diff output is produced and a sensible exit code is returned. ...@@ -8,8 +8,6 @@ A diff output is produced and a sensible exit code is returned.
""" """
from __future__ import print_function, unicode_literals
import argparse import argparse
import codecs import codecs
import difflib import difflib
...@@ -129,11 +127,6 @@ def run_clang_format_diff(args, file): ...@@ -129,11 +127,6 @@ def run_clang_format_diff(args, file):
# > Each translation completely replaces the format string # > Each translation completely replaces the format string
# > for the diagnostic. # > for the diagnostic.
# > -- http://clang.llvm.org/docs/InternalsManual.html#internals-diag-translation # > -- http://clang.llvm.org/docs/InternalsManual.html#internals-diag-translation
#
# It's not pretty, due to Python 2 & 3 compatibility.
encoding_py3 = {}
if sys.version_info[0] >= 3:
encoding_py3['encoding'] = 'utf-8'
try: try:
proc = subprocess.Popen( proc = subprocess.Popen(
...@@ -141,7 +134,7 @@ def run_clang_format_diff(args, file): ...@@ -141,7 +134,7 @@ def run_clang_format_diff(args, file):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True, universal_newlines=True,
**encoding_py3) encoding='utf-8')
except OSError as exc: except OSError as exc:
raise DiffError( raise DiffError(
"Command '{}' failed to start: {}".format( "Command '{}' failed to start: {}".format(
...@@ -150,12 +143,7 @@ def run_clang_format_diff(args, file): ...@@ -150,12 +143,7 @@ def run_clang_format_diff(args, file):
) )
proc_stdout = proc.stdout proc_stdout = proc.stdout
proc_stderr = proc.stderr proc_stderr = proc.stderr
if sys.version_info[0] < 3:
# make the pipes compatible with Python 3,
# reading lines should output unicode
encoding = 'utf-8'
proc_stdout = codecs.getreader(encoding)(proc_stdout)
proc_stderr = codecs.getreader(encoding)(proc_stderr)
# hopefully the stderr pipe won't get full and block the process # hopefully the stderr pipe won't get full and block the process
outs = list(proc_stdout.readlines()) outs = list(proc_stdout.readlines())
errs = list(proc_stderr.readlines()) errs = list(proc_stderr.readlines())
...@@ -203,10 +191,7 @@ def colorize(diff_lines): ...@@ -203,10 +191,7 @@ def colorize(diff_lines):
def print_diff(diff_lines, use_color): def print_diff(diff_lines, use_color):
if use_color: if use_color:
diff_lines = colorize(diff_lines) diff_lines = colorize(diff_lines)
if sys.version_info[0] < 3: sys.stdout.writelines(diff_lines)
sys.stdout.writelines((l.encode('utf-8') for l in diff_lines))
else:
sys.stdout.writelines(diff_lines)
def print_trouble(prog, message, use_colors): def print_trouble(prog, message, use_colors):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment