mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-19 21:03:21 -07:00
Remove Python 2 handling code (#2098)
* Remove Python 2 update modal * Remove Python 2 handling code * Remove backports dependencies * Remove uses of future and __future__ * Fix import * Remove requirements * Update lib folder * Clean up imports and blank lines --------- Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
This commit is contained in:
parent
dcec1f6f5f
commit
de3393d62b
97 changed files with 7443 additions and 2917 deletions
|
@ -689,7 +689,7 @@ class date(object):
|
|||
|
||||
@classmethod
|
||||
def fromordinal(cls, n):
|
||||
"""Contruct a date from a proleptic Gregorian ordinal.
|
||||
"""Construct a date from a proleptic Gregorian ordinal.
|
||||
|
||||
January 1 of year 1 is day 1. Only the year, month and day are
|
||||
non-zero in the result.
|
||||
|
|
|
@ -2867,7 +2867,7 @@ def parse_content_type_header(value):
|
|||
_find_mime_parameters(ctype, value)
|
||||
return ctype
|
||||
ctype.append(token)
|
||||
# XXX: If we really want to follow the formal grammer we should make
|
||||
# XXX: If we really want to follow the formal grammar we should make
|
||||
# mantype and subtype specialized TokenLists here. Probably not worth it.
|
||||
if not value or value[0] != '/':
|
||||
ctype.defects.append(errors.InvalidHeaderDefect(
|
||||
|
|
|
@ -26,7 +26,7 @@ class Parser(object):
|
|||
textual representation of the message.
|
||||
|
||||
The string must be formatted as a block of RFC 2822 headers and header
|
||||
continuation lines, optionally preceeded by a `Unix-from' header. The
|
||||
continuation lines, optionally preceded by a `Unix-from' header. The
|
||||
header block is terminated either by the end of the string or by a
|
||||
blank line.
|
||||
|
||||
|
@ -92,7 +92,7 @@ class BytesParser(object):
|
|||
textual representation of the message.
|
||||
|
||||
The input must be formatted as a block of RFC 2822 headers and header
|
||||
continuation lines, optionally preceeded by a `Unix-from' header. The
|
||||
continuation lines, optionally preceded by a `Unix-from' header. The
|
||||
header block is terminated either by the end of the input or by a
|
||||
blank line.
|
||||
|
||||
|
|
|
@ -1851,7 +1851,7 @@ def lwp_cookie_str(cookie):
|
|||
class LWPCookieJar(FileCookieJar):
|
||||
"""
|
||||
The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
|
||||
"Set-Cookie3" is the format used by the libwww-perl libary, not known
|
||||
"Set-Cookie3" is the format used by the libwww-perl library, not known
|
||||
to be compatible with any browser, but which is easy to read and
|
||||
doesn't lose information about RFC 2965 cookies.
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ import importlib
|
|||
# import collections.abc # not present on Py2.7
|
||||
import re
|
||||
import subprocess
|
||||
import imp
|
||||
import time
|
||||
try:
|
||||
import sysconfig
|
||||
|
@ -341,37 +340,6 @@ def rmtree(path):
|
|||
if error.errno != errno.ENOENT:
|
||||
raise
|
||||
|
||||
def make_legacy_pyc(source):
|
||||
"""Move a PEP 3147 pyc/pyo file to its legacy pyc/pyo location.
|
||||
|
||||
The choice of .pyc or .pyo extension is done based on the __debug__ flag
|
||||
value.
|
||||
|
||||
:param source: The file system path to the source file. The source file
|
||||
does not need to exist, however the PEP 3147 pyc file must exist.
|
||||
:return: The file system path to the legacy pyc file.
|
||||
"""
|
||||
pyc_file = imp.cache_from_source(source)
|
||||
up_one = os.path.dirname(os.path.abspath(source))
|
||||
legacy_pyc = os.path.join(up_one, source + ('c' if __debug__ else 'o'))
|
||||
os.rename(pyc_file, legacy_pyc)
|
||||
return legacy_pyc
|
||||
|
||||
def forget(modname):
|
||||
"""'Forget' a module was ever imported.
|
||||
|
||||
This removes the module from sys.modules and deletes any PEP 3147 or
|
||||
legacy .pyc and .pyo files.
|
||||
"""
|
||||
unload(modname)
|
||||
for dirname in sys.path:
|
||||
source = os.path.join(dirname, modname + '.py')
|
||||
# It doesn't matter if they exist or not, unlink all possible
|
||||
# combinations of PEP 3147 and legacy pyc and pyo files.
|
||||
unlink(source + 'c')
|
||||
unlink(source + 'o')
|
||||
unlink(imp.cache_from_source(source, debug_override=True))
|
||||
unlink(imp.cache_from_source(source, debug_override=False))
|
||||
|
||||
# On some platforms, should not run gui test even if it is allowed
|
||||
# in `use_resources'.
|
||||
|
|
|
@ -134,10 +134,11 @@ from __future__ import (absolute_import, division, print_function,
|
|||
from future.builtins import bytes, dict, int, range, str
|
||||
|
||||
import base64
|
||||
# Py2.7 compatibility hack
|
||||
base64.encodebytes = base64.encodestring
|
||||
base64.decodebytes = base64.decodestring
|
||||
import sys
|
||||
if sys.version_info < (3, 9):
|
||||
# Py2.7 compatibility hack
|
||||
base64.encodebytes = base64.encodestring
|
||||
base64.decodebytes = base64.decodestring
|
||||
import time
|
||||
from datetime import datetime
|
||||
from future.backports.http import client as http_client
|
||||
|
@ -1251,7 +1252,7 @@ class Transport(object):
|
|||
# Send HTTP request.
|
||||
#
|
||||
# @param host Host descriptor (URL or (URL, x509 info) tuple).
|
||||
# @param handler Targer RPC handler (a path relative to host)
|
||||
# @param handler Target RPC handler (a path relative to host)
|
||||
# @param request_body The XML-RPC request body
|
||||
# @param debug Enable debugging if debug is true.
|
||||
# @return An HTTPConnection.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue