Link to issue number:

Implements deprecation announced in: #11049, #10371, #10885
Part of: #12123

Summary of the issue:

Commands from the module speech.commands were being imported as from .commands import * in speech\__init__.py and speech\manager.py.

As a result, commands were often being imported as import speech; speech.ExampleCommand() or import speech.manager; speech.manager.ExampleCommand().

Description of how this pull request fixes the issue:

The deprecated behaviour is removed and commands must be imported explicitly as from speech.commands import ExampleCommand

Testing strategy:

Check code correctness by the following process. Do the following using an unchanged repository based on the latest master commit (db664be), so code can be compared properly.

Using git bash tools find & sed (may be also included in Windows Subsystem Linux)

[a-zA-Z_][a-zA-Z0-9_]* is the regex for valid python variable name prefixes

# removes "speech.ExampleCommand" usages from python files "ExampleCommand"
find . -type f -name "*.py" -exec sed -i'' -bre 's/speech\.([a-zA-Z_][a-zA-Z0-9_]*Command)/\1/' {} +

# removes "speech.commands.ExampleCommand" usages in favour of "ExampleCommand"
find . -type f -name "*.py" -exec sed -i'' -bre 's/speech\.commands\.([a-zA-Z_][a-zA-Z0-9_]*Command)/\1/' {} +

# removes "speech.manager.ExampleCommand" usages in favour of "ExampleCommand"
# there is no instances of NVDA with this usage, but this is used to ensure that fact considering the code removal
find . -type f -name "*.py" -exec sed -i'' -bre 's/speech\.manager\.([a-zA-Z_][a-zA-Z0-9_]*Command)/\1/' {} +

Do the following to confirm commands aren't being imported directly from speech or speech.manager

find . -type f -name '*.py' -exec grep -P "from +speech +import" {} +
find . -type f -name '*.py' -exec grep -P "from +speech\.manager +import" {} +

Compare the current code to this branch: nvda/dep-11049, note the only changes are:

• the removed, deprecated code
• the changed use of imports (hard to do automatically, any issues should be caught by flake8)
• whitespaces fixes for flake8

git diff origin/dep-11049

Known issues with pull request:

None

Change log entry:

Dev Changes

- Commands cannot be directly imported from speech as `import speech; speech.ExampleCommand()` or `import speech.manager; speech.manager.ExampleCommand()`. Commands should be imported explicitly as `from speech.commands import ExampleCommand` (#12126)

Code Review Checklist:

• Pull Request description is up to date.
• Unit tests.
• System (end to end) tests.
• Manual tests.
• User Documentation. (N/A)
• Change log entry.
• Context sensitive help for GUI changes. (N/A)