Skip to content

Commit

Permalink
Fix typos (#788)
Browse files Browse the repository at this point in the history
Found via this command:

    codespell -S "./dynaconf/vendor/*,./docs/pt-br/*,./.mypy_cache/*,*.svg" -L hashi
  • Loading branch information
kianmeng committed Sep 9, 2022
1 parent 87a4381 commit d156022
Show file tree
Hide file tree
Showing 28 changed files with 74 additions and 73 deletions.
2 changes: 1 addition & 1 deletion 3.x-release-notes.md
Expand Up @@ -66,7 +66,7 @@ key = 'value'
key = 'value'
```

**Now starting on 3.0.0** the environments are disabled by default, so the same file can be crated as.
**Now starting on 3.0.0** the environments are disabled by default, so the same file can be created as.

```toml
key = 'value'
Expand Down
50 changes: 25 additions & 25 deletions CHANGELOG.md
Expand Up @@ -637,7 +637,7 @@ Other
- Fix #478 Make alias for environment -> environments (#534) [Bruno
Rocha]

This is a commom mistake to pass `environment` so it is alias.
This is a common mistake to pass `environment` so it is alias.

Fix #478
- Fix #462 make DynaBox nested List to use DynaBox as default class
Expand Down Expand Up @@ -797,7 +797,7 @@ Other

* Change map to list comprehension and create empty [] as default value

* fix wrong identation
* fix wrong indentation
- Fix merging hyperlink to fix #454 (#458) [Ilito Torquato, Ilito
Torquato]
- Specify flask extension initializers by entry point object reference
Expand Down Expand Up @@ -900,7 +900,7 @@ Other
- Fix #432 no need for warning when env is missing on a file (#438)
[Bruno Rocha]

When env is missing on a file ther eis no need to output
When env is missing on a file there eis no need to output
a warning.

All envs are optional on files.
Expand Down Expand Up @@ -1237,7 +1237,7 @@ Other
Fix #327
Fix #341

Exemples added:
Examples added:

example/issues/323_DEFAULT_VALUES_RESOLUTION/
example/issues/325_flask_dot_env/
Expand Down Expand Up @@ -1591,7 +1591,7 @@ Other
The release of python-box https://github.com/cdgriffith/Box/pull/116
is a breaking change.

So pinning this until this project addapts.
So pinning this until this project adapts.

Also pinning other direct deps.
- Fix #258 custom message for validators. [Bruno Rocha]
Expand Down Expand Up @@ -1982,7 +1982,7 @@ Other
Use the Key Value API rather than the old 'read' and 'write' methods (#198)
- Fix #194 flask.app.config __setitem__ (#199) [Bruno Rocha]

Flask.config was not proxying __setitem__ atribute so this
Flask.config was not proxying __setitem__ attribute so this
change adds a call to __setitem__ on contrib/flask_dynaconf
- Use the Key Value API rather than the old 'read' and 'write' methods
(#198) [Raoul Snyman]
Expand Down Expand Up @@ -2096,7 +2096,7 @@ Other
HOTFIX config.md on docs [skip ci] (#171)
Fix some open file descriptors on exampls and tests (#172)
Fix #151 setup pre-commit and black (#173)
Add CONTRIBUTING.md, conrtib isntructions and Black badge (#174)
Add CONTRIBUTING.md, contrib isntructions and Black badge (#174)
Fix release script

David Moreau Simard (1):
Expand Down Expand Up @@ -2129,7 +2129,7 @@ Other
HOTFIX config.md on docs [skip ci] (#171)
Fix some open file descriptors on exampls and tests (#172)
Fix #151 setup pre-commit and black (#173)
Add CONTRIBUTING.md, conrtib isntructions and Black badge (#174)
Add CONTRIBUTING.md, contrib isntructions and Black badge (#174)
Fix release script

David Moreau Simard (1):
Expand All @@ -2139,7 +2139,7 @@ Other
Skip reloading envs for validators that only apply to current_env (#162)
Fix #163 Allow disabling env prefix (#164)
- Fix release script. [Bruno Rocha]
- Add CONTRIBUTING.md, conrtib isntructions and Black badge (#174)
- Add CONTRIBUTING.md, contrib isntructions and Black badge (#174)
[Bruno Rocha]
- Fix #151 setup pre-commit and black (#173) [Bruno Rocha]

Expand Down Expand Up @@ -2207,7 +2207,7 @@ Other

removed logzero, cached logger using lru_cache (that means that if loglevel changes, log changes)

- imporved docs and badges.
- improved docs and badges.
- Fix typos in bash export examples. [David Moreau Simard]
- HOTIX: Django doc. [Bruno Rocha]
- Added Django explicit mode to docs (#149) [Bruno Rocha]
Expand Down Expand Up @@ -2238,7 +2238,7 @@ Other
Fix #110 add docs for dynaconf_include
Add dynaconf_include examples
Set up CI with Azure Pipelines (#142)
Add dynaconf_merge fucntionality for dict and list settings. (#139)
Add dynaconf_merge functionality for dict and list settings. (#139)
Preparing for 2.0.0

Byungjin Park (1):
Expand Down Expand Up @@ -2300,7 +2300,7 @@ Other
Fix #110 add docs for dynaconf_include
Add dynaconf_include examples
Set up CI with Azure Pipelines (#142)
Add dynaconf_merge fucntionality for dict and list settings. (#139)
Add dynaconf_merge functionality for dict and list settings. (#139)
Preparing for 2.0.0

Byungjin Park (1):
Expand Down Expand Up @@ -2359,10 +2359,10 @@ Other
- start_dotenv is now Lazy (only when settings._setup is called)
- Added new _FOR_DYNACONF config options ENV_SWITCHER, SKIP_FILES, INCLUDES & SECRETS
- Renamed config PROJECT_ROOT -> ROOT_PATH
- Add dynaconf_merge fucntionality for dict and list settings. (#139)
- Add dynaconf_merge functionality for dict and list settings. (#139)
[Bruno Rocha]

If your settings has existing variables of types `list` ot `dict` and you want to `merge` instead of `override` then
If your settings has existing variables of types `list` or `dict` and you want to `merge` instead of `override` then
the `dynaconf_merge` and `dynaconf_merge_unique` stanzas can mark that variable as a candidate for merging.

For **dict** value:
Expand Down Expand Up @@ -2399,7 +2399,7 @@ Other
dynaconf_merge: true
```

The `dynaconf_merge` token will mark that object to be merged with existing values (of course `dynaconf_merge` key will not be added to the final settings it is jsut a mark)
The `dynaconf_merge` token will mark that object to be merged with existing values (of course `dynaconf_merge` key will not be added to the final settings it is just a mark)

The end result will be on `[development]` env:

Expand Down Expand Up @@ -2682,7 +2682,7 @@ Other
- Python 3.4 has different error message. [Mantas]
- Remove mocker fixture. [Mantas]

Left this accidentaly.
Left this accidentally.

https://travis-ci.org/dynaconf/dynaconf/jobs/452612532
- Add INSTANCE_FOR_DYNACONF and --instance. [Mantas]
Expand Down Expand Up @@ -2884,8 +2884,8 @@ Other
- Add example for merge_configs. [Bruno Rocha]
- Add setting merging. [Raoul Snyman]

- Addd the ability to merge nested structures instead of completely overwriting them
- Use monkeypatch to stop one test from interferring with another
- Add the ability to merge nested structures instead of completely overwriting them
- Use monkeypatch to stop one test from interfering with another
- Updated documentation


Expand Down Expand Up @@ -2935,7 +2935,7 @@ Other
[latty]
- Release 1.0.3. [Bruno Rocha]

- Excluded example and tests from realease dist
- Excluded example and tests from release dist
- removed root logger configuration


Expand Down Expand Up @@ -3032,7 +3032,7 @@ Other
- Increase cli test coverage. [Bruno Rocha]
- Dynaconf variables in blue and user variables in green. [Bruno Rocha]
- Added `dynaconf list` and `dynaconf write` subcommands. [Bruno Rocha]
- More cli commands lsit and write. [Bruno Rocha]
- More cli commands list and write. [Bruno Rocha]
- Added more tests for cli and py loader. [Bruno Rocha]
- Replaced coveralls with codecov #57. [Bruno Rocha]
- Modularized the loaders, added `dynaconf init` command. [Bruno Rocha]
Expand All @@ -3048,9 +3048,9 @@ Other
- Merge pull request #52 from rochacbruno/fix_namespace_in_django.
[Bruno Rocha]

Fix namespace swithc in django apps
Fix namespace switch in django apps
- Add missing .env. [Bruno Rocha]
- Fix namespace swithc in django apps. [Bruno Rocha]
- Fix namespace switch in django apps. [Bruno Rocha]


0.7.5 (2018-05-20)
Expand Down Expand Up @@ -3238,7 +3238,7 @@ Other
- Add Pipfile.lock to .gitignore. [Douglas Soares de Andrade]
- Small Refactory. [Douglas Soares de Andrade]

- Adding object to the Settings classe to make it work with Python2
- Adding object to the Settings classes to make it work with Python2
- Small Refactory. [Douglas Soares de Andrade]

- Reordering the imports according to pylint and flake8
Expand Down Expand Up @@ -3307,7 +3307,7 @@ Other
- Added note about get_fresh in readme. [Bruno Rocha]
- Better namespace management, get_fresh(key) to access redis. [Bruno
Rocha]
- Now it can be used programatically. [Bruno Rocha]
- Now it can be used programmatically. [Bruno Rocha]


0.2.1 (2015-12-20)
Expand All @@ -3318,7 +3318,7 @@ Other

0.2.0 (2015-12-20)
------------------
- Can also load from arbitraty filepath. [Bruno Rocha]
- Can also load from arbitrary filepath. [Bruno Rocha]
- Renamed var, added loaders, bump version. [Bruno Rocha]


Expand Down
2 changes: 1 addition & 1 deletion docs/envvars.md
Expand Up @@ -162,7 +162,7 @@ parse_conf.converters["@path"] = (
)
```

In the settings file we can now use teh @path casting token. Like with other
In the settings file we can now use the @path casting token. Like with other
casting tokens you can also combine them:

```toml
Expand Down
4 changes: 2 additions & 2 deletions docs/flask.md
Expand Up @@ -42,7 +42,7 @@ app = Flask(__name__)
FlaskDynaconf(app, envvar_prefix="PEANUT")
```

Now you can declare your variables with your custom prefix, and it will be normally available withing Flask's native configuration `app.config`.
Now you can declare your variables with your custom prefix, and it will be normally available within Flask's native configuration `app.config`.

```bash
export PEANUT_DEBUG=true # app.config.DEBUG
Expand All @@ -66,7 +66,7 @@ IF you don't want to manually create your config files take a look at the [CLI](

## Loading Flask Extensions Dynamically

You can tell Dynaconf to load your Flask Extensions dynamically as long as the extensions follows the Pattens of Flask extensions.
You can tell Dynaconf to load your Flask Extensions dynamically as long as the extensions follows the Patterns of Flask extensions.

The only requirement is that the extension must be a `callable` that accepts `app` as first argument. e.g: `flask_admin:Admin` or `custom_extension.module:instance.init_app` and of course the extension must be in Python namespace to be imported.

Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Expand Up @@ -67,7 +67,7 @@ pip install dynaconf
.
├── config.py # Where you import your settings object (required)
├── .secrets.toml # Sensitive data like passwords and tokens (optional)
└── settings.toml # Application setttings (optional)
└── settings.toml # Application settings (optional)
```

=== "your_program.py"
Expand Down
2 changes: 1 addition & 1 deletion docs/validation.md
Expand Up @@ -304,7 +304,7 @@ settings.validators.validate(

> **Validate only current env**
You can specify if you want to validate all environments defined for a validator (default behavior) or only the current environement. In the first case, the validators will run on all possible settings defined in their list of environment, while in the latter the validators with environments different from the current environment will be skipped.
You can specify if you want to validate all environments defined for a validator (default behavior) or only the current environment. In the first case, the validators will run on all possible settings defined in their list of environment, while in the latter the validators with environments different from the current environment will be skipped.

This is useful when your configuration for different environments (let's say `production` and `development`) comes from different files you don't necesseraly have access to during development. You would want to write different validators for your `development` and `production` environments, and only run the right validator for the current environment.

Expand Down
20 changes: 10 additions & 10 deletions dynaconf/base.py
Expand Up @@ -89,9 +89,9 @@ def __resolve_config_aliases(self, kwargs):
"environment": "environments",
"ENVIRONMENT": "ENVIRONMENTS",
}
for mispell, correct in mispells.items():
if mispell in kwargs:
kwargs[correct] = kwargs.pop(mispell)
for misspell, correct in mispells.items():
if misspell in kwargs:
kwargs[correct] = kwargs.pop(misspell)

for_dynaconf_keys = {
key
Expand Down Expand Up @@ -180,7 +180,7 @@ def configure(self, settings_module=None, **kwargs):
Allows user to reconfigure settings object passing a new settings
module or separated kwargs
:param settings_module: defines the setttings file
:param settings_module: defines the settings file
:param kwargs: override default settings
"""
default_settings.reload(self._should_load_dotenv)
Expand Down Expand Up @@ -209,7 +209,7 @@ class Settings:
def __init__(self, settings_module=None, **kwargs): # pragma: no cover
"""Execute loaders and custom initialization
:param settings_module: defines the setttings file
:param settings_module: defines the settings file
:param kwargs: override default settings
"""
self._fresh = False
Expand Down Expand Up @@ -346,7 +346,7 @@ def setdefault(self, item, default, apply_default_on_none=False):
"""
value = self.get(item, empty)

# Yaml loader reads empty values as None, whould we apply defaults?
# Yaml loader reads empty values as None, would we apply defaults?
global_apply_default = (
self.get("APPLY_DEFAULT_ON_NONE_FOR_DYNACONF") is not None
)
Expand Down Expand Up @@ -425,7 +425,7 @@ def get(
parent=None,
):
"""
Get a value from settings store, this is the prefered way to access::
Get a value from settings store, this is the preferred way to access::
>>> from dynaconf import settings
>>> settings.get('KEY')
Expand Down Expand Up @@ -483,7 +483,7 @@ def exists(self, key, fresh=False):
"""Check if key exists
:param key: the name of setting variable
:param fresh: if key should be taken from source direclty
:param fresh: if key should be taken from source directly
:return: Boolean
"""
key = upperfy(key)
Expand Down Expand Up @@ -1009,7 +1009,7 @@ def execute_loaders(
"""Execute all internal and registered loaders
:param env: The environment to load
:param silent: If loading erros is silenced
:param silent: If loading errors is silenced
:param key: if provided load a single key
:param filename: optional custom filename to load
:param loaders: optional list of loader modules
Expand Down Expand Up @@ -1200,7 +1200,7 @@ def dynaconf_clone(self):
try:
return copy.deepcopy(self)
except TypeError:
# can't deepcopy settings object bacause of module object
# can't deepcopy settings object because of module object
# being set as value in the settings dict
new_data = self.to_dict(internal=True)
new_data["dynaconf_skip_loaders"] = True
Expand Down
2 changes: 1 addition & 1 deletion dynaconf/cli.py
Expand Up @@ -101,7 +101,7 @@ def set_settings(ctx, instance=None):
def import_settings(dotted_path):
"""Import settings instance from python dotted path.
Last item in dotted path must be settings instace.
Last item in dotted path must be settings instance.
Example: import_settings('path.to.settings')
"""
Expand Down
2 changes: 1 addition & 1 deletion dynaconf/contrib/django_dynaconf_v2.py
@@ -1,6 +1,6 @@
"""Dynaconf django extension
In the `django_project/settings.py` put at the very botton of the file:
In the `django_project/settings.py` put at the very bottom of the file:
# HERE STARTS DYNACONF EXTENSION LOAD (Keep at the very bottom of settings.py)
# Read more at https://www.dynaconf.com/django/
Expand Down
2 changes: 1 addition & 1 deletion dynaconf/contrib/flask_dynaconf.py
Expand Up @@ -71,7 +71,7 @@ class FlaskDynaconf:
app,
ENV='MYSITE',
SETTINGS_FILE='settings.yml',
EXTRA_VALUE='You can add aditional config vars here'
EXTRA_VALUE='You can add additional config vars here'
)
Take a look at examples/flask in Dynaconf repository
Expand Down
2 changes: 1 addition & 1 deletion dynaconf/default_settings.py
Expand Up @@ -86,7 +86,7 @@ def reload(load_dotenv=None, *args, **kwargs):
# # In dynaconf 1.0.0 `NAMESPACE` got renamed to `ENV`


# If provided environments will be loaded separatelly
# If provided environments will be loaded separately
ENVIRONMENTS_FOR_DYNACONF = get("ENVIRONMENTS_FOR_DYNACONF", False)
MAIN_ENV_FOR_DYNACONF = get("MAIN_ENV_FOR_DYNACONF", "MAIN")

Expand Down
2 changes: 1 addition & 1 deletion dynaconf/loaders/base.py
Expand Up @@ -57,7 +57,7 @@ def load(self, filename=None, key=None, silent=True):
:param filename: Optional filename to load
:param key: if provided load a single key
:param silent: if load erros should be silenced
:param silent: if load errors should be silenced
"""

filename = filename or self.obj.get(self.identifier.upper())
Expand Down
2 changes: 1 addition & 1 deletion dynaconf/loaders/toml_loader.py
Expand Up @@ -44,7 +44,7 @@ def load(obj, env=None, silent=True, key=None, filename=None):
the new tomllib library. The old library was called `toml` and
the new one is called `tomllib`.
The old lib uiri/toml allowed unicode characters and readed files
The old lib uiri/toml allowed unicode characters and re-added files
as string.
The new tomllib (stdlib) does not allow unicode characters, only
Expand Down

0 comments on commit d156022

Please sign in to comment.