Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/pycompat.py @ 48960:57b58413dad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pycompat: remove first not ispy3 block We now require Python 3. So we can remove the first block supporting Python 2. Differential Revision: https://phab.mercurial-scm.org/D12247
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 02 Mar 2022 17:51:27 -0800
parents a0da5075bca3
children 79009cca491e
comparison
equal deleted inserted replaced
48959:a52f5bfc9358 48960:57b58413dad1
8 This contains aliases to hide python version-specific details from the core. 8 This contains aliases to hide python version-specific details from the core.
9 """ 9 """
10 10
11 from __future__ import absolute_import 11 from __future__ import absolute_import
12 12
13 import builtins
14 import concurrent.futures as futures
13 import getopt 15 import getopt
16 import http.client as httplib
17 import http.cookiejar as cookielib
14 import inspect 18 import inspect
15 import json 19 import json
16 import os 20 import os
21 import pickle
22 import queue
17 import shlex 23 import shlex
24 import socketserver
18 import sys 25 import sys
19 import tempfile 26 import tempfile
27 import xmlrpc.client as xmlrpclib
20 28
21 ispy3 = sys.version_info[0] >= 3 29 ispy3 = sys.version_info[0] >= 3
22 ispypy = '__pypy__' in sys.builtin_module_names 30 ispypy = '__pypy__' in sys.builtin_module_names
23 TYPE_CHECKING = False 31 TYPE_CHECKING = False
24 32
25 if not globals(): # hide this from non-pytype users 33 if not globals(): # hide this from non-pytype users
26 import typing 34 import typing
27 35
28 TYPE_CHECKING = typing.TYPE_CHECKING 36 TYPE_CHECKING = typing.TYPE_CHECKING
29 37
30 if not ispy3: 38
31 import cookielib 39 def future_set_exception_info(f, exc_info):
32 import cPickle as pickle 40 f.set_exception(exc_info[0])
33 import httplib 41
34 import Queue as queue 42
35 import SocketServer as socketserver 43 FileNotFoundError = builtins.FileNotFoundError
36 import xmlrpclib
37
38 def future_set_exception_info(f, exc_info):
39 f.set_exception_info(*exc_info)
40
41 # this is close enough for our usage
42 FileNotFoundError = OSError
43
44 else:
45 import builtins
46 import http.cookiejar as cookielib
47 import http.client as httplib
48 import pickle
49 import queue as queue
50 import socketserver
51 import xmlrpc.client as xmlrpclib
52
53 def future_set_exception_info(f, exc_info):
54 f.set_exception(exc_info[0])
55
56 FileNotFoundError = builtins.FileNotFoundError
57 44
58 45
59 def identity(a): 46 def identity(a):
60 return a 47 return a
61 48