Typeshed branch 'master' was renamed to 'main' (#13980)

AlexWaygood · web-flow · commit 32c26f208732 · 2022-11-01T06:20:59.000-07:00
There aren't really any big changes required over on mypy's side (I was worried there would be more breakage, but I think mypy should be fine). Cf. python/typeshed#8956.
diff --git a/misc/sync-typeshed.py b/misc/sync-typeshed.py
@@ -134,7 +134,7 @@ def main() -> None:
     parser.add_argument(
         "--commit",
         default=None,
-        help="Typeshed commit (default to latest master if using a repository clone)",
+        help="Typeshed commit (default to latest main if using a repository clone)",
     )
     parser.add_argument(
         "--typeshed-dir",
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -4580,7 +4580,7 @@ def visit_with_stmt(self, s: WithStmt) -> None:
             # exceptions or not. We determine this using a heuristic based on the
             # return type of the __exit__ method -- see the discussion in
             # https://github.com/python/mypy/issues/7214 and the section about context managers
-            # in https://github.com/python/typeshed/blob/master/CONTRIBUTING.md#conventions
+            # in https://github.com/python/typeshed/blob/main/CONTRIBUTING.md#conventions
             # for more details.
 
             exit_ret_type = get_proper_type(exit_ret_type)

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ def main() -> None:`
`134`	`134`	`parser.add_argument(`
`135`	`135`	`"--commit",`
`136`	`136`	`default=None,`
`137`		`- help="Typeshed commit (default to latest master if using a repository clone)",`
	`137`	`+ help="Typeshed commit (default to latest main if using a repository clone)",`
`138`	`138`	`)`
`139`	`139`	`parser.add_argument(`
`140`	`140`	`"--typeshed-dir",`