@zzzen/pyright-internal 1.2.0-dev.20240310 → 1.2.0-dev.20240324
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/analyzerFileInfo.js +1 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -0
- package/dist/analyzer/checker.js +44 -51
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/deprecatedSymbols.js +40 -40
- package/dist/analyzer/deprecatedSymbols.js.map +1 -1
- package/dist/analyzer/importResolver.js +6 -6
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/operations.js +9 -9
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.js +1 -1
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +16 -12
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/properties.js +2 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +1 -2
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.js +1 -1
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +52 -30
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +216 -105
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +6 -1
- package/dist/analyzer/typeGuards.js +8 -11
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -1
- package/dist/analyzer/typeUtils.js +34 -15
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/types.d.ts +2 -1
- package/dist/analyzer/types.js +1 -0
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +4 -1
- package/dist/backgroundThreadBase.js +21 -1
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +0 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -0
- package/dist/common/configOptions.js +9 -4
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/diagnosticRules.d.ts +1 -0
- package/dist/common/diagnosticRules.js +1 -0
- package/dist/common/diagnosticRules.js.map +1 -1
- package/dist/common/fullAccessHost.js +7 -3
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/logTracker.d.ts +5 -5
- package/dist/common/logTracker.js +7 -6
- package/dist/common/logTracker.js.map +1 -1
- package/dist/common/pythonVersion.d.ts +36 -20
- package/dist/common/pythonVersion.js +160 -54
- package/dist/common/pythonVersion.js.map +1 -1
- package/dist/languageService/completionProvider.js +2 -2
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +4 -0
- package/dist/localization/localize.js +1 -8
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +13 -5
- package/dist/localization/package.nls.de.json +13 -5
- package/dist/localization/package.nls.en-us.json +1 -0
- package/dist/localization/package.nls.es.json +13 -5
- package/dist/localization/package.nls.fr.json +15 -7
- package/dist/localization/package.nls.it.json +11 -3
- package/dist/localization/package.nls.ja.json +13 -5
- package/dist/localization/package.nls.ko.json +13 -5
- package/dist/localization/package.nls.pl.json +13 -5
- package/dist/localization/package.nls.pt-br.json +13 -5
- package/dist/localization/package.nls.qps-ploc.json +13 -5
- package/dist/localization/package.nls.ru.json +12 -4
- package/dist/localization/package.nls.tr.json +13 -5
- package/dist/localization/package.nls.zh-cn.json +13 -5
- package/dist/localization/package.nls.zh-tw.json +13 -5
- package/dist/parser/parser.js +25 -22
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringTokenUtils.js +12 -12
- package/dist/parser/stringTokenUtils.js.map +1 -1
- package/dist/parser/tokenizer.d.ts +0 -1
- package/dist/parser/tokenizer.js +41 -41
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/parser/tokenizerTypes.d.ts +1 -2
- package/dist/parser/tokenizerTypes.js +0 -1
- package/dist/parser/tokenizerTypes.js.map +1 -1
- package/dist/parser/unicode.js +3456 -2853
- package/dist/parser/unicode.js.map +1 -1
- package/dist/pyright.js +1 -1
- package/dist/pyright.js.map +1 -1
- package/dist/tests/checker.test.js +11 -11
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/config.test.js +7 -7
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +2 -2
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/fourslash/completions.override2.fourslash.js +1 -1
- package/dist/tests/fourslash/completions.override2.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +2 -1
- package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/languageServer.test.js +1 -1
- package/dist/tests/languageServer.test.js.map +1 -1
- package/dist/tests/lsp/customLsp.d.ts +1 -1
- package/dist/tests/lsp/languageServer.js +2 -1
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +6 -6
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +16 -12
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +3 -3
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +57 -57
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +22 -22
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +35 -33
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/package.json +1 -1
@@ -11,17 +11,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
11
|
exports.deprecatedSpecialForms = exports.deprecatedAliases = void 0;
|
12
12
|
const pythonVersion_1 = require("../common/pythonVersion");
|
13
13
|
exports.deprecatedAliases = new Map([
|
14
|
-
['Tuple', { version: pythonVersion_1.
|
15
|
-
['List', { version: pythonVersion_1.
|
16
|
-
['Dict', { version: pythonVersion_1.
|
17
|
-
['Set', { version: pythonVersion_1.
|
18
|
-
['FrozenSet', { version: pythonVersion_1.
|
19
|
-
['Type', { version: pythonVersion_1.
|
20
|
-
['Deque', { version: pythonVersion_1.
|
14
|
+
['Tuple', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.tuple', replacementText: 'tuple' }],
|
15
|
+
['List', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.list', replacementText: 'list' }],
|
16
|
+
['Dict', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.dict', replacementText: 'dict' }],
|
17
|
+
['Set', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.set', replacementText: 'set' }],
|
18
|
+
['FrozenSet', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.frozenset', replacementText: 'frozenset' }],
|
19
|
+
['Type', { version: pythonVersion_1.pythonVersion3_9, fullName: 'builtins.type', replacementText: 'type' }],
|
20
|
+
['Deque', { version: pythonVersion_1.pythonVersion3_9, fullName: 'collections.deque', replacementText: 'collections.deque' }],
|
21
21
|
[
|
22
22
|
'DefaultDict',
|
23
23
|
{
|
24
|
-
version: pythonVersion_1.
|
24
|
+
version: pythonVersion_1.pythonVersion3_9,
|
25
25
|
fullName: 'collections.defaultdict',
|
26
26
|
replacementText: 'collections.defaultdict',
|
27
27
|
},
|
@@ -29,7 +29,7 @@ exports.deprecatedAliases = new Map([
|
|
29
29
|
[
|
30
30
|
'OrderedDict',
|
31
31
|
{
|
32
|
-
version: pythonVersion_1.
|
32
|
+
version: pythonVersion_1.pythonVersion3_9,
|
33
33
|
fullName: 'collections.OrderedDict',
|
34
34
|
replacementText: 'collections.OrderedDict',
|
35
35
|
typingImportOnly: true,
|
@@ -38,7 +38,7 @@ exports.deprecatedAliases = new Map([
|
|
38
38
|
[
|
39
39
|
'Counter',
|
40
40
|
{
|
41
|
-
version: pythonVersion_1.
|
41
|
+
version: pythonVersion_1.pythonVersion3_9,
|
42
42
|
fullName: 'collections.Counter',
|
43
43
|
replacementText: 'collections.Counter',
|
44
44
|
typingImportOnly: true,
|
@@ -47,7 +47,7 @@ exports.deprecatedAliases = new Map([
|
|
47
47
|
[
|
48
48
|
'ChainMap',
|
49
49
|
{
|
50
|
-
version: pythonVersion_1.
|
50
|
+
version: pythonVersion_1.pythonVersion3_9,
|
51
51
|
fullName: 'collections.ChainMap',
|
52
52
|
replacementText: 'collections.ChainMap',
|
53
53
|
typingImportOnly: true,
|
@@ -56,7 +56,7 @@ exports.deprecatedAliases = new Map([
|
|
56
56
|
[
|
57
57
|
'Awaitable',
|
58
58
|
{
|
59
|
-
version: pythonVersion_1.
|
59
|
+
version: pythonVersion_1.pythonVersion3_9,
|
60
60
|
fullName: 'typing.Awaitable',
|
61
61
|
replacementText: 'collections.abc.Awaitable',
|
62
62
|
typingImportOnly: true,
|
@@ -65,7 +65,7 @@ exports.deprecatedAliases = new Map([
|
|
65
65
|
[
|
66
66
|
'Coroutine',
|
67
67
|
{
|
68
|
-
version: pythonVersion_1.
|
68
|
+
version: pythonVersion_1.pythonVersion3_9,
|
69
69
|
fullName: 'typing.Coroutine',
|
70
70
|
replacementText: 'collections.abc.Coroutine',
|
71
71
|
typingImportOnly: true,
|
@@ -74,7 +74,7 @@ exports.deprecatedAliases = new Map([
|
|
74
74
|
[
|
75
75
|
'AsyncIterable',
|
76
76
|
{
|
77
|
-
version: pythonVersion_1.
|
77
|
+
version: pythonVersion_1.pythonVersion3_9,
|
78
78
|
fullName: 'typing.AsyncIterable',
|
79
79
|
replacementText: 'collections.abc.AsyncIterable',
|
80
80
|
typingImportOnly: true,
|
@@ -83,7 +83,7 @@ exports.deprecatedAliases = new Map([
|
|
83
83
|
[
|
84
84
|
'AsyncIterator',
|
85
85
|
{
|
86
|
-
version: pythonVersion_1.
|
86
|
+
version: pythonVersion_1.pythonVersion3_9,
|
87
87
|
fullName: 'typing.AsyncIterator',
|
88
88
|
replacementText: 'collections.abc.AsyncIterator',
|
89
89
|
typingImportOnly: true,
|
@@ -92,7 +92,7 @@ exports.deprecatedAliases = new Map([
|
|
92
92
|
[
|
93
93
|
'AsyncGenerator',
|
94
94
|
{
|
95
|
-
version: pythonVersion_1.
|
95
|
+
version: pythonVersion_1.pythonVersion3_9,
|
96
96
|
fullName: 'typing.AsyncGenerator',
|
97
97
|
replacementText: 'collections.abc.AsyncGenerator',
|
98
98
|
typingImportOnly: true,
|
@@ -101,7 +101,7 @@ exports.deprecatedAliases = new Map([
|
|
101
101
|
[
|
102
102
|
'Iterable',
|
103
103
|
{
|
104
|
-
version: pythonVersion_1.
|
104
|
+
version: pythonVersion_1.pythonVersion3_9,
|
105
105
|
fullName: 'typing.Iterable',
|
106
106
|
replacementText: 'collections.abc.Iterable',
|
107
107
|
typingImportOnly: true,
|
@@ -110,7 +110,7 @@ exports.deprecatedAliases = new Map([
|
|
110
110
|
[
|
111
111
|
'Iterator',
|
112
112
|
{
|
113
|
-
version: pythonVersion_1.
|
113
|
+
version: pythonVersion_1.pythonVersion3_9,
|
114
114
|
fullName: 'typing.Iterator',
|
115
115
|
replacementText: 'collections.abc.Iterator',
|
116
116
|
typingImportOnly: true,
|
@@ -119,7 +119,7 @@ exports.deprecatedAliases = new Map([
|
|
119
119
|
[
|
120
120
|
'Generator',
|
121
121
|
{
|
122
|
-
version: pythonVersion_1.
|
122
|
+
version: pythonVersion_1.pythonVersion3_9,
|
123
123
|
fullName: 'typing.Generator',
|
124
124
|
replacementText: 'collections.abc.Generator',
|
125
125
|
typingImportOnly: true,
|
@@ -128,7 +128,7 @@ exports.deprecatedAliases = new Map([
|
|
128
128
|
[
|
129
129
|
'Reversible',
|
130
130
|
{
|
131
|
-
version: pythonVersion_1.
|
131
|
+
version: pythonVersion_1.pythonVersion3_9,
|
132
132
|
fullName: 'typing.Reversible',
|
133
133
|
replacementText: 'collections.abc.Reversible',
|
134
134
|
typingImportOnly: true,
|
@@ -137,7 +137,7 @@ exports.deprecatedAliases = new Map([
|
|
137
137
|
[
|
138
138
|
'Container',
|
139
139
|
{
|
140
|
-
version: pythonVersion_1.
|
140
|
+
version: pythonVersion_1.pythonVersion3_9,
|
141
141
|
fullName: 'typing.Container',
|
142
142
|
replacementText: 'collections.abc.Container',
|
143
143
|
typingImportOnly: true,
|
@@ -146,7 +146,7 @@ exports.deprecatedAliases = new Map([
|
|
146
146
|
[
|
147
147
|
'Collection',
|
148
148
|
{
|
149
|
-
version: pythonVersion_1.
|
149
|
+
version: pythonVersion_1.pythonVersion3_9,
|
150
150
|
fullName: 'typing.Collection',
|
151
151
|
replacementText: 'collections.abc.Collection',
|
152
152
|
typingImportOnly: true,
|
@@ -155,7 +155,7 @@ exports.deprecatedAliases = new Map([
|
|
155
155
|
[
|
156
156
|
'AbstractSet',
|
157
157
|
{
|
158
|
-
version: pythonVersion_1.
|
158
|
+
version: pythonVersion_1.pythonVersion3_9,
|
159
159
|
fullName: 'typing.AbstractSet',
|
160
160
|
replacementText: 'collections.abc.Set',
|
161
161
|
},
|
@@ -163,7 +163,7 @@ exports.deprecatedAliases = new Map([
|
|
163
163
|
[
|
164
164
|
'MutableSet',
|
165
165
|
{
|
166
|
-
version: pythonVersion_1.
|
166
|
+
version: pythonVersion_1.pythonVersion3_9,
|
167
167
|
fullName: 'typing.MutableSet',
|
168
168
|
replacementText: 'collections.abc.MutableSet',
|
169
169
|
typingImportOnly: true,
|
@@ -172,7 +172,7 @@ exports.deprecatedAliases = new Map([
|
|
172
172
|
[
|
173
173
|
'Mapping',
|
174
174
|
{
|
175
|
-
version: pythonVersion_1.
|
175
|
+
version: pythonVersion_1.pythonVersion3_9,
|
176
176
|
fullName: 'typing.Mapping',
|
177
177
|
replacementText: 'collections.abc.Mapping',
|
178
178
|
typingImportOnly: true,
|
@@ -181,7 +181,7 @@ exports.deprecatedAliases = new Map([
|
|
181
181
|
[
|
182
182
|
'MutableMapping',
|
183
183
|
{
|
184
|
-
version: pythonVersion_1.
|
184
|
+
version: pythonVersion_1.pythonVersion3_9,
|
185
185
|
fullName: 'typing.MutableMapping',
|
186
186
|
replacementText: 'collections.abc.MutableMapping',
|
187
187
|
typingImportOnly: true,
|
@@ -190,7 +190,7 @@ exports.deprecatedAliases = new Map([
|
|
190
190
|
[
|
191
191
|
'Sequence',
|
192
192
|
{
|
193
|
-
version: pythonVersion_1.
|
193
|
+
version: pythonVersion_1.pythonVersion3_9,
|
194
194
|
fullName: 'typing.Sequence',
|
195
195
|
replacementText: 'collections.abc.Sequence',
|
196
196
|
typingImportOnly: true,
|
@@ -199,7 +199,7 @@ exports.deprecatedAliases = new Map([
|
|
199
199
|
[
|
200
200
|
'MutableSequence',
|
201
201
|
{
|
202
|
-
version: pythonVersion_1.
|
202
|
+
version: pythonVersion_1.pythonVersion3_9,
|
203
203
|
fullName: 'typing.MutableSequence',
|
204
204
|
replacementText: 'collections.abc.MutableSequence',
|
205
205
|
typingImportOnly: true,
|
@@ -208,7 +208,7 @@ exports.deprecatedAliases = new Map([
|
|
208
208
|
[
|
209
209
|
'ByteString',
|
210
210
|
{
|
211
|
-
version: pythonVersion_1.
|
211
|
+
version: pythonVersion_1.pythonVersion3_9,
|
212
212
|
fullName: 'typing.ByteString',
|
213
213
|
replacementText: 'collections.abc.ByteString',
|
214
214
|
typingImportOnly: true,
|
@@ -217,7 +217,7 @@ exports.deprecatedAliases = new Map([
|
|
217
217
|
[
|
218
218
|
'MappingView',
|
219
219
|
{
|
220
|
-
version: pythonVersion_1.
|
220
|
+
version: pythonVersion_1.pythonVersion3_9,
|
221
221
|
fullName: 'typing.MappingView',
|
222
222
|
replacementText: 'collections.abc.MappingView',
|
223
223
|
typingImportOnly: true,
|
@@ -226,7 +226,7 @@ exports.deprecatedAliases = new Map([
|
|
226
226
|
[
|
227
227
|
'KeysView',
|
228
228
|
{
|
229
|
-
version: pythonVersion_1.
|
229
|
+
version: pythonVersion_1.pythonVersion3_9,
|
230
230
|
fullName: 'typing.KeysView',
|
231
231
|
replacementText: 'collections.abc.KeysView',
|
232
232
|
typingImportOnly: true,
|
@@ -235,7 +235,7 @@ exports.deprecatedAliases = new Map([
|
|
235
235
|
[
|
236
236
|
'ItemsView',
|
237
237
|
{
|
238
|
-
version: pythonVersion_1.
|
238
|
+
version: pythonVersion_1.pythonVersion3_9,
|
239
239
|
fullName: 'typing.ItemsView',
|
240
240
|
replacementText: 'collections.abc.ItemsView',
|
241
241
|
typingImportOnly: true,
|
@@ -244,7 +244,7 @@ exports.deprecatedAliases = new Map([
|
|
244
244
|
[
|
245
245
|
'ValuesView',
|
246
246
|
{
|
247
|
-
version: pythonVersion_1.
|
247
|
+
version: pythonVersion_1.pythonVersion3_9,
|
248
248
|
fullName: 'typing.ValuesView',
|
249
249
|
replacementText: 'collections.abc.ValuesView',
|
250
250
|
typingImportOnly: true,
|
@@ -253,7 +253,7 @@ exports.deprecatedAliases = new Map([
|
|
253
253
|
[
|
254
254
|
'ContextManager',
|
255
255
|
{
|
256
|
-
version: pythonVersion_1.
|
256
|
+
version: pythonVersion_1.pythonVersion3_9,
|
257
257
|
fullName: 'contextlib.AbstractContextManager',
|
258
258
|
replacementText: 'contextlib.AbstractContextManager',
|
259
259
|
typingImportOnly: true,
|
@@ -262,7 +262,7 @@ exports.deprecatedAliases = new Map([
|
|
262
262
|
[
|
263
263
|
'AsyncContextManager',
|
264
264
|
{
|
265
|
-
version: pythonVersion_1.
|
265
|
+
version: pythonVersion_1.pythonVersion3_9,
|
266
266
|
fullName: 'contextlib.AbstractAsyncContextManager',
|
267
267
|
replacementText: 'contextlib.AbstractAsyncContextManager',
|
268
268
|
typingImportOnly: true,
|
@@ -271,7 +271,7 @@ exports.deprecatedAliases = new Map([
|
|
271
271
|
[
|
272
272
|
'Pattern',
|
273
273
|
{
|
274
|
-
version: pythonVersion_1.
|
274
|
+
version: pythonVersion_1.pythonVersion3_9,
|
275
275
|
fullName: 're.Pattern',
|
276
276
|
replacementText: 're.Pattern',
|
277
277
|
typingImportOnly: true,
|
@@ -280,7 +280,7 @@ exports.deprecatedAliases = new Map([
|
|
280
280
|
[
|
281
281
|
'Match',
|
282
282
|
{
|
283
|
-
version: pythonVersion_1.
|
283
|
+
version: pythonVersion_1.pythonVersion3_9,
|
284
284
|
fullName: 're.Match',
|
285
285
|
replacementText: 're.Match',
|
286
286
|
typingImportOnly: true,
|
@@ -288,12 +288,12 @@ exports.deprecatedAliases = new Map([
|
|
288
288
|
],
|
289
289
|
]);
|
290
290
|
exports.deprecatedSpecialForms = new Map([
|
291
|
-
['Optional', { version: pythonVersion_1.
|
292
|
-
['Union', { version: pythonVersion_1.
|
291
|
+
['Optional', { version: pythonVersion_1.pythonVersion3_10, fullName: 'typing.Optional', replacementText: '| None' }],
|
292
|
+
['Union', { version: pythonVersion_1.pythonVersion3_10, fullName: 'typing.Union', replacementText: '|' }],
|
293
293
|
[
|
294
294
|
'Callable',
|
295
295
|
{
|
296
|
-
version: pythonVersion_1.
|
296
|
+
version: pythonVersion_1.pythonVersion3_9,
|
297
297
|
fullName: 'typing.Callable',
|
298
298
|
replacementText: 'collections.abc.Callable',
|
299
299
|
typingImportOnly: true,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deprecatedSymbols.js","sourceRoot":"","sources":["../../../../../src/analyzer/deprecatedSymbols.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,
|
1
|
+
{"version":3,"file":"deprecatedSymbols.js","sourceRoot":"","sources":["../../../../../src/analyzer/deprecatedSymbols.ts"],"names":[],"mappings":"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"}
|
@@ -347,7 +347,7 @@ class ImportResolver {
|
|
347
347
|
}
|
348
348
|
this._cachedTypeshedStdLibModuleVersionInfo.forEach((versionInfo, moduleName) => {
|
349
349
|
let shouldExcludeModule = false;
|
350
|
-
if (versionInfo.max !== undefined && pythonVersion
|
350
|
+
if (versionInfo.max !== undefined && pythonVersion.isGreaterThan(versionInfo.max)) {
|
351
351
|
shouldExcludeModule = true;
|
352
352
|
}
|
353
353
|
if (pythonPlatform !== undefined) {
|
@@ -1438,10 +1438,10 @@ class ImportResolver {
|
|
1438
1438
|
const namePartsToConsider = moduleDescriptor.nameParts.slice(0, namePartCount);
|
1439
1439
|
const versionInfo = this._cachedTypeshedStdLibModuleVersionInfo.get(namePartsToConsider.join('.'));
|
1440
1440
|
if (versionInfo) {
|
1441
|
-
if (pythonVersion
|
1441
|
+
if (pythonVersion.isLessThan(versionInfo.min)) {
|
1442
1442
|
return false;
|
1443
1443
|
}
|
1444
|
-
if (versionInfo.max !== undefined && pythonVersion
|
1444
|
+
if (versionInfo.max !== undefined && pythonVersion.isGreaterThan(versionInfo.max)) {
|
1445
1445
|
return false;
|
1446
1446
|
}
|
1447
1447
|
if (pythonPlatform !== undefined) {
|
@@ -1494,13 +1494,13 @@ class ImportResolver {
|
|
1494
1494
|
// If the version ends in "+", strip it off.
|
1495
1495
|
minVersionString = minVersionString.substr(0, minVersionString.length - 1);
|
1496
1496
|
}
|
1497
|
-
let minVersion =
|
1497
|
+
let minVersion = pythonVersion_1.PythonVersion.fromString(minVersionString);
|
1498
1498
|
if (!minVersion) {
|
1499
|
-
minVersion = pythonVersion_1.
|
1499
|
+
minVersion = pythonVersion_1.pythonVersion3_0;
|
1500
1500
|
}
|
1501
1501
|
let maxVersion;
|
1502
1502
|
if (versionSplit.length > 1) {
|
1503
|
-
maxVersion =
|
1503
|
+
maxVersion = pythonVersion_1.PythonVersion.fromString(versionSplit[1].trim());
|
1504
1504
|
}
|
1505
1505
|
// A semicolon can be followed by a semicolon-delimited list of other
|
1506
1506
|
// exclusions. The "platform" exclusion is a comma delimited list platforms
|