@autorest/python 6.2.4 → 6.2.7

package/autorest/jsonrpc/__init__.py

@@ -114,7 +114,9 @@ class AutorestAPI(ABC):
     def message(self, channel: Channel, text: str) -> None:
         """Send a log message to autorest."""
 
-    def get_boolean_value(self, key: str, default: bool = None) -> Optional[bool]:
+    def get_boolean_value(
+        self, key: str, default: Optional[bool] = None
+    ) -> Optional[bool]:
         """Check if value is present on the line, and interpret it as bool if it was.
 
         If value is not not on the line, return the "default".

package/autorest/jsonrpc/localapi.py

@@ -17,7 +17,9 @@ class LocalAutorestAPI(AutorestAPI):
     """A local API that will write on local disk."""
 
     def __init__(
-        self, reachable_files: List[str] = None, output_folder: str = "generated"
+        self,
+        reachable_files: Optional[List[str]] = None,
+        output_folder: str = "generated",
     ) -> None:
         super().__init__()
         if reachable_files is None:

package/autorest/jsonrpc/stdstream.py

@@ -28,7 +28,7 @@ def read_message(stream: BinaryIO = sys.stdin.buffer) -> str:
     try:
         bytes_size = int(order.split(b":")[1].strip())
     except Exception as err:
-        raise ValueError(f"Was unable to read length from {order}") from err  # type: ignore
+        raise ValueError(f"Was unable to read length from {order!r}") from err
     # Double new line, so read another emptyline and ignore it
     stream.readline()
 

package/autorest/m2r/__init__.py

@@ -6,7 +6,7 @@
 """An autorest MD to RST plugin.
 """
 import logging
-from typing import Any, Dict, Set
+from typing import Any, Dict, Set, Union
 
 import m2r2
 
@@ -35,7 +35,7 @@ class M2R(YamlUpdatePlugin):  # pylint: disable=abstract-method
         self._convert_docstring_no_cycles(yaml_data, set())
 
     def _convert_docstring_no_cycles(
-        self, yaml_data: Dict[str, Any], node_list: Set[int]
+        self, yaml_data: Union[Dict[str, Any], str], node_list: Set[int]
     ) -> None:
         """Walk the YAML tree to convert MD to RST."""
         if id(yaml_data) in node_list:

package/autorest/multiapi/models/imports.py

@@ -25,30 +25,34 @@ class TypingSection(str, Enum):
 class FileImport:
     def __init__(
         self,
-        imports: Dict[
-            TypingSection,
+        imports: Optional[
             Dict[
-                ImportType,
+                TypingSection,
                 Dict[
-                    str,
-                    Set[
-                        Optional[
-                            Union[
-                                str,
-                                Tuple[
-                                    str,
-                                    str,
-                                ],
-                                Tuple[
-                                    str,
+                    ImportType,
+                    Dict[
+                        str,
+                        Set[
+                            Optional[
+                                Union[
                                     str,
-                                    Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
-                                ],
+                                    Tuple[
+                                        str,
+                                        str,
+                                    ],
+                                    Tuple[
+                                        str,
+                                        Optional[str],
+                                        Tuple[
+                                            Tuple[Tuple[int, int], str, Optional[str]]
+                                        ],
+                                    ],
+                                ]
                             ]
-                        ]
+                        ],
                     ],
                 ],
-            ],
+            ]
         ] = None,
     ) -> None:
         # Basic implementation
@@ -72,7 +76,7 @@ class FileImport:
                                 ],
                                 Tuple[
                                     str,
-                                    str,
+                                    Optional[str],
                                     Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
                                 ],
                             ]
@@ -95,7 +99,11 @@ class FileImport:
                     str,
                     str,
                 ],
-                Tuple[str, str, Tuple[Tuple[Tuple[int, int], str, Optional[str]]]],
+                Tuple[
+                    str,
+                    Optional[str],
+                    Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
+                ],
             ]
         ] = None,
         typing_section: TypingSection = TypingSection.REGULAR,
@@ -107,7 +115,11 @@ class FileImport:
                     str,
                     str,
                 ],
-                Tuple[str, str, Tuple[Tuple[Tuple[int, int], str, Optional[str]]]],
+                Tuple[
+                    str,
+                    Optional[str],
+                    Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
+                ],
             ]
         ] = None
         name_input = convert_list_to_tuple(name_import)
@@ -144,7 +156,7 @@ class FileImport:
                             ],
                             Tuple[
                                 str,
-                                str,
+                                Optional[str],
                                 Tuple[Tuple[Tuple[int, int], str, Optional[str]]],
                             ],
                         ]

package/autorest/multiapi/serializers/import_serializer.py

@@ -55,7 +55,7 @@ def _serialize_package(
                 ),
             )
         )
-    for submodule_name, alias, version_modules in versioned_modules:  # type: ignore
+    for submodule_name, alias, version_modules in versioned_modules:
         for n, (version, module_name, comment) in enumerate(version_modules):
             buffer.append(
                 "{} sys.version_info >= {}:".format("if" if n == 0 else "elif", version)

package/autorest/multiapi/templates/multiapi_config.py.jinja2

@@ -11,7 +11,7 @@ def __init__(
     {{ parameter.signature(async_mode) }}
         {% endif %}
     {% endfor %}
-    **kwargs  # type: Any
+    **kwargs: Any
 ){{" -> None" if async_mode else "" }}:{% endmacro %}
 {% set version_import = ".._version" if async_mode else "._version" %}
 {% set async_prefix = "Async" if async_mode else "" %}
@@ -43,9 +43,6 @@ class {{ code_model.client.name }}Configuration(Configuration):
     """
 
     {{ method_signature()|indent }}
