openstack/python-novaclient
Code Issues Proposed changes

Fix python35 job failures

Browse Source 
- Installation of the cryptography module fails on Ubuntu Xenial
  because the libssl-dev package needs to be installed first, so we
  add this to other-requirements.txt

- inspect.getargspec()` was deprecated in Python 3.0 and will be removed
  in 3.6 (ETA late 2016). From Python 3.5 it started throwing a deprecation
  warning which leds some tests failures.

Co-Authored-By: Andrey Kurilin <andr.kurilin@gmail.com>

Change-Id: Ic094ca5c636af9ac1e212914df910a020d92702d
This commit is contained in:
Jens Rosenboom 2016-07-19 12:10:26 +02:00 committed by Andrey Kurilin
parent 48da89e2a2
commit 454350ff6d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
novaclient/base.py
View File

@ -23,10 +23,10 @@ import abc
import contextlib import contextlib
import copy import copy
import hashlib import hashlib
import inspect
import os import os
import threading import threading
from oslo_utils import reflection
from oslo_utils import strutils from oslo_utils import strutils
from requests import Response from requests import Response
import six import six
@ -407,14 +407,14 @@ class ManagerWithFind(Manager):
detailed = True detailed = True
list_kwargs = {} list_kwargs = {}
list_argspec = inspect.getargspec(self.list) list_argspec = reflection.get_callable_args(self.list)
if 'detailed' in list_argspec.args: if 'detailed' in list_argspec:
detailed = ("human_id" not in kwargs and detailed = ("human_id" not in kwargs and
"name" not in kwargs and "name" not in kwargs and
"display_name" not in kwargs) "display_name" not in kwargs)
list_kwargs['detailed'] = detailed list_kwargs['detailed'] = detailed
if 'is_public' in list_argspec.args and 'is_public' in kwargs: if 'is_public' in list_argspec and 'is_public' in kwargs:
is_public = kwargs['is_public'] is_public = kwargs['is_public']
list_kwargs['is_public'] = is_public list_kwargs['is_public'] = is_public
if is_public is None: if is_public is None:
@ -422,7 +422,7 @@ class ManagerWithFind(Manager):
del tmp_kwargs['is_public'] del tmp_kwargs['is_public']
searches = tmp_kwargs.items() searches = tmp_kwargs.items()
if 'search_opts' in list_argspec.args: if 'search_opts' in list_argspec:
# pass search_opts in to do server side based filtering. # pass search_opts in to do server side based filtering.
# TODO(jogo) not all search_opts support regex, find way to # TODO(jogo) not all search_opts support regex, find way to
# identify when to use regex and when to use string matching. # identify when to use regex and when to use string matching.

1
other-requirements.txt
View File

@ -10,6 +10,7 @@ libdbus-1-dev [platform:dpkg]
libdbus-glib-1-dev [platform:dpkg] libdbus-glib-1-dev [platform:dpkg]
libffi-dev [platform:dpkg] libffi-dev [platform:dpkg]
libffi-devel [platform:rpm] libffi-devel [platform:rpm]
libssl-dev [platform:ubuntu-xenial]
libuuid-devel [platform:rpm] libuuid-devel [platform:rpm]
locales [platform:debian] locales [platform:debian]
python-dev [platform:dpkg] python-dev [platform:dpkg]