Skip to content

Commit 1bb8a8c

Browse files
Added support for python 3.12
1 parent 72ba37d commit 1bb8a8c

File tree

5 files changed

+6
-24
lines changed

5 files changed

+6
-24
lines changed

SoftLayer/CLI/environment.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from json.decoder import JSONDecodeError
1313

1414
import click
15-
import pkg_resources
15+
1616
from rich.console import Console
1717
from rich.syntax import Syntax
1818

@@ -23,9 +23,6 @@
2323

2424
# pylint: disable=too-many-instance-attributes, invalid-name
2525

26-
# Calling pkg_resources.iter_entry_points shows a false-positive
27-
# pylint: disable=no-member
28-
2926

3027
class Environment(object):
3128
"""Provides access to the current CLI environment."""
@@ -165,8 +162,6 @@ def load(self):
165162

166163
self.load_modules_from_python(routes.ALL_ROUTES)
167164
self.aliases.update(routes.ALL_ALIASES)
168-
self._load_modules_from_entry_points('softlayer.cli')
169-
170165
self._modules_loaded = True
171166

172167
def load_modules_from_python(self, route_list):
@@ -178,20 +173,6 @@ def load_modules_from_python(self, route_list):
178173
path, attr = modpath, None
179174
self.commands[name] = ModuleLoader(path, attr=attr)
180175

181-
def _load_modules_from_entry_points(self, entry_point_group):
182-
"""Load modules from the entry_points (slower).
183-
184-
Entry points can be used to add new commands to the CLI.
185-
186-
Usage:
187-
188-
entry_points={'softlayer.cli': ['new-cmd = mymodule.new_cmd.cli']}
189-
190-
"""
191-
for obj in pkg_resources.iter_entry_points(group=entry_point_group,
192-
name=None):
193-
self.commands[obj.name] = obj
194-
195176
def ensure_client(self, config_file=None, is_demo=False, proxy=None):
196177
"""Create a new SLAPI client to the environment.
197178

SoftLayer/managers/ordering.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def get_package_by_key(self, package_keyname, mask=None):
268268
"""
269269
_filter = {'keyName': {'operation': package_keyname}}
270270

271-
packages = self.package_svc.getAllObjects(mask=mask, filter=_filter)
271+
packages = self.client.call('SoftLayer_Product_Package', 'getAllObjects', mask=mask, filter=_filter)
272272
if len(packages) == 0:
273273
raise exceptions.SoftLayerError(f"Package {package_keyname} does not exist")
274274

SoftLayer/testing/xmlrpc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
# pylint: disable=invalid-name, broad-except, arguments-differ
1818

1919

20-
class TestServer(http.server.HTTPServer):
20+
class TestServer(http.server.ThreadingHTTPServer):
2121
"""Test HTTP server which holds a given transport."""
2222

2323
def __init__(self, transport, *args, **kw):
24-
http.server.HTTPServer.__init__(self, *args, **kw)
24+
http.server.ThreadingHTTPServer.__init__(self, *args, **kw)
2525
self.transport = transport
2626

2727

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
'Programming Language :: Python :: 3.9',
5757
'Programming Language :: Python :: 3.10',
5858
'Programming Language :: Python :: 3.11',
59+
'Programming Language :: Python :: 3.11',
5960
'Programming Language :: Python :: Implementation :: CPython',
6061
'Programming Language :: Python :: Implementation :: PyPy',
6162
],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py37,py38,py39,py310,py311,pypy3,analysis,coverage,docs
2+
envlist = py37,py38,py39,py310,py311,py312pypy3,analysis,coverage,docs
33

44

55
[flake8]

0 commit comments

Comments
 (0)