-        {% if not async_mode %}
-        # type: (...) -> None
-        {% endif %}
 {% for parameter in code_model.global_parameters.parameters %}
     {% if parameter.required %}
         if {{ parameter.name }} is None:
@@ -70,11 +67,8 @@ class {{ code_model.client.name }}Configuration(Configuration):
 
     def _configure(
         self,
-        **kwargs{{": Any" if async_mode else "  # type: Any"}}
+        **kwargs: Any
     ){{ " -> None" if async_mode else "" }}:
-        {% if not async_mode %}
-        # type: (...) -> None
-        {% endif %}
         self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
         self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
         self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)

package/autorest/multiapi/templates/multiapi_service_client.py.jinja2

@@ -14,7 +14,7 @@ def __init__(
     {% for parameter in code_model.global_parameters.service_client_specific_global_parameters %}
     {{ parameter.signature(async_mode) }}
     {% endfor %}
-    **kwargs  # type: Any
+    **kwargs: Any
 ){{" -> None" if async_mode else "" }}:{% endmacro %}
 {# actual template starts here #}
 {% set pipeline_client = "ARMPipelineClient" if azure_arm else "PipelineClient" %}

package/autorest/postprocess/__init__.py

@@ -9,11 +9,12 @@ import os
 import shutil
 from venv import EnvBuilder
 import black
+from black.report import NothingChanged
 from .venvtools import ExtendedEnvBuilder, python_run
 
 from .. import Plugin, PluginAutorest
 
-_BLACK_MODE = black.Mode()
+_BLACK_MODE = black.Mode()  # pyright: ignore [reportPrivateImportUsage]
 _BLACK_MODE.line_length = 120
 
 
@@ -24,7 +25,7 @@ def format_file(file: Path, file_content: str) -> str:
         file_content = black.format_file_contents(
             file_content, fast=True, mode=_BLACK_MODE
         )
-    except black.NothingChanged:
+    except NothingChanged:
         pass
     return file_content
 
@@ -170,7 +171,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
                 added_objs.append(obj)
         file_content = file_content.replace(
             "try:\n    from ._patch import __all__ as _patch_all\n    "
-            "from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import"
+            "from ._patch import *  # pylint: disable=unused-wildcard-import"
             "\nexcept ImportError:\n    _patch_all = []",
             "",
         )
@@ -178,7 +179,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             "from ._patch import __all__ as _patch_all", ""
         )
         file_content = file_content.replace(
-            "from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import\n",
+            "from ._patch import *  # pylint: disable=unused-wildcard-import\n",
             "",
         )
         file_content = file_content.replace(

package/autorest/preprocess/__init__.py

@@ -9,7 +9,11 @@ import copy
 from typing import Callable, Dict, Any, List, Optional
 
 from .._utils import to_snake_case
-from .helpers import pad_reserved_words, add_redefined_builtin_info
+from .helpers import (
+    pad_reserved_words,
+    add_redefined_builtin_info,
+    pad_builtin_namespaces,
+)
 from .python_mappings import PadType
 
 from .. import YamlUpdatePlugin, YamlUpdatePluginAutorest
@@ -362,6 +366,8 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
             for client in clients:
                 update_client(client)
                 self.update_operation_groups(yaml_data, client)
+        if yaml_data.get("namespace"):
+            yaml_data["namespace"] = pad_builtin_namespaces(yaml_data["namespace"])
 
 
 class PreProcessPluginAutorest(YamlUpdatePluginAutorest, PreProcessPlugin):

package/autorest/preprocess/helpers.py

@@ -3,9 +3,14 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict
 import re
-from .python_mappings import PadType, RESERVED_WORDS, REDEFINED_BUILTINS
+from typing import Any, Dict
+from .python_mappings import (
+    PadType,
+    RESERVED_WORDS,
+    REDEFINED_BUILTINS,
+    BUILTIN_PACKAGES,
+)
 
 
 def pad_reserved_words(name: str, pad_type: PadType):
@@ -26,5 +31,12 @@ def add_redefined_builtin_info(name: str, yaml_data: Dict[str, Any]) -> None:
         yaml_data["pylintDisable"] = "redefined-builtin"
 
 
+def pad_builtin_namespaces(namespace: str) -> str:
+    items = namespace.split(".")
+    if items[0] in BUILTIN_PACKAGES:
+        items[0] = items[0] + "_"
+    return ".".join(items)
+
+
 def pad_special_chars(name: str) -> str:
     return re.sub(r"[^A-z0-9_]", "_", name)

package/autorest/preprocess/python_mappings.py

@@ -174,3 +174,30 @@ REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores
     "max",
     "filter",
 ]
+
+BUILTIN_PACKAGES = [
+    "array",
+    "atexit",
+    "binascii",
+    "builtins",
+    "cmath",
+    "errno",
+    "faulthandler",
+    "fcntl",
+    "gc",
+    "grp",
+    "itertools",
+    "marshal",
+    "math",
+    "posix",
+    "pwd",
+    "pyexpat",
+    "select",
+    "spwd",
+    "sys",
+    "syslog",
+    "time",
+    "unicodedata",
+    "xxsubtype",
+    "zlib",
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.2.4",
+  "version": "6.2.7",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "@autorest/system-requirements": "~1.0.0"
   },
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "^3.3.41",
+    "@microsoft.azure/autorest.testserver": "^3.3.45",
     "typescript": "^4.8.3"
   },
   "files": [

package/setup.py

@@ -38,6 +38,9 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'License :: OSI Approved :: MIT License',
     ],
     packages=find_packages(exclude=[