Skip to content

Remove the use of six package. #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the use of six package. #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 0 additions & 26 deletions THIRD_PARTY_LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,32 +1235,6 @@ LICENSE: https://github.com/rholder/retrying/blob/master/LICENSE
===============================================================================


six
=============
LICENSE: https://github.com/benjaminp/six/blob/master/LICENSE

Copyright (c) 2010-2020 Benjamin Peterson

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

===============================================================================


terminaltables
==============
LICENSE: https://github.com/Robpol86/terminaltables/blob/master/LICENSE
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ pytz>=2016.10
requests==2.27.0; python_version == '3.6'
requests==2.31.0; python_version == '3.7'
requests>=2.32.0; python_version > '3.7'
six>=1.15.0
sphinx==3.3.0
sphinx-rtd-theme==0.4.3
terminaltables==3.1.10
Expand Down
9 changes: 4 additions & 5 deletions ...access_governance_cp/src/oci_cli_access_governance_cp/generated/accessgovernancecp_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from __future__ import print_function
import click
import oci # noqa: F401
import six # noqa: F401
import sys # noqa: F401
from oci_cli.cli_root import cli
from oci_cli import cli_constants # noqa: F401
Expand Down Expand Up @@ -56,7 +55,7 @@ def governance_instance_group():
@cli_util.wrap_exceptions
def change_governance_instance_compartment(ctx, from_json, governance_instance_id, compartment_id, if_match):

if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0:
if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0:
raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -163,7 +162,7 @@ def create_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds,
@cli_util.wrap_exceptions
def delete_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_instance_id, if_match):

if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0:
if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0:
raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -222,7 +221,7 @@ def delete_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds,
@cli_util.wrap_exceptions
def get_governance_instance(ctx, from_json, governance_instance_id):

if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0:
if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0:
raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -336,7 +335,7 @@ def list_governance_instances(ctx, from_json, all_pages, page_size, compartment_
@cli_util.wrap_exceptions
def update_governance_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_instance_id, display_name, description, license_type, defined_tags, freeform_tags, if_match):

if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0:
if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0:
raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string')
if not force:
if defined_tags or freeform_tags:
Expand Down
71 changes: 35 additions & 36 deletions ...ci_cli_application_dependency_management/generated/applicationdependencymanagement_cli.py
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 20 additions & 21 deletions services/ai_document/src/oci_cli_ai_service_document/generated/aiservicedocument_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from __future__ import print_function
import click
import oci # noqa: F401
import six # noqa: F401
import sys # noqa: F401
from oci_cli.cli_root import cli
from oci_cli import cli_constants # noqa: F401
Expand Down Expand Up @@ -97,7 +96,7 @@ def processor_job_group():
@cli_util.wrap_exceptions
def add_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, type, related_resource_id, message, if_match, is_lock_override):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -165,7 +164,7 @@ def add_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv
@cli_util.wrap_exceptions
def add_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, type, related_resource_id, message, if_match, is_lock_override):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -388,7 +387,7 @@ def analyze_document_inline_document_details(ctx, from_json, features, document_
@cli_util.wrap_exceptions
def cancel_processor_job(ctx, from_json, processor_job_id, if_match):

if isinstance(processor_job_id, six.string_types) and len(processor_job_id.strip()) == 0:
if isinstance(processor_job_id, str) and len(processor_job_id.strip()) == 0:
raise click.UsageError('Parameter --processor-job-id cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -414,7 +413,7 @@ def cancel_processor_job(ctx, from_json, processor_job_id, if_match):
@cli_util.wrap_exceptions
def cancel_work_request(ctx, from_json, work_request_id, if_match):

if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0:
if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0:
raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -441,7 +440,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match):
@cli_util.wrap_exceptions
def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match, is_lock_override):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -475,7 +474,7 @@ def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match,
@cli_util.wrap_exceptions
def change_project_compartment(ctx, from_json, project_id, compartment_id, if_match, is_lock_override):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1027,7 +1026,7 @@ def create_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv
@cli_util.wrap_exceptions
def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match, is_lock_override):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1086,7 +1085,7 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval
@cli_util.wrap_exceptions
def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match, is_lock_override):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1139,7 +1138,7 @@ def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv
@cli_util.wrap_exceptions
def get_model(ctx, from_json, model_id):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -1163,7 +1162,7 @@ def get_model(ctx, from_json, model_id):
@cli_util.wrap_exceptions
def get_model_type(ctx, from_json, model_type, compartment_id, model_sub_type):

if isinstance(model_type, six.string_types) and len(model_type.strip()) == 0:
if isinstance(model_type, str) and len(model_type.strip()) == 0:
raise click.UsageError('Parameter --model-type cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -1189,7 +1188,7 @@ def get_model_type(ctx, from_json, model_type, compartment_id, model_sub_type):
@cli_util.wrap_exceptions
def get_processor_job(ctx, from_json, processor_job_id):

if isinstance(processor_job_id, six.string_types) and len(processor_job_id.strip()) == 0:
if isinstance(processor_job_id, str) and len(processor_job_id.strip()) == 0:
raise click.UsageError('Parameter --processor-job-id cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -1211,7 +1210,7 @@ def get_processor_job(ctx, from_json, processor_job_id):
@cli_util.wrap_exceptions
def get_project(ctx, from_json, project_id):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')

kwargs = {}
Expand All @@ -1233,7 +1232,7 @@ def get_project(ctx, from_json, project_id):
@cli_util.wrap_exceptions
def get_work_request(ctx, from_json, work_request_id):

if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0:
if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0:
raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1391,7 +1390,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_
if all_pages and limit:
raise click.UsageError('If you provide the --all option you cannot provide the --limit option')

if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0:
if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0:
raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1448,7 +1447,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id
if all_pages and limit:
raise click.UsageError('If you provide the --all option you cannot provide the --limit option')

if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0:
if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0:
raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1565,7 +1564,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor
@cli_util.wrap_exceptions
def patch_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, operations, if_match):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1629,7 +1628,7 @@ def patch_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_
@cli_util.wrap_exceptions
def remove_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, type, if_match, is_lock_override):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1689,7 +1688,7 @@ def remove_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_int
@cli_util.wrap_exceptions
def remove_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, type, if_match, is_lock_override):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')

kwargs = {}
Expand Down Expand Up @@ -1754,7 +1753,7 @@ def remove_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i
@cli_util.wrap_exceptions
def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, inference_units, freeform_tags, defined_tags, if_match, is_lock_override):

if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0:
if isinstance(model_id, str) and len(model_id.strip()) == 0:
raise click.UsageError('Parameter --model-id cannot be whitespace or empty string')
if not force:
if freeform_tags or defined_tags:
Expand Down Expand Up @@ -1840,7 +1839,7 @@ def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i
@cli_util.wrap_exceptions
def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, display_name, description, freeform_tags, defined_tags, if_match, is_lock_override):

if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0:
if isinstance(project_id, str) and len(project_id.strip()) == 0:
raise click.UsageError('Parameter --project-id cannot be whitespace or empty string')
if not force:
if freeform_tags or defined_tags:
Expand Down
Loading