Skip to content

Commit

Permalink
ENT-3764: Change comments to follow Conscious language initiative
Browse files Browse the repository at this point in the history
Card ID: ENT-3764

This is part of Conscious language initiative changes.

Following changes were made:
- master -> main, root
- blacklist -> blocklist

Words that were not replaced:
- subscription-manager.spec: This file contains changelog which is not
  subject to these changes.
- pylintrc: 'MASTER' is required INI heading.
- docs/sphinx/conf.py: 'master_doc' variable has been renamed to
  'root_doc' in Sphinx 4.0 (May 2021). 'master_doc' is still an alias.
  Not changed because test-requirements.txt still specify Sphinx>=1.8.5
  for Python 3.
- src/dnf-plugins/product-id/README.md: Primary branches of linked
  projects are called 'master'.
- test/manifestdata.py, test/test_cert_sorter.py,
  test/rhsmlib/test_attach.py: 'master' is a value of
  'subscriptionSubKey' returned as 'pool' attribute from Candlepin
  server.
  • Loading branch information
m-horky committed Aug 6, 2021
1 parent 6b4503d commit 9afca83
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Python setup.py doesn't cover all our bases. Additionally, setuptools does not like
# to install files outside of /usr (see http://stackoverflow.com/a/13476594/6124862).
#
# Therefore the Makefile performs the master build, but please keep the following guidelines
# Therefore the Makefile performs the main build, but please keep the following guidelines
# in mind when updating it:
#
# * If the file goes under /usr, put it in setup.py
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# The encoding of source files.
#source_encoding = 'utf-8-sig'

# The master toctree document.
# The root toctree document.
master_doc = 'index'

# General information about the project.
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. subscription-manager documentation master file, created by
.. subscription-manager documentation main file, created by
sphinx-quickstart on Tue May 13 23:24:51 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
2 changes: 1 addition & 1 deletion etc-conf/rhsm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ proxy_user =
# password for basic http proxy auth, if needed
proxy_password =

# host/domain suffix blacklist for proxy, if needed
# host/domain suffix blocklist for proxy, if needed
no_proxy =

[rhsm]
Expand Down
2 changes: 1 addition & 1 deletion man/subscription-manager.8
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ respects environment variables for proxy configuration, this should be avoided i
.B rhsmcertd
) do not provide ways to modify their environments.

Each option of the proxy configuration (hostname, port, host/domain pattern blacklist, username, password) is read independently, with precedence being command-line over configuration over environment, and then the resulting set of options is used to configure the proxy configuration.
Each option of the proxy configuration (hostname, port, host/domain pattern blocklist, username, password) is read independently, with precedence being command-line over configuration over environment, and then the resulting set of options is used to configure the proxy configuration.

For example,
if the
Expand Down
2 changes: 1 addition & 1 deletion pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Profiled execution.
profile=no

# Add <file or directory> to the black list. It should be a base name, not a
# Add <file or directory> to be skipped. It should be a base name, not a
# path. You may set this option multiple times.
ignore=CVS
ignore=.#
Expand Down
4 changes: 2 additions & 2 deletions src/subscription_manager/certdirectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ class ProductCertificateDirectory(CertificateDirectory):

def get_provided_tags(self):
"""
Iterates all product certificates in the directory and extracts a master
set of all tags they provide.
Iterates all product certificates in the directory and extracts a set
of all tags they provide.
"""
tags = set()
for prod_cert in self.list_valid():
Expand Down
2 changes: 1 addition & 1 deletion src/subscription_manager/cli_command/override.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def _do_command(self):
results = overrides.add_overrides(self.identity.uuid, to_add)
except connection.RestlibException as ex:
if ex.code == 400:
# black listed overrides specified.
# blocklisted overrides specified.
# Print message and return a less severe code.
system_exit(1, ex)
else:
Expand Down
5 changes: 2 additions & 3 deletions src/subscription_manager/cli_command/repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,8 @@ def filter_repos(repo):

def _set_repo_status(self, repos, repo_action_invoker, repo_actions):
"""
Given a list of repo actions (tuple of enable/disable and
repo ID), build the master list (without duplicates) to send to the
server.
Given a list of repo actions (tuple of enable/disable and repo ID),
build a list without duplicates to send to the server.
"""
rc = 0

Expand Down
2 changes: 1 addition & 1 deletion src/subscription_manager/productid.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ def update_installed(self, enabled, active):
def install_product_certs(self, product_certs):
# collect info, then do the needful later, so we can hook
# up a plugin in between and let it munge these lists, so a plugin
# could blacklist a product cert for example.
# could block a product cert for example.
self.plugin_manager.run('pre_product_id_install', product_list=product_certs)
# ProductCertDb.install()
# -> for each ProductCert:
Expand Down

0 comments on commit 9afca83

Please sign in to comment.