Skip to content

Commit

Permalink
Remove Python 2 support for utils/json.py (AcademySoftwareFoundation#…
Browse files Browse the repository at this point in the history
…1673)

* Delete rez/utils/json.py

---------

Signed-off-by: Bryce Gattis <brycegattis@yahoo.com>
  • Loading branch information
Pixel-Minions committed Sep 26, 2024
1 parent 887d506 commit 61512b8
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/rez/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def _validate(self, data):
pre_formatted=True,
filename=varname,
)
from rez.utils import json
import json

try:
return json.loads(value)
Expand Down
2 changes: 1 addition & 1 deletion src/rez/package_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright Contributors to the Rez Project


import json
import os
import os.path
import errno
Expand All @@ -21,7 +22,6 @@
from rez.config import config
from rez.exceptions import PackageCacheError
from rez.vendor.lockfile import LockFile, NotLocked
from rez.utils import json
from rez.utils.filesystem import safe_listdir, safe_makedirs, safe_remove, \
forceful_rmtree
from rez.utils.colorize import ColorizedStreamHandler
Expand Down
2 changes: 1 addition & 1 deletion src/rez/resolved_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
from rez.version import VersionRange
from rez.version import Requirement
from rez.vendor import yaml
from rez.utils import json
from rez.utils.yaml import dump_yaml
from rez.utils.platform_ import platform_

from contextlib import contextmanager
from functools import wraps
from enum import Enum
import getpass
import json
import socket
import threading
import time
Expand Down
2 changes: 1 addition & 1 deletion src/rez/utils/amqp.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@


import atexit
import json
import socket
import time
import threading
import logging
import urllib.parse
import queue

from rez.utils import json
from rez.utils.logging_ import print_error
from rez.vendor.pika.adapters.blocking_connection import BlockingConnection
from rez.vendor.pika.connection import ConnectionParameters
Expand Down
39 changes: 0 additions & 39 deletions src/rez/utils/json.py

This file was deleted.

0 comments on commit 61512b8

Please sign in to comment.