Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/bin/fsnotifier and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/bin/fsnotifier differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/bin/fsnotifier64 and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/bin/fsnotifier64 differ diff -Nru pycharm-2020.2.5/bin/ltedit.sh pycharm-2020.3/bin/ltedit.sh --- pycharm-2020.2.5/bin/ltedit.sh 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/bin/ltedit.sh 2020-12-01 23:28:12.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +# ------------------------------------------------------ +# PyCharm LightEdit mode script. +# ------------------------------------------------------ + +IDE_BIN_HOME="$(dirname "$(realpath "$0")")" +exec "$IDE_BIN_HOME/pycharm.sh" -e "$@" diff -Nru pycharm-2020.2.5/bin/pycharm64.vmoptions pycharm-2020.3/bin/pycharm64.vmoptions --- pycharm-2020.2.5/bin/pycharm64.vmoptions 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/bin/pycharm64.vmoptions 2020-12-01 23:28:12.000000000 +0000 @@ -1,17 +1,15 @@ -Xms128m -Xmx750m --XX:ReservedCodeCacheSize=240m +-XX:ReservedCodeCacheSize=512m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 --ea -XX:CICompilerCount=2 --Dsun.io.useCanonPrefixCache=false --Djdk.http.auth.tunneling.disabledSchemes="" -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow +-ea +-Dsun.io.useCanonCaches=false +-Djdk.http.auth.tunneling.disabledSchemes="" -Djdk.attach.allowAttachSelf=true --Dkotlinx.coroutines.debug=off -Djdk.module.illegalAccess.silent=true --Dawt.useSystemAAFontSettings=lcd --Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine +-Dkotlinx.coroutines.debug=off -Dsun.tools.attach.tmp.only=true diff -Nru pycharm-2020.2.5/bin/pycharm.sh pycharm-2020.3/bin/pycharm.sh --- pycharm-2020.2.5/bin/pycharm.sh 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/bin/pycharm.sh 2020-12-01 23:28:12.000000000 +0000 @@ -1,5 +1,6 @@ #!/bin/sh # Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + # --------------------------------------------------------------------- # PyCharm startup script. # --------------------------------------------------------------------- @@ -56,7 +57,7 @@ cd "${OLDPWD}" || exit 2 PRODUCT_VENDOR="JetBrains" -PATHS_SELECTOR="PyCharmCE2020.2" +PATHS_SELECTOR="PyCharmCE2020.3" # --------------------------------------------------------------------- # Locate a JDK installation directory command -v will be used to run the IDE. @@ -203,7 +204,6 @@ CLASSPATH="$CLASSPATH:$IDE_HOME/lib/util.jar" CLASSPATH="$CLASSPATH:$IDE_HOME/lib/jdom.jar" CLASSPATH="$CLASSPATH:$IDE_HOME/lib/log4j.jar" -CLASSPATH="$CLASSPATH:$IDE_HOME/lib/trove4j.jar" CLASSPATH="$CLASSPATH:$IDE_HOME/lib/jna.jar" # shellcheck disable=SC2154 if [ -n "$PYCHARM_CLASSPATH" ]; then @@ -218,10 +218,10 @@ "$JAVA_BIN" \ -classpath "$CLASSPATH" \ ${VM_OPTIONS} \ - "-XX:ErrorFile=$HOME/java_error_in_PYCHARM_%p.log" \ - "-XX:HeapDumpPath=$HOME/java_error_in_PYCHARM.hprof" \ - -Didea.vendor.name=${PRODUCT_VENDOR} \ - -Didea.paths.selector=${PATHS_SELECTOR} \ + "-XX:ErrorFile=$HOME/java_error_in_pycharm_%p.log" \ + "-XX:HeapDumpPath=$HOME/java_error_in_pycharm_.hprof" \ + "-Didea.vendor.name=${PRODUCT_VENDOR}" \ + "-Didea.paths.selector=${PATHS_SELECTOR}" \ "-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \ ${IDE_PROPERTIES_PROPERTY} \ -Didea.platform.prefix=PyCharmCore \ diff -Nru pycharm-2020.2.5/bin/pycharm.vmoptions pycharm-2020.3/bin/pycharm.vmoptions --- pycharm-2020.2.5/bin/pycharm.vmoptions 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/bin/pycharm.vmoptions 2020-12-01 23:28:12.000000000 +0000 @@ -1,18 +1,16 @@ -server -Xms128m -Xmx512m --XX:ReservedCodeCacheSize=240m +-XX:ReservedCodeCacheSize=384m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 --ea -XX:CICompilerCount=2 --Dsun.io.useCanonPrefixCache=false --Djdk.http.auth.tunneling.disabledSchemes="" -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow +-ea +-Dsun.io.useCanonCaches=false +-Djdk.http.auth.tunneling.disabledSchemes="" -Djdk.attach.allowAttachSelf=true --Dkotlinx.coroutines.debug=off -Djdk.module.illegalAccess.silent=true --Dawt.useSystemAAFontSettings=lcd --Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine +-Dkotlinx.coroutines.debug=off -Dsun.tools.attach.tmp.only=true diff -Nru pycharm-2020.2.5/build.txt pycharm-2020.3/build.txt --- pycharm-2020.2.5/build.txt 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/build.txt 2020-12-01 23:28:12.000000000 +0000 @@ -1 +1 @@ -PC-202.8194.22 \ No newline at end of file +PC-203.5981.165 \ No newline at end of file diff -Nru pycharm-2020.2.5/debian/changelog pycharm-2020.3/debian/changelog --- pycharm-2020.2.5/debian/changelog 2020-12-02 10:18:47.000000000 +0000 +++ pycharm-2020.3/debian/changelog 2020-12-20 13:55:00.000000000 +0000 @@ -1,20 +1,20 @@ -pycharm (2020.2.5-1~bionic) bionic; urgency=medium +pycharm (2020.3-1~bionic) bionic; urgency=medium * New upstream version - -- Viktor Krivak Wed, 02 Dec 2020 10:18:47 -0000 + -- Viktor Krivak Sun, 20 Dec 2020 13:55:00 -0000 -pycharm (2020.2.5-1~focal) focal; urgency=medium +pycharm (2020.3-1~focal) focal; urgency=medium * New upstream version - -- Viktor Krivak Wed, 02 Dec 2020 10:18:18 -0000 + -- Viktor Krivak Sun, 20 Dec 2020 13:54:22 -0000 -pycharm (2020.2.5-1~groovy) groovy; urgency=medium +pycharm (2020.3-1~groovy) groovy; urgency=medium * New upstream version - -- Viktor Krivak Wed, 02 Dec 2020 10:17:38 -0000 + -- Viktor Krivak Sun, 20 Dec 2020 13:53:35 -0000 pycharm (5.0.3-1~getdeb1) trusty; urgency=medium Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/icons.db and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/icons.db differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input_i and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input_i differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input.keystream and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input.keystream differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input.keystream.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input.keystream.len differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input.len differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input.values and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input.values differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/id-index.input.values.at and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/id-index.input.values.at differ diff -Nru pycharm-2020.2.5/index/Python/id-index.input.values.s pycharm-2020.3/index/Python/id-index.input.values.s --- pycharm-2020.2.5/index/Python/id-index.input.values.s 2020-12-01 13:53:40.000000000 +0000 +++ pycharm-2020.3/index/Python/id-index.input.values.s 2020-12-01 23:28:12.000000000 +0000 @@ -1 +1 @@ -ޑלȡǙǑӣבݼ¸ϫгҹ̹Թſպɽĩډְܡ̿ٳ޷Τڟծޑİľʛ́ڻʹƺدͤݠ׵׳ýڹԻưֵզګ̮«ӫԂ̥ľѸ߱ߣͿгѲçݹϷݿÿ»Х۶ä٩ë˯ݬЯӇDžәҜݽ޿۷¼±ɠ°˿ӺϹ׳ۣΗنܱо޾ڠýʹثϵءĩƮߥܣ™˻ڸھԮɡݣſƳà͵͹ʽεȡ̰δƾ˥Ġظ޺֥߼ëɚÆοشږѲ׺ָܿţ¥ҲӾؽ˩ݷʚֳآߞɭɰƫʔԽѧѺڙ׳Ƨ˷ǭƼˍ؋ҳҽòκŨɱ٭РɴʼՑ۵ԣˮӦӳ۽؅ԾҶ̦ܿݲכǶܵƽְɬ¤ժںҲأؾſϾ޼ȸ±ڷ®ߍո՚Ċھ˟ճѽֻ׻ĠûϺ٧¥æܲƩد̐ͮԸ˲Ĩ֮کԿܽʳؾ¿߸֒Ӱɼݽΰ߯իͪæٽή׵սҩĨӱܫǭԾ̞ɋЧйݺݮģκξǵѽͰɨǪ»ʯذϮώߊŎќǯαխϽҤբմ̰˖ \ No newline at end of file +סޏƑ׏ݖҖڽܨջռϴļܝιߡˡ̷ܓݱݤش԰جݲݛƥ³͸ȫҰÜ˸βƸ֜èݳҺϱdzݻ٥ǛϦ͸θо;θ¶ɸſبޟ̯˭ȐĴҮ٫ׂ̪޿Ҟݔڙھݽֺؽ٪ڤȼͯԳ֍¿ɱٰ͟ȸƪʦ͜Ϊ̸Ǵƨܨ֊ڼƹְڸݪМʹյƧߩ̛ծԱֳΩڶåְМߔڹݼ›¿ǜӨƮԫ޲֯ٞƽӨܽɽö۱̹נзƤΩ֦ߥ¾޽ٲ̣ζܸǴȚѾΫɨܮ̴Ъեм۶кεݟ˰ڳϴҭŝ°˃èߺǶٮϺɲȓדӈҗݔɃېֳܶѰݺ°޳ݱʡߒׯə۩ۯզ̺ǡĸӿڳҳɼȹ¸٦׬ȇӫşŵ̪ұޱؓž߃ǐ׾ϭí̬ʢۿե׬۬ڶԮϨߵѼִ̹й˨ٗѣݦٴǟϽдѣۻڠ˽ʵӞţ̨۸̴ù̚ҹȲʛƸ­ժԘʹ°ɲ°ǻҾ߯ڸѼܨ֮ТѫӾ˲ٹʲøԲڭѯʲ׷ܝћظٳ֘ߞڌɯݠőԶ÷ݪĝ߹߷ӺǵұȦܰэԳ٧үԸʰӻѪȸмĞóܫױòשʤԼ˾ɾȟɳݷٻʟѻѺä̺ɩѠŵdzŠ֕ǺҬҨ©ްͶΛݛŸƲŵͺˤܣ׶ͰΤڒ޽ι׺ڪʳ՛ĴԲЫլɺ˓ׯɰȸŻӲıȸμʱ޵ôЗώϮܶǽͧйշț̱ű٩ۭ٬ɧǩѺչŮֵ՘ơ̩ث̬̿ϱݻֺǬƩ֝ȣȵХĩҦ٧Ծ̓Ͻڵΰظ \ No newline at end of file Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input_i and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input_i differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input_i.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input_i.len differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input.keystream and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input.keystream differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input.keystream.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input.keystream.len differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input.len differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input.values and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input.values differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.input.values.at and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.input.values.at differ diff -Nru pycharm-2020.2.5/index/Python/sdk-stubs.input.values.s pycharm-2020.3/index/Python/sdk-stubs.input.values.s --- pycharm-2020.2.5/index/Python/sdk-stubs.input.values.s 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/index/Python/sdk-stubs.input.values.s 2020-12-01 23:28:12.000000000 +0000 @@ -1 +1 @@ -ˣҼՂÊуу߈ƆƒзˏϡڣܧܠΠ֟Ƃ̢͑ɫŎҧَ͝Ԉ˩ϮʘƜߊ׈ܓ͡Č֍Ì΂ѐݍϏ׏ЗÊ݊ɓٙځ͈ړІƢԠ̸ֱʔۀ٤ۊߩߏ;3_CŰǯޠ۔š׎ٚʨԚ̜ˤѝěǩګΣƒùڷВ˯ˮی…ȘȥǗΙӢЈףڞƐšܤɞϓטߙޞΈɜƏߞލЋՊӖգ؝ȋđ܇و̒ԗښ͂φ҇ХۻڇҌ‹מȦ͒ȍޒƔËɑɗ„˄̃Ǘћ̭ٗɚՓ˙ːڐը֦ɠĕŵՂؓۥ˔1#f9՘۪ݲکҍǓەڞןȲюԔƮߚ˥ٯǡɷژӗǟѣԀΞ֚ؗĺ̖֣ͪ˴՚ˡ٠ޒܫʨщđ̩։ȈۃʗřӀΊ¼ÊՄ׉ϟќȑɠҐفӕǀ܌ԊցՇщٛҖ͜ߪնܗے̱å٦ߓńטŸ֍הƦĆ֘Ƣ݃ɊؒՃ^g5ޏЏȍֳΟӜޝלŕŲխ˔҈ؽǀГȜʰ܂ȕ͖Ӌ։ϻČÙʇӍޕّ֙މߝܙ̍ϝĒޙɖяċ›ёσڇÅˏޔΐɓҀǖĥőȪˬښъʏеڨڧͭÖןنӆܖÞϢϠם#;[/سɨ͕ӥȚ܉ȢÅ͎įιҬ΋˥ʉ֊О˒ǢخݚΕրߋѪ݀ğؖљƇאڃГڋْ՘ʐޒҖƓ۔đ֕ӕדˇ܆ɭ͂ҔاȏǭΨˌːβԧæΡשщάĢрÅΨؓ̚ɇƫېʄĨIGSܕݰǖ̧ׅҾڡéŒΕޣزץÚИâҘـØźזӴۚ؞ӓÎӮ˨ϣЛŭ̡֫׏֜ېבڑ۩ޮԍ؛׮Ơǝ֞۠۔ƮĄݍ҆ӌКۣǞ—ڠז̟ԥ؋ɍ͆~ۜÉ’͑ŷ֑̓هǏĂљ܊Мلƕ܃݌ЌŒތnjіјΡޡؘكѱأչÜ̒ѡȳӥݫã٦ؓݠЉДɕʕیղϧŘ׌‰a5Н˱ܨȴۈݪ͑͊—ģ̠ij֡Ý£̐Ӝ۱ԪܗȕūƝީ͋֞לإӎֈ٪œ֡ܢݝãۧԍέɈ‹͑۰ŕŃşԩ˕ǛȇсσԙʓϹġÂ̎Ё‰؆˄ŊÓۦŹݰЭХʝԹӒ͔҄ԜۥߖȒއړ/3^@ŨίȩʺƗӣțՒަ̃ߴފרŽ֐Ϊք̚Κ؇݇ӅŐԗ‹֒տʈȝĖ˓ҋǃڋ̅׉˸ޱ΍ŘɧڜβخҏЄԖğռ֓ۄЙ,8b5ٙΥ߮ǜ̵ϒۭؑĢءڧҗۡОحڰЪԓրՔߜՕņʒѧڇɁՉؘݏ̝ۆҔʡΏڊĪޗÙь֙АׁϘކٖɑՋ؇ѨƜÂГקݓ͔ԟבٹ׉ͥѣݩ˕ȯمލŬϤΞܧ݈ЅۗɧŒԁKa5؊ѦݟÜ֒֗։áѥŲèڜƤӉߍӞȠš߂̐ǖٴׅȄƒǘߑژܔĥԒր۔ɎӝݗÙ́֋؏ϔ׍ԋَ؉ʀԠ݄ҖНʙٚǓē̵ТȷܪұΩܘă˧æۤؐ߶ۃހږԍ݉əə٠Ɍխͧa1ߪƶ͇իėȑۈбߟؙۘѬږǵŋŢ՞ʛۜфѓׇê߂ũΓØɳȌيԗڌߙĝ÷Эܣۢ͜ҝӋڃӞƘڤĸ˜̞ӟ¯ďڙ֪И֍ۭ٣ߍɲժ҃ݱіȃ΄ڑ݈̅ŅӦÆր֋ڊ߅ĊʗԒ؄ߠ֒ϓĔÊȌ؁΂ۇߌ̔Dž߃ϐˆџݖֱҬܕܓ˚ʳڬ۩̡ڝªُʚإȀϬ̘ؐΘ͡ۈĀǘҟфʆɇٖقNg5בܫȩչӗҨבݝ֘ѢơʝƦҊɐޖ–ɒ֟ǖֈ߭қDŽ׊܍ÆÀВ͂֕˯В֏̐ӊՏƐɔƎDž͐ЍʙߔʈƄǡ܇˖ȒߖԋӜݱŗОȣğ֠֋Ǧدӓړ̡ǿأ̀̀׃ڣ͕<f5ߪɨԾԲӘ̐טȠδӟĤۜÝܗə˙ߘգ̈Šȡ͞Ûىŀ֕ȌϦФçթ̜ĕȌޗ͛ȈяԪDžǡӲܞˆɏϦތƗȒьǁȆΈקˌȅŖψőڔ͎ڏ˅υَ͚؍Еއבϙ݇؉ɆɌӦˏҖ˚â̚ȳŴ٬޸ޕȪ͒ѤםȧΞ̴׬ɖۅЀߖӿ˦ٍɎŋg5Ӧ̓ʋĘ•æۡ؟ӗߜϛ̫ߓҤèʤ̕ţԷģϘ̌ѓ́ϜћާڛŚИوÙôޖߠ߉͙ߙ̇ŎԤܻЈȈΏޖ¬Lj֒܈ĕɕ̌ȎКӅŎ΄׆Äݝ؈וǖӷǪٕͪܖܳѦނ˥ۣא•ljԞːƎߜҢܣáуŜʣѕ:f5ΗЪ٧װ܃؇ɒߕקϡ̡΢ƜբݡۥڛқԖְŝաϰбєŇۆݐՁʙش߆՜ݠíյٞǢ֓ښĪȣւʩՓ݋dzދ݆֎ƷȂ߈ǖӑޟɄԤۍŊšƋߙІڕΧɎм֟ÞƣؐڴÐݕפ޻ϏʁݐY(h;ФΤߥNJ͊оǥŦȡӞ˜ߤƎͥޢݮťԥՖݘʯۆƦМʂ٩ծѫϬͣךϠэ՗ߎчٔ͌ǃ̩ߤʲٚѧljЎѪҤЎݠžԍ݆ׄ֟ԓۏԇÊʏÆŔȕԌ͎ь̊ʗщŜΎˉʅɚԖ̜͟Ԯݖԉ֏Ӳ͙ԃڵʒõӄćΒޖŃԋܵ؞͗ȉa/Ύɜ¬ԤͥƱʦȔ؍äԓ̭ \ No newline at end of file +պĂħޛŦ˛ۃɀɘщۣۇאƍҩ҅ֆɴԛލՉdžēȶޕш߃ƂΎˌւ݌ŖٖʠɈٯԍ͎ʙقۓ„֑ŊԜӊ҈ӒيӜԚ۞ӟٝƭʱۭ֛̑ɞܘѪǃϚԸϡǭĈاȡª͕ȤË~a5Ӎʝūީޕèܚ©ԑˤÙʲɚ؞חѩ˿ޓ̱ȫ֥ӇԐčޮ҆թȊ܅ɆڴЛύމȆ۠ԈЎ߂ЋՌ͖זàد߄ʗ͍ݏȎ™„ڕΑŊۜ؊ֈŒъӜÞ؀ɚԟםǭ۪αϧΛˑʐϞژϬЪăˢ͚ˡݭ̈ТاÁ۳ҕФߨÍƋ~a5Ѝ֝ɫɩԨϚש֑ˉқ֤ڤԙȲʚۗœɓΧرŭ߫Ӥ֎ϝߛܡʥ׍ժƳۓӧű͜ˡӞŇǖϫɛӐݭġӗԨÒɎȘމ޴ɱÚȸ֭ӗӢ׊ژ٤ćϯ΄Ӥ۩ە´öݓƍ͔äǚݚڏŒфݶԆͮәщŒܖӃ؄ÈքŋӔՄ׀ōƨڒݜ҂ٰƓؤɊσΖ؎܎l;ܫجԉ׉ޢܚƩ̯ݧҧ՚ڡ۴ݦʀʂ̚Ň׌ݮˑȑӘђۉۉŁԖ݈ˌاNJȏ—̖ϗЌÐҚŊуԐ߃ٕ˓͆݋Նˁڨˉ޶ΜԅҒǑѷիǠܓĴŒƔǐۊ¤Ҟ֞֕?Kaߏӣߟ͚ņأۛڥӤИחե٥ژɘ̉ѯݢΠОǢƤќƂ֕őܡΉޢØϗ΋חƈڝז΍ԐٶžҘ˅ŽĚصזڢСҜƼ֖٪ܦŒ޳̀םܢќٲǮߘȜͪӪŚ܀דӌʄفߔԞ՗ɇ׏܂ܚˌϋț̪ȬߩŜéҮܠ؛܆Ϗٗl;зƫڦثԵٚÌçǝ˥ȘΥħΚڿΦ̈́ӂɟխˈÈęЛޡܮЀށʍКϦ܅Ϫ֕ލ˝ɒ؅„ʕ̂̄׌םԘΤʓȖªދӳܮ֫Вלبµçكؑĕشďכۊá˥ͩۢʢĐנ˂.(g8˘׮ڪҨʒϞϳȣšϞǘ٭Ĥ۝Ɋ±Ŭ֍Յƫ˅؁ɎǯخډօȏɌϫΔɂԌӒćӞʀœċȚˣ܎ߨۧߊŭ͓əׅڄ؈®өŔՔܕޚ-4Y5ߏĝժđҟ¦ÛϜˣϐاƊϒЏҪ²ϭݗΦǖŨמ٨Πަ̂ǍԢѝ؜זñŚǏӋۋСʨѠջߤϢӄ֙ÒۀӚߝߤޡԚГÔʠҊܳşƑ̢ٓόǠҍՂԇ؆չř̔Ё̌ń։Јޗً҅ӏ׈Ǝы̫؄ƙـʅܑ؅ӋЕӐڇώԛˍ̙ի¡ŗ֕ٳĴÃۧݩ˄ڠ֒̌ݘܤمͦǧҎ݀ؔ-(e8ğ˩ݮʼnޟˋޛ͙ۡÔӪˬʐȅۈΗӋĝϡɠܜΝ՚՛ɉт—ͣͣ˥ȁҪͬםҡÉܤձħՊ̐ڛߔ̖҅ҒɑՌ‚ۉɖ̩ܗˇ؃υƁ˖ޱӳĩÚĢ߱ыǟϮџޡ͕Ԓݝi/t֬٦͙ϜũޟߞΜȓŊיފ̊ۘ֍ǂ؈͏ߊLJ˒֠ݍٛК߄Ҟ֤ʋ؇ה݅LJƔܭ̦ۚܡѺڭާޡЁݩɗʑɃХl6ӭئ،ĐϠҩ٥Йާҩۛ̇ڬ̚қХǛ݋תܒߢچˋ܇֛ΘŖҐϏτɉؑۇЎϖхёΨʊӇߏۓś׋Ԏتߙφ͋كІʖڎɍɍ“ʊʎǝߜ߅˨ؕǮѨǟʟ٠ ؖҎޔܣЄءӛ́ݔAJXϒԧ܎Ȣ͠˹ک×ǦǂצÏȕݘͤȩΕƤݬԣգպ֜ܞƃπۖφƔ٦ߚLjŒͶ֍ӈјצϜƋڧ¡Ϡ̜ׄɝȗ΍ܑд݂ډԄۀЅϓǔہ›Ñ̕Đۗšۀ͕ʁݐ܍؛Ă܊‚ʒզވсƛܒȏ˵ҷ׷ӟǔԖӕƐɲ͢עĸ˦ρцב҃ŵ՝ǹ҉ߪݗa1ĒڷӨİӕʂˣѰՖʡݝɥЇڞϏ̥ƔڬɕۊԄ֞ĝɮʤ̖מΞߜÙܯΣϩڞȕĨʖҫɤΗłϦלШ˖֫՟ޙؒ͝Ըٙߑߙֵנˊ݉ŜЈΖ֟ʇҨɓؘŠ݊ԗÃݑԈĉčڍʨΖ׉݀ڒČ֤ѥ߶ŸđمΓƦФޣñ‚Юɡ؅͈ۮڤժیЮg1ěϩݎơϏDžТӸģ˗Ҧɭ߬ՠٜ߫ȥĘӳΧӱ֞ȕɛ՜߮nj˒ơΒȖԈɭǦƇʞЊ۝ȅօǜЛ؋݀ΒÕدށυ͝ޑˑďПΐωɏАߒُǐߖ̛܄ׅ̀׈ˎΘևΠՂԉυÕ֥ӑ̗͞ŵ΢Ч޴ÕƬŸĤŧ͑ζ׋Ó̔Ǫȡ׮ʁͧΕҠ:W?ٓŰ֩ɛى߅Ȧϭӓ٣όũщ˓֥͘ܦ·̀ǝ׊˟џσȑݝĔɊ̖ćڍΒӳӌ҄քބχφǦɎЀݒ׉ӗݓ؁ܒÉߍғƊɏܦܗۑǒΔϣѬ̶ߠȓ܍ǫĶۡѱڴʎ̛ΐƤƏʨۢDLLǓǞ߭ƭ˨؜ٙըǯܸޛͤťΌĜݐښѬ˧ޑȔƩƒЉί̘ӍĄ͓ӄ֎ΊŞݖ߆єފҍӑόѕ͖֊ݗف͍ϥɛ߈ުʆȦԱԬ٬ɐϐةՅ̢ޒֶݤ·ܚަΩٞגەܟ$8_/̫ʋފ֫ŨǙ֠ߗՒԢקͪ׸Пɦ۩ڝ֜ؤ͖ϞۚזӜ̄ޯȧӣҁߏژţԥנԡϞƝ͹עܟƐŝۅ̒чȈɍ՟ՕގɠӆْلÏҞŐ͈֕ȏږ҈ߏفͣ„֙ٞώήڮʠČϑϨˉبаʓžDŽۧʥٝҚ+6\1Œ̬ߑҔݭҰ٦ץ݈ΜۡвЕΠޮʌЛ։чīŢߧ؞ɓǕז¡ݖےفݞڡܢ׶Ʌ؈ݛ׭̬ɑӛśƟֵؑѫְ̈́ȞΜÝƗώٮ݋ČΒèϖȂŃڐˣؙ֖ٗܓщÓӪڈΉƇ۔ Ƌ͍ؖ݋ʈـɕȇċ׉ߊڀĒϧîӡȒʬѩלǝȩȠÎۭŝϗތɏ٧ݒɉƈפޛڎ¦ޚ2YH˘ώϤۜƤ٥՝ΦӲט֖ԇDŽł܇֗ݑӛǂ݁ވ߲Ǖҧߖ˾ǝގޓوť߽ŇʂՌ̀ޝɉˈʞŏ٫χÚϓЎċ̓׀݆؂څݏĨˉ݈܌͜؟ЮѫĄԕԣȢ̘ܸéɠًаêҗ՟νʕѣÚ,1\0֟ʕѤ֋٠ʼΜܔŇÕԒץˡњ۔ͧŇڞՋթ̗͗ۨȭƎ̋ҘяɎ֋˛ʍɮޗřՀӉʬǑœӑ־†۰ȁƔїʗ™وˎԬғ͓̔نܐɏГɌՅחӇثԃޕԦʏѨȦƴڊʑɳӲוçըҝڣ˞΄ۏȨۀ΋ʪݕÌȍ͖g4©ܩۭ֒ހ̏؍Гƈݥȳҡ؛ѧנӬܯۥџΡĶأҠÁыȖҎŝܟ˦͝ݘ«͉֔ƐǕΫҋ٩Όڠܲˑ \ No newline at end of file Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.names and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.names differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.names_i and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.names_i differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.names.keystream and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.names.keystream differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/index/Python/sdk-stubs.names.keystream.len and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/index/Python/sdk-stubs.names.keystream.len differ diff -Nru pycharm-2020.2.5/index/Python/sdk-stubs.version pycharm-2020.3/index/Python/sdk-stubs.version --- pycharm-2020.2.5/index/Python/sdk-stubs.version 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/index/Python/sdk-stubs.version 2020-12-01 23:28:12.000000000 +0000 @@ -1,2 +1,2 @@ 46 -81 \ No newline at end of file +82 \ No newline at end of file diff -Nru pycharm-2020.2.5/Install-Linux-tar.txt pycharm-2020.3/Install-Linux-tar.txt --- pycharm-2020.2.5/Install-Linux-tar.txt 2020-12-01 13:53:41.000000000 +0000 +++ pycharm-2020.3/Install-Linux-tar.txt 2020-12-01 23:28:12.000000000 +0000 @@ -12,7 +12,7 @@ ./pycharm.sh This will initialize various configuration files in the configuration directory: - ~/.config/JetBrains/PyCharmCE2020.2. + ~/.config/JetBrains/PyCharmCE2020.3. 3. [OPTIONAL] Add "{installation home}/bin" to your PATH environment variable so that you can start PyCharm from any directory. @@ -27,11 +27,11 @@ ------------------------------------------------------------------------------ By default, PyCharm stores all your settings in the - ~/.config/JetBrains/PyCharmCE2020.2 directory - and uses ~/.local/share/JetBrains/PyCharmCE2020.2 as a data cache. + ~/.config/JetBrains/PyCharmCE2020.3 directory + and uses ~/.local/share/JetBrains/PyCharmCE2020.3 as a data cache. To change the location of these directories: - 1. Open a console and cd into ~/.config/JetBrains/PyCharmCE2020.2 + 1. Open a console and cd into ~/.config/JetBrains/PyCharmCE2020.3 2. Create a file idea.properties and set the idea.system.path and idea.config.path variables, for example: Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jaotc and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jaotc differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/java and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/java differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/javac and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/javac differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jdb and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jdb differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jfr and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jfr differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jhsdb and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jhsdb differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jjs and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jjs differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/jrunscript and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/jrunscript differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/keytool and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/keytool differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/pack200 and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/pack200 differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/rmid and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/rmid differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/rmiregistry and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/rmiregistry differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/serialver and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/serialver differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/bin/unpack200 and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/bin/unpack200 differ diff -Nru pycharm-2020.2.5/jbr/legal/gluegen.rt/ADDITIONAL_LICENSE_INFO pycharm-2020.3/jbr/legal/gluegen.rt/ADDITIONAL_LICENSE_INFO --- pycharm-2020.2.5/jbr/legal/gluegen.rt/ADDITIONAL_LICENSE_INFO 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/gluegen.rt/ADDITIONAL_LICENSE_INFO 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,37 @@ + ADDITIONAL INFORMATION ABOUT LICENSING + +Certain files distributed by Oracle America, Inc. and/or its affiliates are +subject to the following clarification and special exception to the GPLv2, +based on the GNU Project exception for its Classpath libraries, known as the +GNU Classpath Exception. + +Note that Oracle includes multiple, independent programs in this software +package. Some of those programs are provided under licenses deemed +incompatible with the GPLv2 by the Free Software Foundation and others. +For example, the package includes programs licensed under the Apache +License, Version 2.0 and may include FreeType. Such programs are licensed +to you under their original licenses. + +Oracle facilitates your further distribution of this package by adding the +Classpath Exception to the necessary parts of its GPLv2 code, which permits +you to use that code in combination with other independent modules not +licensed under the GPLv2. However, note that this would not permit you to +commingle code under an incompatible license with Oracle's GPLv2 licensed +code by, for example, cutting and pasting such code into a file also +containing Oracle's GPLv2 licensed code and then distributing the result. + +Additionally, if you were to remove the Classpath Exception from any of the +files to which it applies and distribute the result, you would likely be +required to license some or all of the other code in that distribution under +the GPLv2 as well, and since the GPLv2 is incompatible with the license terms +of some items included in the distribution by Oracle, removing the Classpath +Exception could therefore effectively compromise your ability to further +distribute the package. + +Failing to distribute notices associated with some files may also create +unexpected legal consequences. + +Proceed with caution and we recommend that you obtain the advice of a lawyer +skilled in open source matters before removing the Classpath Exception or +making modifications to this package which may subsequently be redistributed +and/or involve the use of third party software. diff -Nru pycharm-2020.2.5/jbr/legal/gluegen.rt/ASSEMBLY_EXCEPTION pycharm-2020.3/jbr/legal/gluegen.rt/ASSEMBLY_EXCEPTION --- pycharm-2020.2.5/jbr/legal/gluegen.rt/ASSEMBLY_EXCEPTION 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/gluegen.rt/ASSEMBLY_EXCEPTION 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,27 @@ + +OPENJDK ASSEMBLY EXCEPTION + +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License version 2 +only ("GPL2"), with the following clarification and special exception. + + Linking this OpenJDK Code statically or dynamically with other code + is making a combined work based on this library. Thus, the terms + and conditions of GPL2 cover the whole combination. + + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at + http://openjdk.java.net/legal/exception-modules-2007-05-08.html + ("Designated Exception Modules") to produce an executable, + regardless of the license terms of the Designated Exception Modules, + and to copy and distribute the resulting executable under GPL2, + provided that the Designated Exception Modules continue to be + governed by the licenses under which they were offered by Oracle. + +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -Nru pycharm-2020.2.5/jbr/legal/gluegen.rt/LICENSE pycharm-2020.3/jbr/legal/gluegen.rt/LICENSE --- pycharm-2020.2.5/jbr/legal/gluegen.rt/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/gluegen.rt/LICENSE 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,347 @@ +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. diff -Nru pycharm-2020.2.5/jbr/legal/jogl.all/ADDITIONAL_LICENSE_INFO pycharm-2020.3/jbr/legal/jogl.all/ADDITIONAL_LICENSE_INFO --- pycharm-2020.2.5/jbr/legal/jogl.all/ADDITIONAL_LICENSE_INFO 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/jogl.all/ADDITIONAL_LICENSE_INFO 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,37 @@ + ADDITIONAL INFORMATION ABOUT LICENSING + +Certain files distributed by Oracle America, Inc. and/or its affiliates are +subject to the following clarification and special exception to the GPLv2, +based on the GNU Project exception for its Classpath libraries, known as the +GNU Classpath Exception. + +Note that Oracle includes multiple, independent programs in this software +package. Some of those programs are provided under licenses deemed +incompatible with the GPLv2 by the Free Software Foundation and others. +For example, the package includes programs licensed under the Apache +License, Version 2.0 and may include FreeType. Such programs are licensed +to you under their original licenses. + +Oracle facilitates your further distribution of this package by adding the +Classpath Exception to the necessary parts of its GPLv2 code, which permits +you to use that code in combination with other independent modules not +licensed under the GPLv2. However, note that this would not permit you to +commingle code under an incompatible license with Oracle's GPLv2 licensed +code by, for example, cutting and pasting such code into a file also +containing Oracle's GPLv2 licensed code and then distributing the result. + +Additionally, if you were to remove the Classpath Exception from any of the +files to which it applies and distribute the result, you would likely be +required to license some or all of the other code in that distribution under +the GPLv2 as well, and since the GPLv2 is incompatible with the license terms +of some items included in the distribution by Oracle, removing the Classpath +Exception could therefore effectively compromise your ability to further +distribute the package. + +Failing to distribute notices associated with some files may also create +unexpected legal consequences. + +Proceed with caution and we recommend that you obtain the advice of a lawyer +skilled in open source matters before removing the Classpath Exception or +making modifications to this package which may subsequently be redistributed +and/or involve the use of third party software. diff -Nru pycharm-2020.2.5/jbr/legal/jogl.all/ASSEMBLY_EXCEPTION pycharm-2020.3/jbr/legal/jogl.all/ASSEMBLY_EXCEPTION --- pycharm-2020.2.5/jbr/legal/jogl.all/ASSEMBLY_EXCEPTION 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/jogl.all/ASSEMBLY_EXCEPTION 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,27 @@ + +OPENJDK ASSEMBLY EXCEPTION + +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License version 2 +only ("GPL2"), with the following clarification and special exception. + + Linking this OpenJDK Code statically or dynamically with other code + is making a combined work based on this library. Thus, the terms + and conditions of GPL2 cover the whole combination. + + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at + http://openjdk.java.net/legal/exception-modules-2007-05-08.html + ("Designated Exception Modules") to produce an executable, + regardless of the license terms of the Designated Exception Modules, + and to copy and distribute the resulting executable under GPL2, + provided that the Designated Exception Modules continue to be + governed by the licenses under which they were offered by Oracle. + +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -Nru pycharm-2020.2.5/jbr/legal/jogl.all/LICENSE pycharm-2020.3/jbr/legal/jogl.all/LICENSE --- pycharm-2020.2.5/jbr/legal/jogl.all/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/jbr/legal/jogl.all/LICENSE 2020-11-21 20:13:00.000000000 +0000 @@ -0,0 +1,347 @@ +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/cef_100_percent.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/cef_100_percent.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/cef_200_percent.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/cef_200_percent.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/cef_extensions.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/cef_extensions.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/cef.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/cef.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/chrome-sandbox and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/chrome-sandbox differ diff -Nru pycharm-2020.2.5/jbr/lib/classlist pycharm-2020.3/jbr/lib/classlist --- pycharm-2020.2.5/jbr/lib/classlist 2020-11-21 18:14:07.000000000 +0000 +++ pycharm-2020.3/jbr/lib/classlist 2020-11-21 20:13:00.000000000 +0000 @@ -158,11 +158,11 @@ java/lang/ref/Finalizer$FinalizerThread java/lang/StringLatin1 java/nio/charset/Charset +jdk/internal/misc/VM sun/nio/cs/StandardCharsets java/nio/charset/spi/CharsetProvider java/lang/ThreadLocal java/util/concurrent/atomic/AtomicInteger -jdk/internal/misc/VM java/util/Arrays java/lang/Math sun/nio/cs/StandardCharsets$Aliases Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/ct.sym and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/ct.sym differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/devtools_resources.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/devtools_resources.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/FiraCode-Bold.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/FiraCode-Bold.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/FiraCode-Light.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/FiraCode-Light.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/FiraCode-Medium.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/FiraCode-Medium.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/FiraCode-Regular.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/FiraCode-Regular.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/FiraCode-Retina.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/FiraCode-Retina.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/JetBrainsMono-Bold-Italic.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/JetBrainsMono-Bold-Italic.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/JetBrainsMono-Bold.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/JetBrainsMono-Bold.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/JetBrainsMono-Italic.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/JetBrainsMono-Italic.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/fonts/JetBrainsMono-Regular.ttf and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/fonts/JetBrainsMono-Regular.ttf differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/icudtl.dat and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/icudtl.dat differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/jcef_helper and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/jcef_helper differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/jexec and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/jexec differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/jli/libjli.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/jli/libjli.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/jrt-fs.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/jrt-fs.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/jspawnhelper and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/jspawnhelper differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libattach.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libattach.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libawt_headless.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libawt_headless.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libawt.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libawt.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libawt_xawt.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libawt_xawt.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libcef.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libcef.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libdt_socket.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libdt_socket.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libEGL.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libEGL.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libextnet.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libextnet.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libfontmanager.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libfontmanager.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libGLESv2.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libGLESv2.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libgluegen_rt.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libgluegen_rt.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libinstrument.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libinstrument.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libj2gss.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libj2gss.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libj2pcsc.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libj2pcsc.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libj2pkcs11.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libj2pkcs11.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjaas.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjaas.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjavajpeg.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjavajpeg.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjava.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjava.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjawt.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjawt.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjcef.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjcef.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjdwp.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjdwp.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjimage.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjimage.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjogl_desktop.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjogl_desktop.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjogl_mobile.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjogl_mobile.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjsig.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjsig.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libjsound.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libjsound.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/liblcms.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/liblcms.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libmanagement_agent.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libmanagement_agent.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libmanagement_ext.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libmanagement_ext.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libmanagement.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libmanagement.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libmlib_image.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libmlib_image.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnativewindow_awt.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnativewindow_awt.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnativewindow_drm.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnativewindow_drm.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnativewindow_x11.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnativewindow_x11.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnet.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnet.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnewt_drm.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnewt_drm.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnewt_head.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnewt_head.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libnio.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libnio.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libprefs.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libprefs.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/librmi.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/librmi.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libsaproc.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libsaproc.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libsctp.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libsctp.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libsplashscreen.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libsplashscreen.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libsunec.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libsunec.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libunpack.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libunpack.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libverify.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libverify.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/libzip.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/libzip.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/am.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/am.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ar.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ar.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/bg.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/bg.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/bn.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/bn.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ca.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ca.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/cs.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/cs.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/da.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/da.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/de.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/de.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/el.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/el.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/en-GB.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/en-GB.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/en-US.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/en-US.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/es-419.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/es-419.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/es.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/es.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/et.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/et.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/fa.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/fa.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/fil.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/fil.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/fi.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/fi.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/fr.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/fr.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/gu.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/gu.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/he.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/he.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/hi.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/hi.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/hr.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/hr.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/hu.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/hu.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/id.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/id.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/it.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/it.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ja.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ja.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/kn.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/kn.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ko.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ko.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/lt.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/lt.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/lv.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/lv.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ml.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ml.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/mr.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/mr.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ms.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ms.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/nb.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/nb.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/nl.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/nl.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/pl.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/pl.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/pt-BR.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/pt-BR.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/pt-PT.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/pt-PT.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ro.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ro.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ru.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ru.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/sk.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/sk.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/sl.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/sl.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/sr.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/sr.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/sv.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/sv.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/sw.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/sw.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/ta.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/ta.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/te.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/te.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/th.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/th.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/tr.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/tr.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/uk.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/uk.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/vi.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/vi.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/zh-CN.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/zh-CN.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/locales/zh-TW.pak and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/locales/zh-TW.pak differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/modules and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/modules differ diff -Nru pycharm-2020.2.5/jbr/lib/security/default.policy pycharm-2020.3/jbr/lib/security/default.policy --- pycharm-2020.2.5/jbr/lib/security/default.policy 2020-11-21 18:14:07.000000000 +0000 +++ pycharm-2020.3/jbr/lib/security/default.policy 2020-11-21 20:13:00.000000000 +0000 @@ -215,31 +215,3 @@ permission java.lang.RuntimePermission "accessClassInPackage.com.sun.java.swing.plaf.*"; permission java.lang.RuntimePermission "accessClassInPackage.com.apple.*"; }; -grant codeBase "jrt:/javafx.base" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.controls" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.fxml" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.graphics" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.media" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.swing" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/javafx.web" { - permission java.security.AllPermission; -}; - Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/server/libjsig.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/server/libjsig.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/server/libjvm.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/server/libjvm.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/snapshot_blob.bin and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/snapshot_blob.bin differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/swiftshader/libEGL.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/swiftshader/libEGL.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/swiftshader/libGLESv2.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/swiftshader/libGLESv2.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/jbr/lib/v8_context_snapshot.bin and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/jbr/lib/v8_context_snapshot.bin differ diff -Nru pycharm-2020.2.5/jbr/release pycharm-2020.3/jbr/release --- pycharm-2020.2.5/jbr/release 2020-11-21 18:14:07.000000000 +0000 +++ pycharm-2020.3/jbr/release 2020-11-21 20:13:00.000000000 +0000 @@ -1,7 +1,7 @@ JAVA_VERSION="11.0.9" -MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jcef jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.hotspot.agent jdk.httpserver jdk.internal.ed jdk.internal.le jdk.internal.vm.compiler.management jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jsobject jdk.localedata jdk.management.agent jdk.management.jfr jdk.naming.dns jdk.naming.rmi jdk.net jdk.pack jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.xml.dom jdk.zipfs" +MODULES="java.base java.datatransfer java.xml java.prefs java.desktop gluegen.rt java.compiler java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jogl.all jcef jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.hotspot.agent jdk.httpserver jdk.internal.ed jdk.internal.le jdk.internal.vm.compiler.management jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jsobject jdk.localedata jdk.management.agent jdk.management.jfr jdk.naming.dns jdk.naming.rmi jdk.net jdk.pack jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.xml.dom jdk.zipfs" IMPLEMENTOR="JetBrains s.r.o." -IMPLEMENTOR_VERSION="JBR-11.0.9.11-944.49-jcef" +IMPLEMENTOR_VERSION="JBR-11.0.9.11-1145.21-jcef" OS_ARCH="x86_64" OS_NAME="Linux" -SOURCE=".:git:0cabfd8d6a81+" +SOURCE=".:git:57ab69ccbaff+ jcef_git:git:1637e7e79943" Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/animal-sniffer-annotations-1.18.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/animal-sniffer-annotations-1.18.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/annotations-19.0.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/annotations-19.0.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/annotations-20.1.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/annotations-20.1.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/annotations-4.1.1.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/annotations-4.1.1.4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/annotations-java5.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/annotations-java5.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/asm-all-8.0.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/asm-all-8.0.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/asm-all-9.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/asm-all-9.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-anim-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-anim-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-anim-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-anim-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-awt-util-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-awt-util-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-awt-util-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-awt-util-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-bridge-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-bridge-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-bridge-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-bridge-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-codec-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-codec-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-codec-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-codec-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-constants-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-constants-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-constants-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-constants-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-css-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-css-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-css-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-css-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-dom-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-dom-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-dom-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-dom-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-ext-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-ext-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-ext-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-ext-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-gvt-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-gvt-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-gvt-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-gvt-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-parser-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-parser-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-parser-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-parser-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-svg-dom-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-svg-dom-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-svg-dom-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-svg-dom-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-svggen-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-svggen-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-svggen-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-svggen-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-transcoder-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-transcoder-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-transcoder-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-transcoder-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-util-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-util-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-util-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-util-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-xml-1.12.0-8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-xml-1.12.0-8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/batik-xml-1.13.0-21.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/batik-xml-1.13.0-21.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/blockmap-1.0.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/blockmap-1.0.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/bootstrap.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/bootstrap.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/built-in-server.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/built-in-server.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/caffeine-2.8.5.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/caffeine-2.8.5.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/cds/classesLogAgent.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/cds/classesLogAgent.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/commons-cli-1.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/commons-cli-1.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/commons-cli-1.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/commons-cli-1.4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/commons-lang3-3.10.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/commons-lang3-3.10.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/commons-lang3-3.9.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/commons-lang3-3.9.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/configuration-store-impl.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/configuration-store-impl.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/coverage-common.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/coverage-common.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/credential-store.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/credential-store.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/error_prone_annotations-2.3.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/error_prone_annotations-2.3.4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/extensions.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/extensions.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/external-system-rt.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/external-system-rt.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/forms_rt.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/forms_rt.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-api-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-api-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-context-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-context-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-core-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-core-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-kotlin-stub-0.2.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-kotlin-stub-0.2.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-netty-shaded-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-netty-shaded-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-protobuf-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-protobuf-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-protobuf-lite-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-protobuf-lite-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/grpc-stub-1.32.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/grpc-stub-1.32.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/gson-2.8.6.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/gson-2.8.6.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/guava-29.0-jre.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/guava-29.0-jre.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/icons.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/icons.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/icu4j-67.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/icu4j-67.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-coverage-agent-1.0.512.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-coverage-agent-1.0.512.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-coverage-agent-1.0.573.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-coverage-agent-1.0.573.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-deps-fastutil-8.3.1-1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-deps-fastutil-8.3.1-1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-deps-fastutil-8.4.1-4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-deps-fastutil-8.4.1-4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-dvcs.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-dvcs.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-test-discovery-agent-1.0.512.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-test-discovery-agent-1.0.512.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-test-discovery-agent-1.0.573.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-test-discovery-agent-1.0.573.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/intellij-xml.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/intellij-xml.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/ion-java-1.5.2-2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/ion-java-1.5.2-2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/ion-java-1.6.2-3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/ion-java-1.6.2-3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-annotations-2.10.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-annotations-2.10.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-annotations-2.11.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-annotations-2.11.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-core-2.10.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-core-2.10.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-core-2.11.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-core-2.11.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-databind-2.10.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-databind-2.10.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-databind-2.11.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-databind-2.11.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-module-kotlin-2.10.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-module-kotlin-2.10.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jackson-module-kotlin-2.11.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jackson-module-kotlin-2.11.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jcef-81.2.24-gc0b313d-chromium-81.0.4044.113-api-1.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jcef-81.2.24-gc0b313d-chromium-81.0.4044.113-api-1.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jcef-81.2.24-gc0b313d-chromium-81.0.4044.113.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jcef-81.2.24-gc0b313d-chromium-81.0.4044.113.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jdom.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jdom.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jediterm-pty-2.29.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jediterm-pty-2.29.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jediterm-pty-2.32.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jediterm-pty-2.32.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jna.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jna.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jps-model.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jps-model.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/json.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/json.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jsr305-3.0.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jsr305-3.0.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jsr305.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jsr305.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/jstun-0.7.5.20200723.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/jstun-0.7.5.20200723.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-reflect-1.3.70.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-reflect-1.3.70.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-reflect-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-reflect-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-1.3.70.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-1.3.70.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-common-1.3.70.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-common-1.3.70.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-common-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-common-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-jdk7-1.3.70.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-jdk7-1.3.70.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-jdk7-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-jdk7-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-jdk8-1.3.70.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-jdk8-1.3.70.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-stdlib-jdk8-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-stdlib-jdk8-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-test-1.3.61.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-test-1.3.61.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-test-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-test-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-test-common-1.3.61.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-test-common-1.3.61.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlin-test-common-1.4.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlin-test-common-1.4.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlinx-coroutines-core-1.3.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlinx-coroutines-core-1.3.4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlinx-coroutines-core-1.3.9.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlinx-coroutines-core-1.3.9.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlinx-coroutines-jdk8-1.3.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlinx-coroutines-jdk8-1.3.4.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/kotlinx-coroutines-jdk8-1.3.9.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/kotlinx-coroutines-jdk8-1.3.9.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/nanoxml-2.2.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/nanoxml-2.2.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-buffer-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-buffer-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-buffer-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-buffer-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-http2-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-http2-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-http2-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-http2-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-http-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-http-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-http-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-http-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-socks-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-socks-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-codec-socks-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-codec-socks-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-common-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-common-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-common-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-common-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-handler-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-handler-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-handler-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-handler-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-handler-proxy-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-handler-proxy-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-handler-proxy-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-handler-proxy-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-resolver-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-resolver-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-resolver-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-resolver-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-transport-4.1.47.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-transport-4.1.47.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/netty-transport-4.1.52.Final.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/netty-transport-4.1.52.Final.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/openapi.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/openapi.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/perfmark-api-0.19.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/perfmark-api-0.19.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-api.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-api.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-concurrency.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-concurrency.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-core-ui.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-core-ui.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-diagnostic.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-diagnostic.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-ide-util-io.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-ide-util-io.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-impl.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-impl.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-objectSerializer-annotations.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-objectSerializer-annotations.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-objectSerializer.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-objectSerializer.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-rd-community.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-rd-community.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-serviceContainer.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-serviceContainer.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-statistics-config.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-statistics-config.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-statistics-devkit.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-statistics-devkit.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-statistics.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-statistics.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-statistics-uploader.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-statistics-uploader.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-util-ex.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-util-ex.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/platform-util-ui.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/platform-util-ui.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/protobuf-java-3.13.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/protobuf-java-3.13.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/proto-google-common-protos-1.17.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/proto-google-common-protos-1.17.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/proxy-vole-1.0.5-jb.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/proxy-vole-1.0.5-jb.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-0.11.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-0.11.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-0.9.6.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-0.9.6.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-native/linux/aarch64/libpty.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-native/linux/aarch64/libpty.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-native/linux/mips64el/libpty.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-native/linux/mips64el/libpty.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-native/linux/x86/libpty.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-native/linux/x86/libpty.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-native/linux/x86_64/libpty.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-native/linux/x86_64/libpty.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pty4j-native/linux/x86-64/libpty.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pty4j-native/linux/x86-64/libpty.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/pycharm.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/pycharm.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-core-0.202.100.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-core-0.202.100.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-core-0.203.181.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-core-0.203.181.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-framework-0.202.100.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-framework-0.202.100.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-framework-0.203.181.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-framework-0.203.181.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-swing-0.202.100.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-swing-0.202.100.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/rd-swing-0.203.181.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/rd-swing-0.203.181.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/resources.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/resources.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/RoaringBitmap-0.9.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/RoaringBitmap-0.9.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/shims-0.9.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/shims-0.9.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/spellchecker.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/spellchecker.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/src/pycharm-openapi-src.zip and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/src/pycharm-openapi-src.zip differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/testFramework.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/testFramework.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/tips-pycharm-community-202.10.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/tips-pycharm-community-202.10.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/tips-pycharm-community-203.13.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/tips-pycharm-community-203.13.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/trove4j.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/trove4j.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/util.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/util.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/xmlgraphics-commons-2.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/xmlgraphics-commons-2.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/lib/xmlgraphics-commons-2.4.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/lib/xmlgraphics-commons-2.4.jar differ diff -Nru pycharm-2020.2.5/license/third-party-libraries.html pycharm-2020.3/license/third-party-libraries.html --- pycharm-2020.2.5/license/third-party-libraries.html 2020-12-01 13:53:31.000000000 +0000 +++ pycharm-2020.3/license/third-party-libraries.html 2020-12-01 23:28:04.000000000 +0000 @@ -42,11 +42,29 @@ SoftwareLicense - Amazon Ion Java - 1.5.2-2 + AhoCorasickDoubleArrayTrie + 1.2.2 - Apache 2.0 + Apache 2.0 + + + + + Amazon Ion Java + 1.6.2-3 + + + Apache 2.0 + + + + + Android SDK's DX Tool + 1.7 + + + Apache 2.0 @@ -60,11 +78,11 @@ - Apache Commons CLI - 1.2 + Apache Commons CLI + 1.4 - Apache 2.0 + Apache 2.0 @@ -123,6 +141,15 @@ + Apache Commons Lang + 3.10 + + + Apache 2.0 + + + + Apache Commons Logging 1.2 @@ -132,11 +159,20 @@ - ASM (JetBrains's fork) - 8.0.1 + Apache Commons Text + 1.8 - BSD + Apache 2.0 + + + + + ASM (JetBrains's fork) + 9.0 + + + BSD @@ -150,20 +186,29 @@ - batik - 1.12.0-8 + batik + 1.13.0-21 + + + Apache 2.0 + + + + + batik + 1.13.0-21 - Apache 2.0 + Apache 2.0 - batik - 1.12.0-8 + blockmap + 1.0.2 - Apache 2.0 + Apache 2.0 @@ -177,6 +222,15 @@ + BridJ (NativeLibs4Java C/C++ Interop Layer) + 0.7.0 + + + BSD 3-clause + + + + Byte Buddy agent 1.10.1 @@ -186,6 +240,15 @@ + caffeine + 2.8.5 + + + Apache 2.0 + + + + CGLib 3.2.4 @@ -240,11 +303,11 @@ - fastutil - 8.3.1-1 + fastutil + 8.4.1-4 - Apache 2.0 + Apache 2.0 @@ -303,6 +366,51 @@ + gRPC: Core + 1.32.2 + + + Apache 2.0 + + + + + gRPC: Netty Shaded + 1.32.2 + + + Apache 2.0 + + + + + gRPC: Protobuf + 1.32.2 + + + Apache 2.0 + + + + + gRPC: Stub + 1.32.2 + + + Apache 2.0 + + + + + gRPC Kotlin: Stub + 0.2.0 + + + Apache 2.0 + + + + Gson 2.8.6 @@ -339,6 +447,24 @@ + Hunspell + 1.1.1 + + + Apache 2.0 + + + + + ICU4J + 67.1 + + + Unicode + + + + imgscalr 4.2 @@ -357,6 +483,24 @@ + Incremental DOM + 0.7.0 + + + Apache 2.0 + + + + + indriya + 1.3 + + + BSD + + + + ini4j (JetBrains's fork) 0.5.5-2 @@ -375,29 +519,29 @@ - Jackson - 2.10.3 + Jackson + 2.11.0 - Apache 2.0 + Apache 2.0 - Jackson Databind - 2.10.3 + Jackson Databind + 2.11.0 - Apache 2.0 + Apache 2.0 - Jackson Module Kotlin - 2.10.3 + Jackson Module Kotlin + 2.11.0 - Apache 2.0 + Apache 2.0 @@ -465,11 +609,11 @@ - JCEF - 81.2.24-gc0b313d-chromium-81.0.4044.113 + JCEF + 81.2.24-gc0b313d-chromium-81.0.4044.113-api-1.1 - Permissive + Permissive @@ -492,29 +636,29 @@ - JediTerm - 2.29 + JediTerm + 2.32 - LGPL 3 + LGPL 3 - JetBrains Annotations - 19.0.0 + JetBrains Annotations + 20.1.0 - Apache 2.0 + Apache 2.0 - JetBrains Annotations for Java 5 - 19.0.0 + JetBrains Annotations for Java 5 + 20.1.0 - Apache 2.0 + Apache 2.0 @@ -636,6 +780,15 @@ + kotlinx.html + 0.6.11 + + + Apache 2.0 + + + + Kryo 2.24.0 @@ -672,11 +825,11 @@ - mercurial_prompthooks - + mercurial_prompthooks + custom revision - GPLv2 (used as hg extension called from hg executable) + GPLv2 (used as hg extension called from hg executable) @@ -708,6 +861,42 @@ + morfologik-fsa-builders + 2.1.7 + + + BSD + + + + + morfologik-fsa + 2.1.7 + + + BSD + + + + + morfologik-speller + 2.1.7 + + + BSD + + + + + morfologik-stemming + 2.1.7 + + + BSD + + + + NanoXML 2.2.3 @@ -717,20 +906,38 @@ - netty-codec-http - 4.1.47.Final + net.loomchild.segment + 2.0.1 + + + MIT + + + + + netty-buffer + 4.1.52.Final + + + Apache 2.0 + + + + + netty-codec-http + 4.1.52.Final - Apache 2.0 + Apache 2.0 - netty-handler-proxy - 4.1.47.Final + netty-handler-proxy + 4.1.52.Final - Apache 2.0 + Apache 2.0 @@ -762,6 +969,15 @@ + Protocol Buffers + 3.13.0 + + + BSD 3-clause + + + + Proxy Vole (JetBrains's fork) 1.0.5-jb.2 @@ -771,8 +987,8 @@ - pty4j - 0.9.6 + pty4j + 0.11.1 Eclipse Public License v1.0 @@ -789,11 +1005,11 @@ - Relax NG Object Model - + Relax NG Object Model + custom revision - MIT + MIT @@ -807,6 +1023,15 @@ + roaringBitmap + 0.9.0 + + + Apache 2.0 + + + + Roboto 1.100141 @@ -897,6 +1122,24 @@ + unit-api + 1.0 + + + BSD + + + + + uom-lib-common + 1.1 + + + BSD + + + + Velocity 1.7 @@ -996,6 +1239,15 @@ + Grazie Language Detector + 0.1.13 + + + Apache 2.0 + + + + Grazie SpellChecker 0.1.9 @@ -1003,4 +1255,31 @@ Apache 2.0 + + + hppc + 0.8.1 + + + Apache 2.0 + + + + + Language Tool (English) + 5.0 + + + LGPL 2.1 + + + + + Language Tool + 5.0.2 + + + LGPL 2.1 + + Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/completionMlRanking/lib/completionMlRanking.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/completionMlRanking/lib/completionMlRanking.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/completionMlRanking/lib/ngram-slp-0.0.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/completionMlRanking/lib/ngram-slp-0.0.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/completionMlRanking/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/completionMlRanking/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/configurationScript/lib/configurationScript.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/configurationScript/lib/configurationScript.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/copyright/lib/copyright.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/copyright/lib/copyright.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/copyright/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/copyright/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/editorconfig/lib/editorconfig.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/editorconfig/lib/editorconfig.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/editorconfig/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/editorconfig/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/emojipicker/lib/emojipicker.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/emojipicker/lib/emojipicker.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/emojipicker/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/emojipicker/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/featuresTrainer.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/featuresTrainer.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/fest-assert-1.5.0-SNAPSHOT.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/fest-assert-1.5.0-SNAPSHOT.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/fest-reflect-2.0-SNAPSHOT.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/fest-reflect-2.0-SNAPSHOT.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/fest-swing-1.4.6.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/fest-swing-1.4.6.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/fest-util-1.3.0-SNAPSHOT.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/fest-util-1.3.0-SNAPSHOT.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/jsr305.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/jsr305.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/MultithreadedTC-1.01.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/MultithreadedTC-1.01.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/featuresTrainer/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/featuresTrainer/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/git4idea/lib/git4idea.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/git4idea/lib/git4idea.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/git4idea/lib/git4idea-rt.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/git4idea/lib/git4idea-rt.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/git4idea/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/git4idea/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/github/lib/github.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/github/lib/github.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/github/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/github/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/aho-corasick-double-array-trie-1.2.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/aho-corasick-double-array-trie-1.2.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/bridj-0.7.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/bridj-0.7.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/commons-text-1.8.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/commons-text-1.8.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/dx-1.7.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/dx-1.7.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/grazie.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/grazie.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/grazi-language-detector-0.1.13.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/grazi-language-detector-0.1.13.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/hppc-0.8.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/hppc-0.8.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/hunspell-1.1.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/hunspell-1.1.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/indriya-1.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/indriya-1.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/kotlinx-html-jvm-0.6.11.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/kotlinx-html-jvm-0.6.11.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/language-en-5.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/language-en-5.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/languagetool-core-5.0.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/languagetool-core-5.0.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/morfologik-fsa-2.1.7.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/morfologik-fsa-2.1.7.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/morfologik-fsa-builders-2.1.7.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/morfologik-fsa-builders-2.1.7.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/morfologik-speller-2.1.7.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/morfologik-speller-2.1.7.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/morfologik-stemming-2.1.7.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/morfologik-stemming-2.1.7.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/segment-2.0.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/segment-2.0.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/unit-api-1.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/unit-api-1.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/grazie/lib/uom-lib-common-1.1.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/grazie/lib/uom-lib-common-1.1.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/hg4idea/lib/hg4idea.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/hg4idea/lib/hg4idea.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/hg4idea/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/hg4idea/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/IntelliLang/lib/IntelliLang.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/IntelliLang/lib/IntelliLang.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/IntelliLang/lib/intellilang-jps-plugin.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/IntelliLang/lib/intellilang-jps-plugin.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/IntelliLang/lib/java-langInjection-jps.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/IntelliLang/lib/java-langInjection-jps.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/markdown/lib/markdown.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/markdown/lib/markdown.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/markdown/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/markdown/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/platform-images/lib/platform-images.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/platform-images/lib/platform-images.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/platform-images/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/platform-images/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/properties/lib/properties.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/properties/lib/properties.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/properties/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/properties/lib/resources_en.jar differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pycharm/behave_runner.py pycharm-2020.3/plugins/python-ce/helpers/pycharm/behave_runner.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pycharm/behave_runner.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pycharm/behave_runner.py 2020-12-01 23:26:18.000000000 +0000 @@ -222,7 +222,6 @@ :return true if should pass """ assert isinstance(scenario, Scenario), scenario - # TODO: share with lettuce_runner.py#_get_features_to_run expected_tags = self.__config.tags scenario_name_re = self.__config.name_re if scenario_name_re and not scenario_name_re.match(scenario.name): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pycharm/lettuce_runner.py pycharm-2020.3/plugins/python-ce/helpers/pycharm/lettuce_runner.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pycharm/lettuce_runner.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pycharm/lettuce_runner.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -# coding=utf-8 -""" -BDD lettuce framework runner -TODO: Support other params (like tags) as well. -Supports only 2 params now: folder to search "features" for or file and "-s scenario_index" -""" -import inspect -import optparse -import os -import _bdd_utils - -__author__ = 'Ilya.Kazakevich' -from lettuce.exceptions import ReasonToFail -import lettuce -from lettuce import core - - -class _LettuceRunner(_bdd_utils.BddRunner): - """ - Lettuce runner (BddRunner for lettuce) - """ - - def __init__(self, base_dir, what_to_run, scenarios, options): - """ - - :param scenarios scenario numbers to run - :type scenarios list - :param base_dir base directory to run tests in - :type base_dir: str - :param what_to_run folder or file to run - :type options optparse.Values - :param options optparse options passed by user - :type what_to_run str - - """ - super(_LettuceRunner, self).__init__(base_dir) - # TODO: Copy/Paste with lettuce.bin, need to reuse somehow - - # Delete args that do not exist in constructor - args_to_pass = options.__dict__ - runner_args = inspect.getargspec(lettuce.Runner.__init__)[0] - unknown_args = set(args_to_pass.keys()) - set(runner_args) - map(args_to_pass.__delitem__, unknown_args) - - # Tags is special case and need to be preprocessed - self.__tags = None # Store tags in field - if 'tags' in args_to_pass.keys() and args_to_pass['tags']: - args_to_pass['tags'] = [tag.strip('@') for tag in args_to_pass['tags']] - self.__tags = set(args_to_pass['tags']) - - # Special cases we pass directly - args_to_pass['base_path'] = what_to_run - args_to_pass['scenarios'] = ",".join(scenarios) - - self.__runner = lettuce.Runner(**args_to_pass) - - def _get_features_to_run(self): - super(_LettuceRunner, self)._get_features_to_run() - features = [] - if self.__runner.single_feature: # We need to run one and only one feature - features = [core.Feature.from_file(self.__runner.single_feature)] - else: - # Find all features in dir - for feature_file in self.__runner.loader.find_feature_files(): - feature = core.Feature.from_file(feature_file) - assert isinstance(feature, core.Feature), feature - if feature.scenarios: - features.append(feature) - - # Choose only selected scenarios - if self.__runner.scenarios: - for feature in features: - filtered_feature_scenarios = [] - for index in [i - 1 for i in self.__runner.scenarios]: # decrease index by 1 - if index < len(feature.scenarios): - filtered_feature_scenarios.append(feature.scenarios[index]) - feature.scenarios = filtered_feature_scenarios - - # Filter out tags TODO: Share with behave_runner.py#__filter_scenarios_by_args - if self.__tags: - for feature in features: - feature.scenarios = filter(lambda s: set(s.tags) & self.__tags, feature.scenarios) - return features - - def _run_tests(self): - super(_LettuceRunner, self)._run_tests() - self.__install_hooks() - self.__runner.run() - - def __step(self, is_started, step): - """ - Reports step start / stop - :type step core.Step - :param step: step - """ - test_name = step.sentence - if is_started: - self._test_started(test_name, step.described_at) - elif step.passed: - self._test_passed(test_name) - elif step.failed: - reason = step.why - assert isinstance(reason, ReasonToFail), reason - self._test_failed(test_name, message=reason.exception.message, details=reason.traceback) - elif step.has_definition: - self._test_skipped(test_name, "In lettuce, we do know the reason", step.described_at) - else: - self._test_undefined(test_name, step.described_at) - - def __install_hooks(self): - """ - Installs required hooks - """ - - # Install hooks - lettuce.before.each_feature( - lambda f: self._feature_or_scenario(True, f.name, f.described_at)) - lettuce.after.each_feature( - lambda f: self._feature_or_scenario(False, f.name, f.described_at)) - - try: - lettuce.before.each_outline(lambda s, o: self.__outline(True, s, o)) - lettuce.after.each_outline(lambda s, o: self.__outline(False, s, o)) - except AttributeError: - import sys - sys.stderr.write("WARNING: your lettuce version is outdated and does not support outline hooks. " - "Outline scenarios may not work. Consider upgrade to latest lettuce (0.22 at least)") - - lettuce.before.each_scenario( - lambda s: self.__scenario(True, s)) - lettuce.after.each_scenario( - lambda s: self.__scenario(False, s)) - - lettuce.before.each_background( - lambda b, *args: self._background(True, b.feature.described_at)) - lettuce.after.each_background( - lambda b, *args: self._background(False, b.feature.described_at)) - - lettuce.before.each_step(lambda s: self.__step(True, s)) - lettuce.after.each_step(lambda s: self.__step(False, s)) - - def __outline(self, is_started, scenario, outline): - """ - report outline is started or finished - """ - outline_description = ["{0}: {1}".format(k, v) for k, v in outline.items()] - self._feature_or_scenario(is_started, "Outline {0}".format(outline_description), scenario.described_at) - - def __scenario(self, is_started, scenario): - """ - Reports scenario launched - :type scenario core.Scenario - :param scenario: scenario - """ - self._feature_or_scenario(is_started, scenario.name, scenario.described_at) - - -def _get_args(): - """ - Get options passed by user - - :return: tuple (options, args), see optparse - """ - # TODO: Copy/Paste with lettuce.bin, need to reuse somehow - parser = optparse.OptionParser() - parser.add_option("-v", "--verbosity", - dest="verbosity", - default=0, # We do not need verbosity due to GUI we use (although user may override it) - help='The verbosity level') - - parser.add_option("-s", "--scenarios", - dest="scenarios", - default=None, - help='Comma separated list of scenarios to run') - - parser.add_option("-t", "--tag", - dest="tags", - default=None, - action='append', - help='Tells lettuce to run the specified tags only; ' - 'can be used multiple times to define more tags' - '(prefixing tags with "-" will exclude them and ' - 'prefixing with "~" will match approximate words)') - - parser.add_option("-r", "--random", - dest="random", - action="store_true", - default=False, - help="Run scenarios in a more random order to avoid interference") - - parser.add_option("--with-xunit", - dest="enable_xunit", - action="store_true", - default=False, - help='Output JUnit XML test results to a file') - - parser.add_option("--xunit-file", - dest="xunit_file", - default=None, - type="string", - help='Write JUnit XML to this file. Defaults to ' - 'lettucetests.xml') - - parser.add_option("--with-subunit", - dest="enable_subunit", - action="store_true", - default=False, - help='Output Subunit test results to a file') - - parser.add_option("--subunit-file", - dest="subunit_filename", - default=None, - help='Write Subunit data to this file. Defaults to ' - 'subunit.bin') - - parser.add_option("--failfast", - dest="failfast", - default=False, - action="store_true", - help='Stop running in the first failure') - - parser.add_option("--pdb", - dest="auto_pdb", - default=False, - action="store_true", - help='Launches an interactive debugger upon error') - return parser.parse_args() - - -if __name__ == "__main__": - options, args = _get_args() - (base_dir, scenarios, what_to_run) = _bdd_utils.get_what_to_run_by_env(os.environ) - if len(what_to_run) > 1: - raise Exception("Lettuce can't run more than one file now") - _bdd_utils.fix_win_drive(what_to_run[0]) - _LettuceRunner(base_dir, what_to_run[0], scenarios, options).run() \ No newline at end of file diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pycharm_matplotlib_backend/backend_interagg.py pycharm-2020.3/plugins/python-ce/helpers/pycharm_matplotlib_backend/backend_interagg.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pycharm_matplotlib_backend/backend_interagg.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pycharm_matplotlib_backend/backend_interagg.py 2020-12-01 23:26:18.000000000 +0000 @@ -65,7 +65,6 @@ FigureCanvasAgg.__init__(self, figure) def show(self): - self.figure.tight_layout() FigureCanvasAgg.draw(self) if matplotlib.__version__ < '1.2': diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/build_tools/build.py pycharm-2020.3/plugins/python-ce/helpers/pydev/build_tools/build.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/build_tools/build.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/build_tools/build.py 2020-12-01 23:26:18.000000000 +0000 @@ -89,10 +89,12 @@ def remove_binaries(suffixes): - for f in os.listdir(os.path.join(root_dir, '_pydevd_bundle')): - for suffix in suffixes: - if f.endswith(suffix): - remove_if_exists(os.path.join(root_dir, '_pydevd_bundle', f)) + # noinspection SpellCheckingInspection + for binary_dir in '_pydevd_bundle', '_pydevd_frame_eval': + for f in os.listdir(os.path.join(root_dir, binary_dir)): + for suffix in suffixes: + if f.endswith(suffix): + remove_if_exists(os.path.join(root_dir, binary_dir, f)) def build(): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_console_utils.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_console_utils.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_console_utils.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_console_utils.py 2020-12-01 23:26:18.000000000 +0000 @@ -11,6 +11,7 @@ from _pydev_imps._pydev_saved_modules import thread from _pydevd_bundle import pydevd_thrift from _pydevd_bundle import pydevd_vars +from _pydevd_bundle.pydevd_comm import InternalDataViewerAction from _pydevd_bundle.pydevd_constants import IS_JYTHON, dict_iter_items from pydev_console.pydev_protocol import CompletionOption, CompletionOptionType, PythonUnhandledException @@ -254,6 +255,14 @@ traceback.print_exc() raise PythonUnhandledException(traceback.format_exc()) + def execDataViewerAction(self, varName, action, args): + try: + tmp_var = pydevd_vars.eval_in_context(varName, self.get_namespace(), self.get_namespace()) + return InternalDataViewerAction.act(tmp_var, action, args.split("\t")) + + except Exception as e: + raise PythonUnhandledException(type(e).__name__ + "\n" + traceback.format_exc()) + def evaluate(self, expression, do_trunc): # returns `DebugValue` of evaluated expression try: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_ipython_console_011.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_ipython_console_011.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_ipython_console_011.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_ipython_console_011.py 2020-12-01 23:26:18.000000000 +0000 @@ -186,8 +186,7 @@ if tb is not None: traceback.print_exception(etype, value, tb) - - + sys.last_type, sys.last_value, sys.last_traceback = etype, value, tb #------------------------------------------------------------------------- # Things related to text completion diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_monkey.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_monkey.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_monkey.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_monkey.py 2020-12-01 23:26:18.000000000 +0000 @@ -166,7 +166,7 @@ def patch_args(args): try: - log_debug("Patching args: %s"% str(args)) + log_debug("Patching args: %s" % str(args)) if _is_py3_and_has_bytes_args(args): warn_bytes_args() @@ -199,7 +199,9 @@ if port is not None: new_args.extend(args) new_args[ind_c + 1] = _get_python_c_args(host, port, ind_c, args, SetupHolder.setup) - return quote_args(new_args) + new_args = quote_args(new_args) + log_debug("Patched args: %s" % str(new_args)) + return new_args else: # Check for Python ZIP Applications and don't patch the args for them. # Assumes the first non `-` argument is what we need to check. @@ -253,6 +255,7 @@ # in practice it'd raise an exception here and would return original args, which is not what we want... providing # a proper fix for https://youtrack.jetbrains.com/issue/PY-9767 elsewhere. if i >= len(args) or _is_managed_arg(args[i]): # no need to add pydevd twice + log_debug("Patched args: %s" % str(args)) return args for x in original: @@ -264,7 +267,9 @@ new_args.append(args[i]) i += 1 - return quote_args(new_args) + new_args = quote_args(new_args) + log_debug("Patched args: %s" % str(new_args)) + return new_args except: traceback.print_exc() return args @@ -382,9 +387,12 @@ return other_args +_ORIGINAL_PREFIX = 'original_' + + def monkey_patch_module(module, funcname, create_func): if hasattr(module, funcname): - original_name = 'original_' + funcname + original_name = _ORIGINAL_PREFIX + funcname if not hasattr(module, original_name): setattr(module, original_name, getattr(module, funcname)) setattr(module, funcname, create_func(original_name)) @@ -412,7 +420,20 @@ warn_multiproc() - return getattr(os, original_name)(*args) + result = getattr(os, original_name)(*args) + + if original_name == _ORIGINAL_PREFIX + 'fork': + pid = result + # If automatic attaching to new processes is disabled, it is important to stop tracing in the child process. The reason is the + # "forked" instance of the debugger can potentially hit a breakpoint, which results in the process hanging. + if pid == 0: + debugger = get_global_debugger() + if debugger: + debugger.stoptrace() + return pid + else: + return result + return new_warn_multiproc @@ -613,6 +634,7 @@ child_process = getattr(os, original_name)() # fork if not child_process: if is_new_python_process: + log_debug("A new child process with PID %d has been forked" % os.getpid()) _on_forked_process() else: if is_new_python_process: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_console/console.thrift pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_console/console.thrift --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_console/console.thrift 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_console/console.thrift 2020-12-01 23:26:18.000000000 +0000 @@ -183,6 +183,8 @@ throws (1: UnsupportedArrayTypeException unsupported, 2: ExceedingArrayDimensionsException exceedingDimensions, 3: PythonUnhandledException unhandledException), + void execDataViewerAction(1: string varName, 2: string action, 3: string myArgs) + throws (1: PythonUnhandledException unhandledException), /** * The result is returned asyncronously with `PythonConsoleFrontendService.returnFullValue`. diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevconsole.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevconsole.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevconsole.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevconsole.py 2020-12-01 23:26:18.000000000 +0000 @@ -255,7 +255,7 @@ # thread can be put in the queue for later execution). code_fragment() else: - more = interpreter.add_exec(code_fragment) + interpreter.add_exec(code_fragment) except KeyboardInterrupt: interpreter.buffer = None continue Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py 2020-12-01 23:26:18.000000000 +0000 @@ -7,7 +7,7 @@ from _pydevd_bundle.pydevd_frame import PyDBFrame # ENDIF -version = 30 +version = 31 if not hasattr(sys, '_current_frames'): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_command_line_handling.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_command_line_handling.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_command_line_handling.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_command_line_handling.py 2020-12-01 23:26:18.000000000 +0000 @@ -62,6 +62,7 @@ ArgHandlerBool('print-in-debugger-startup'), ArgHandlerBool('cmd-line'), ArgHandlerBool('module'), + ArgHandlerBool('help'), ] ARGV_REP_TO_HANDLER = {} diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm_constants.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm_constants.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm_constants.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm_constants.py 2020-12-01 23:26:18.000000000 +0000 @@ -87,6 +87,9 @@ CMD_STEP_INTO_COROUTINE = 206 +# Powerful DataViewer commands +CMD_DATAVIEWER_ACTION = 210 + CMD_VERSION = 501 CMD_RETURN = 502 CMD_SET_PROTOCOL = 503 @@ -167,6 +170,8 @@ '202': 'CMD_SET_PROJECT_ROOTS', '206': 'CMD_STEP_INTO_COROUTINE', + '210': 'CMD_DATAVIEWER_ACTION', + '501': 'CMD_VERSION', '502': 'CMD_RETURN', '503': 'CMD_SET_PROTOCOL', diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_comm.py 2020-12-01 23:26:18.000000000 +0000 @@ -101,7 +101,7 @@ import inspect import traceback from _pydevd_bundle.pydevd_utils import quote_smart as quote, compare_object_attrs_key, to_string, \ - get_non_pydevd_threads + get_non_pydevd_threads, is_pandas_container, is_numpy_container from _pydev_bundle.pydev_is_thread_alive import is_thread_alive from _pydev_bundle import pydev_log from _pydev_bundle import _pydev_completer @@ -141,7 +141,7 @@ CMD_STOP_ON_START, CMD_GET_EXCEPTION_DETAILS, CMD_PROCESS_CREATED_MSG_RECEIVED, CMD_PYDEVD_JSON_CONFIG, CMD_THREAD_SUSPEND_SINGLE_NOTIFICATION, CMD_THREAD_RESUME_SINGLE_NOTIFICATION, CMD_REDIRECT_OUTPUT, CMD_GET_NEXT_STATEMENT_TARGETS, CMD_SET_PROJECT_ROOTS, CMD_VERSION, - CMD_RETURN, CMD_SET_PROTOCOL, CMD_ERROR, CMD_GET_SMART_STEP_INTO_VARIANTS,) + CMD_RETURN, CMD_SET_PROTOCOL, CMD_ERROR, CMD_GET_SMART_STEP_INTO_VARIANTS, CMD_DATAVIEWER_ACTION,) MAX_IO_MSG_SIZE = 1000 #if the io is too big, we'll not send all (could make the debugger too non-responsive) #this number can be changed if there's need to do so @@ -235,7 +235,7 @@ pydevd_tracing.SetTrace(None) # no debugging on this thread def _warn_pydevd_thread_is_traced(self): - if sys.gettrace(): + if self.pydev_do_not_trace and sys.gettrace(): pydevd_log(1, "The debugger thread '%s' is traced which may lead to debugging performance issues." % self.__class__.__name__) @@ -846,6 +846,12 @@ except Exception: return self.make_error_message(seq, get_exception_traceback_str()) + def make_successful_dataviewer_action_message(self, seq, payload): + try: + return NetCommand(CMD_DATAVIEWER_ACTION, seq, payload) + except Exception: + return self.make_error_message(seq, get_exception_traceback_str()) + def make_get_description_message(self, seq, payload): try: return NetCommand(CMD_GET_DESCRIPTION, seq, payload) @@ -1282,6 +1288,82 @@ cmd = dbg.cmd_factory.make_error_message(self.sequence, "Error resolving array: " + get_exception_traceback_str()) dbg.writer.add_command(cmd) + +#======================================================================================================================= +# InternalDataViewerAction +#======================================================================================================================= +class InternalDataViewerAction(InternalThreadCommand): + def __init__(self, sequence, thread_id, frame_id, var, action, args): + self.sequence = sequence + self.thread_id = thread_id + self.frame_id = frame_id + self.var = var + self.action = action + self.args = args + + def do_it(self, dbg): + try: + frame = pydevd_vars.find_frame(self.thread_id, self.frame_id) + tmp_var = pydevd_vars.eval_in_context(self.var, frame.f_globals, frame.f_locals) + + self.act(tmp_var, self.action, self.args) + + cmd = dbg.cmd_factory.make_successful_dataviewer_action_message( + self.sequence, + "Successful execution") + dbg.writer.add_command(cmd) + + except Exception as e: + cmd = dbg.cmd_factory.make_error_message( + self.sequence, + type(e).__name__ + "\nError exporting frame: " + get_exception_traceback_str()) + dbg.writer.add_command(cmd) + + @staticmethod + def act(tmp_var, action, args): + if action == 'EXPORT': + return InternalDataViewerAction.export_action(tmp_var, args) + + @staticmethod + def get_type_info(var): + tp = type(var) + tp_name = tp.__name__ + tp_qualifier = getattr(tp, "__module__", "") + + return tp_qualifier, tp_name + + @staticmethod + def export_action(var, args): + # args: (filepath) + filepath = args[0] + extension = filepath.rsplit('.', 1)[1].lower() + + tp_qualifier, tp_name = InternalDataViewerAction.get_type_info(var) + + if is_pandas_container(tp_qualifier, tp_name, var): + if extension in ('csv', 'tsv'): + delim = ',' if extension == 'csv' else '\t' + var.to_csv(filepath, sep=delim) + else: + raise AttributeError("Format '{}' is not supported".format(extension)) + + elif is_numpy_container(tp_qualifier, tp_name, var): + try: + import numpy as np + + except ImportError: + # Strange. We have an instance of numpy array but we failed to import numpy + raise + + if extension in ('csv', 'tsv'): + delim = ',' if extension == 'csv' else '\t' + np.savetxt(filepath, var, fmt="%s", delimiter=delim) + else: + raise AttributeError("Format '{}' is not supported".format(extension)) + + else: + raise AttributeError("Type {} is not supported".format(type(var))) + #======================================================================================================================= # InternalChangeVariable #======================================================================================================================= diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.c pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.c --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.c 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.c 2020-12-01 23:26:18.000000000 +0000 @@ -2613,7 +2613,7 @@ static __Pyx_CachedCFunction __pyx_umethod_PyDict_Type_get = {0, &__pyx_n_s_get, 0, 0, 0}; static PyObject *__pyx_int_0; static PyObject *__pyx_int_1; -static PyObject *__pyx_int_30; +static PyObject *__pyx_int_31; static PyObject *__pyx_int_160; static PyObject *__pyx_int_19394913; static PyObject *__pyx_int_64458794; @@ -36765,7 +36765,7 @@ if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error); __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(0, 1, __pyx_L1_error) - __pyx_int_30 = PyInt_FromLong(30); if (unlikely(!__pyx_int_30)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_31 = PyInt_FromLong(31); if (unlikely(!__pyx_int_31)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_160 = PyInt_FromLong(160); if (unlikely(!__pyx_int_160)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_19394913 = PyInt_FromLong(19394913L); if (unlikely(!__pyx_int_19394913)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_64458794 = PyInt_FromLong(64458794L); if (unlikely(!__pyx_int_64458794)) __PYX_ERR(0, 1, __pyx_L1_error) @@ -37263,14 +37263,14 @@ /* "_pydevd_bundle/pydevd_cython.pyx":16 * # ENDIF * - * version = 30 # <<<<<<<<<<<<<< + * version = 31 # <<<<<<<<<<<<<< * * if not hasattr(sys, '_current_frames'): */ - if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_int_30) < 0) __PYX_ERR(0, 16, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_int_31) < 0) __PYX_ERR(0, 16, __pyx_L1_error) /* "_pydevd_bundle/pydevd_cython.pyx":18 - * version = 30 + * version = 31 * * if not hasattr(sys, '_current_frames'): # <<<<<<<<<<<<<< * @@ -37573,7 +37573,7 @@ __pyx_L3:; /* "_pydevd_bundle/pydevd_cython.pyx":18 - * version = 30 + * version = 31 * * if not hasattr(sys, '_current_frames'): # <<<<<<<<<<<<<< * Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_37_64.cpython-37m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_37_64.cpython-37m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_38_64.cpython-38-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_38_64.cpython-38-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_39_64.cpython-39-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_39_64.cpython-39-darwin.so differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx 2020-12-01 23:26:18.000000000 +0000 @@ -13,7 +13,7 @@ # from _pydevd_bundle.pydevd_frame import PyDBFrame # ENDIF -version = 30 +version = 31 if not hasattr(sys, '_current_frames'): Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_32.cp35-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_32.cp35-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_64.cp35-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_64.cp35-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_32.cp36-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_32.cp36-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_64.cp36-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_64.cp36-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_32.cp37-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_32.cp37-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_64.cp37-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_64.cp37-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_38_32.cp38-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_38_32.cp38-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_38_64.cp38-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_38_64.cp38-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_39_32.cp39-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_39_32.cp39-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_39_64.cp39-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_39_64.cp39-win_amd64.pyd differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_kill_all_pydevd_threads.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_kill_all_pydevd_threads.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_kill_all_pydevd_threads.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_kill_all_pydevd_threads.py 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,7 @@ from _pydevd_bundle.pydevd_comm import PyDBDaemonThread from _pydevd_bundle.pydevd_constants import dict_keys + def kill_all_pydev_threads(): threads = dict_keys(PyDBDaemonThread.created_pydb_daemon_threads) for t in threads: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_process_net_command.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_process_net_command.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_process_net_command.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_process_net_command.py 2020-12-01 23:26:18.000000000 +0000 @@ -22,7 +22,8 @@ InternalLoadFullValue, CMD_LOAD_FULL_VALUE, CMD_PROCESS_CREATED_MSG_RECEIVED, CMD_REDIRECT_OUTPUT, CMD_GET_NEXT_STATEMENT_TARGETS, InternalGetNextStatementTargets, CMD_SET_PROJECT_ROOTS, CMD_GET_SMART_STEP_INTO_VARIANTS, CMD_GET_THREAD_STACK, CMD_THREAD_DUMP_TO_STDERR, CMD_STOP_ON_START, CMD_GET_EXCEPTION_DETAILS, NetCommand, - CMD_SET_PROTOCOL, CMD_PYDEVD_JSON_CONFIG, InternalGetThreadStack, InternalSmartStepInto, InternalGetSmartStepIntoVariants,) + CMD_SET_PROTOCOL, CMD_PYDEVD_JSON_CONFIG, InternalGetThreadStack, InternalSmartStepInto, InternalGetSmartStepIntoVariants, + CMD_DATAVIEWER_ACTION, InternalDataViewerAction) from _pydevd_bundle.pydevd_constants import (get_thread_id, IS_PY3K, DebugInfoHolder, dict_keys, STATE_RUN, NEXT_VALUE_SEPARATOR, IS_WINDOWS, get_current_thread_id) from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info @@ -869,6 +870,19 @@ int_cmd = InternalGetSmartStepIntoVariants(seq, thread_id, frame_id, start_line, end_line) py_db.post_internal_command(int_cmd, thread_id) + # Powerful DataViewer commands + elif cmd_id == CMD_DATAVIEWER_ACTION: + # format: thread_id frame_id name temp + try: + thread_id, frame_id, var, action, args = text.split('\t', 4) + args = args.split('\t') + + int_cmd = InternalDataViewerAction(seq, thread_id, frame_id, var, action, args) + py_db.post_internal_command(int_cmd, thread_id) + + except: + traceback.print_exc() + else: #I have no idea what this is all about cmd = py_db.cmd_factory.make_error_message(seq, "unexpected command " + str(cmd_id)) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_thrift.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_thrift.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_thrift.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_thrift.py 2020-12-01 23:26:18.000000000 +0000 @@ -16,7 +16,7 @@ from _pydevd_bundle.pydevd_utils import take_first_n_coll_elements, is_numeric_container, is_pandas_container, is_string, pandas_to_str, \ should_evaluate_full_value, should_evaluate_shape from _pydevd_bundle.pydevd_vars import get_label, array_default_format, is_able_to_format_number, MAXIMUM_ARRAY_SIZE, \ - get_column_formatter_by_type, get_formatted_row_elements, DEFAULT_DF_FORMAT + get_column_formatter_by_type, get_formatted_row_elements, DEFAULT_DF_FORMAT, DATAFRAME_HEADER_LOAD_MAX_SIZE from pydev_console.pydev_protocol import DebugValue, GetArrayResponse, ArrayData, ArrayHeaders, ColHeader, RowHeader, \ UnsupportedArrayTypeException, ExceedingArrayDimensionsException @@ -467,7 +467,7 @@ slice += reslice bounds = (0, 0) - if type in NUMPY_NUMERIC_TYPES: + if type in NUMPY_NUMERIC_TYPES and array.size != 0: bounds = (array.min(), array.max()) array_chunk = GetArrayResponse() array_chunk.slice = slice @@ -492,6 +492,7 @@ """ + original_df = df dim = len(df.axes) num_rows = df.shape[0] num_cols = df.shape[1] if dim > 1 else 1 @@ -520,6 +521,14 @@ if (rows, cols) == (-1, -1): rows, cols = num_rows, num_cols + elif (rows, cols) == (0, 0): + # return header only + r = min(num_rows, DATAFRAME_HEADER_LOAD_MAX_SIZE) + c = min(num_cols, DATAFRAME_HEADER_LOAD_MAX_SIZE) + array_chunk.headers = header_data_to_thrift_struct(r, c, [""] * num_cols, [(0, 0)] * num_cols, lambda x: DEFAULT_DF_FORMAT, original_df, dim) + array_chunk.data = array_data_to_thrift_struct(rows, cols, None, format) + return array_chunk + rows = min(rows, MAXIMUM_ARRAY_SIZE) cols = min(cols, MAXIMUM_ARRAY_SIZE, num_cols) # need to precompute column bounds here before slicing! @@ -529,7 +538,7 @@ for col in range(cols): dtype = df.dtypes.iloc[coffset + col].kind dtypes[col] = dtype - if dtype in NUMPY_NUMERIC_TYPES: + if dtype in NUMPY_NUMERIC_TYPES and df.size != 0: cvalues = df.iloc[:, coffset + col] bounds = (cvalues.min(), cvalues.max()) else: @@ -538,7 +547,7 @@ else: dtype = df.dtype.kind dtypes[0] = dtype - col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES else (0, 0) + col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0) df = df.iloc[roffset: roffset + rows, coffset: coffset + cols] if dim > 1 else df.iloc[roffset: roffset + rows] rows = df.shape[0] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_vars.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_vars.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_vars.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_vars.py 2020-12-01 23:26:18.000000000 +0000 @@ -25,7 +25,7 @@ import traceback from _pydevd_bundle import pydevd_save_locals from _pydev_bundle.pydev_imports import Exec, execfile -from _pydevd_bundle.pydevd_utils import to_string, VariableWithOffset +from _pydevd_bundle.pydevd_utils import VariableWithOffset SENTINEL_VALUE = [] DEFAULT_DF_FORMAT = "s" @@ -475,7 +475,7 @@ traceback.print_exc() -MAXIMUM_ARRAY_SIZE = 100 +MAXIMUM_ARRAY_SIZE = float('inf') def array_to_xml(array, name, roffset, coffset, rows, cols, format): @@ -580,7 +580,7 @@ slice += reslice bounds = (0, 0) - if type in NUMPY_NUMERIC_TYPES: + if type in NUMPY_NUMERIC_TYPES and array.size != 0: bounds = (array.min(), array.max()) return array, slice_to_xml(slice, rows, cols, format, type, bounds), rows, cols, format @@ -600,9 +600,9 @@ val = iat[row, c] if dim > 1 else iat[row] col_formatter = get_column_formatter_by_type(format, dtypes[c]) try: - yield ("%" + col_formatter) % val + yield ("%" + col_formatter) % (val,) except TypeError: - yield ("%" + DEFAULT_DF_FORMAT) % val + yield ("%" + DEFAULT_DF_FORMAT) % (val,) def array_default_format(type): @@ -618,6 +618,9 @@ return str(label) if not isinstance(label, tuple) else '/'.join(map(str, label)) +DATAFRAME_HEADER_LOAD_MAX_SIZE = 100 + + def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format): """ :type df: pandas.core.frame.DataFrame @@ -630,6 +633,7 @@ """ + original_df = df dim = len(df.axes) num_rows = df.shape[0] num_cols = df.shape[1] if dim > 1 else 1 @@ -653,6 +657,13 @@ if (rows, cols) == (-1, -1): rows, cols = num_rows, num_cols + elif (rows, cols) == (0, 0): + # return header only + r = min(num_rows, DATAFRAME_HEADER_LOAD_MAX_SIZE) + c = min(num_cols, DATAFRAME_HEADER_LOAD_MAX_SIZE) + xml += header_data_to_xml(r, c, [""] * num_cols, [(0, 0)] * num_cols, lambda x: DEFAULT_DF_FORMAT, original_df, dim) + return xml + rows = min(rows, MAXIMUM_ARRAY_SIZE) cols = min(cols, MAXIMUM_ARRAY_SIZE, num_cols) # need to precompute column bounds here before slicing! @@ -662,7 +673,7 @@ for col in range(cols): dtype = df.dtypes.iloc[coffset + col].kind dtypes[col] = dtype - if dtype in NUMPY_NUMERIC_TYPES: + if dtype in NUMPY_NUMERIC_TYPES and df.size != 0: cvalues = df.iloc[:, coffset + col] bounds = (cvalues.min(), cvalues.max()) else: @@ -671,14 +682,14 @@ else: dtype = df.dtype.kind dtypes[0] = dtype - col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES else (0, 0) + col_bounds[0] = (df.min(), df.max()) if dtype in NUMPY_NUMERIC_TYPES and df.size != 0 else (0, 0) df = df.iloc[roffset: roffset + rows, coffset: coffset + cols] if dim > 1 else df.iloc[roffset: roffset + rows] rows = df.shape[0] cols = df.shape[1] if dim > 1 else 1 - def col_to_format(c): - return get_column_formatter_by_type(format, dtypes[c]) + def col_to_format(column_type): + return get_column_formatter_by_type(format, column_type) iat = df.iat if dim == 1 or len(df.columns.unique()) == len(df.columns) else df.iloc @@ -686,6 +697,7 @@ return get_formatted_row_elements(row, iat, dim, cols, format, dtypes) xml += header_data_to_xml(rows, cols, dtypes, col_bounds, col_to_format, df, dim) + xml += array_data_to_xml(rows, cols, formatted_row_elements, format) return xml @@ -693,7 +705,7 @@ def array_data_to_xml(rows, cols, get_row, format): xml = "\n" % (rows, cols) for row in range(rows): - xml += "\n" % to_string(row) + xml += "\n" % row for value in get_row(row): xml += var_to_xml(value, '', format=format) return xml @@ -709,9 +721,9 @@ for col in range(cols): col_label = quote(get_label(df.axes[1].values[col]) if dim > 1 else str(col)) bounds = col_bounds[col] - col_format = "%" + col_to_format(col) + col_format = "%" + col_to_format(dtypes[col]) xml += '\n' % \ - (str(col), col_label, dtypes[col], col_to_format(col), col_format % bounds[1], col_format % bounds[0]) + (str(col), col_label, dtypes[col], col_to_format(dtypes[col]), col_format % bounds[1], col_format % bounds[0]) for row in range(rows): xml += "\n" % (str(row), get_label(df.axes[0].values[row])) xml += "\n" @@ -742,4 +754,3 @@ return "%s" % TYPE_TO_XML_CONVERTERS[type_name](array, name, roffset, coffset, rows, cols, format) else: raise VariableError("type %s not supported" % type_name) - diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_xml.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_xml.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_xml.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_xml.py 2020-12-01 23:26:18.000000000 +0000 @@ -15,7 +15,7 @@ MAXIMUM_VARIABLE_REPRESENTATION_SIZE, RETURN_VALUES_DICT, LOAD_VALUES_POLICY, DEFAULT_VALUES_DICT from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider, StrPresentationProvider from _pydevd_bundle.pydevd_utils import take_first_n_coll_elements, is_numeric_container, is_pandas_container, is_string, pandas_to_str, \ - should_evaluate_full_value, should_evaluate_shape, is_in_unittests_debugging_mode + should_evaluate_full_value, should_evaluate_shape try: import types diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_eval_cython_wrapper.py pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_eval_cython_wrapper.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_eval_cython_wrapper.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_eval_cython_wrapper.py 2020-12-01 23:26:18.000000000 +0000 @@ -53,4 +53,4 @@ get_thread_info_py = mod.get_thread_info_py -clear_thread_local_info = mod.clear_thread_local_info +clear_thread_local_info = mod.clear_thread_local_info_py diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.c pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.c --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.c 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.c 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.19 */ +/* Generated by Cython 0.29.21 */ /* BEGIN: Cython Metadata { @@ -27,8 +27,8 @@ #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) #error Cython requires Python 2.6+ or Python 3.3+. #else -#define CYTHON_ABI "0_29_19" -#define CYTHON_HEX_VERSION 0x001D13F0 +#define CYTHON_ABI "0_29_21" +#define CYTHON_HEX_VERSION 0x001D15F0 #define CYTHON_FUTURE_DIVISION 1 #include #ifndef offsetof @@ -455,7 +455,11 @@ #define __Pyx_PyUnicode_DATA(u) PyUnicode_DATA(u) #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i) #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch) + #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE) #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) + #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) + #endif #else #define CYTHON_PEP393_ENABLED 0 #define PyUnicode_1BYTE_KIND 1 @@ -518,6 +522,13 @@ #ifndef PySet_CheckExact #define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type) #endif +#if PY_VERSION_HEX >= 0x030900A4 + #define __Pyx_SET_REFCNT(obj, refcnt) Py_SET_REFCNT(obj, refcnt) + #define __Pyx_SET_SIZE(obj, size) Py_SET_SIZE(obj, size) +#else + #define __Pyx_SET_REFCNT(obj, refcnt) Py_REFCNT(obj) = (refcnt) + #define __Pyx_SET_SIZE(obj, size) Py_SIZE(obj) = (size) +#endif #if CYTHON_ASSUME_SAFE_MACROS #define __Pyx_PySequence_SIZE(seq) Py_SIZE(seq) #else @@ -557,7 +568,7 @@ #define __Pyx_PyInt_AsHash_t PyInt_AsSsize_t #endif #if PY_MAJOR_VERSION >= 3 - #define __Pyx_PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : (Py_INCREF(func), func)) + #define __Pyx_PyMethod_New(func, self, klass) ((self) ? ((void)(klass), PyMethod_New(func, self)) : __Pyx_NewRef(func)) #else #define __Pyx_PyMethod_New(func, self, klass) PyMethod_New(func, self, klass) #endif @@ -983,6 +994,33 @@ #define __Pyx_CLEAR(r) do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0) #define __Pyx_XCLEAR(r) do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0) +/* RaiseArgTupleInvalid.proto */ +static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact, + Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); + +/* RaiseDoubleKeywords.proto */ +static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name); + +/* ParseKeywords.proto */ +static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],\ + PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,\ + const char* function_name); + +/* ArgTypeTest.proto */ +#define __Pyx_ArgTypeTest(obj, type, none_allowed, name, exact)\ + ((likely((Py_TYPE(obj) == type) | (none_allowed && (obj == Py_None)))) ? 1 :\ + __Pyx__ArgTypeTest(obj, type, name, exact)) +static int __Pyx__ArgTypeTest(PyObject *obj, PyTypeObject *type, const char *name, int exact); + +/* IncludeStringH.proto */ +#include + +/* BytesEquals.proto */ +static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals); + +/* UnicodeEquals.proto */ +static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals); + /* PyObjectGetAttrStr.proto */ #if CYTHON_USE_TYPE_SLOTS static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name); @@ -990,6 +1028,43 @@ #define __Pyx_PyObject_GetAttrStr(o,n) PyObject_GetAttr(o,n) #endif +/* PyFunctionFastCall.proto */ +#if CYTHON_FAST_PYCALL +#define __Pyx_PyFunction_FastCall(func, args, nargs)\ + __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL) +#if 1 || PY_VERSION_HEX < 0x030600B1 +static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs); +#else +#define __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs) _PyFunction_FastCallDict(func, args, nargs, kwargs) +#endif +#define __Pyx_BUILD_ASSERT_EXPR(cond)\ + (sizeof(char [1 - 2*!(cond)]) - 1) +#ifndef Py_MEMBER_SIZE +#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) +#endif + static size_t __pyx_pyframe_localsplus_offset = 0; + #include "frameobject.h" + #define __Pxy_PyFrame_Initialize_Offsets()\ + ((void)__Pyx_BUILD_ASSERT_EXPR(sizeof(PyFrameObject) == offsetof(PyFrameObject, f_localsplus) + Py_MEMBER_SIZE(PyFrameObject, f_localsplus)),\ + (void)(__pyx_pyframe_localsplus_offset = ((size_t)PyFrame_Type.tp_basicsize) - Py_MEMBER_SIZE(PyFrameObject, f_localsplus))) + #define __Pyx_PyFrame_GetLocalsplus(frame)\ + (assert(__pyx_pyframe_localsplus_offset), (PyObject **)(((char *)(frame)) + __pyx_pyframe_localsplus_offset)) +#endif + +/* PyCFunctionFastCall.proto */ +#if CYTHON_FAST_PYCCALL +static CYTHON_INLINE PyObject *__Pyx_PyCFunction_FastCall(PyObject *func, PyObject **args, Py_ssize_t nargs); +#else +#define __Pyx_PyCFunction_FastCall(func, args, nargs) (assert(0), NULL) +#endif + +/* PyObjectCall.proto */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw); +#else +#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw) +#endif + /* GetBuiltinName.proto */ static PyObject *__Pyx_GetBuiltinName(PyObject *name); @@ -1040,85 +1115,6 @@ static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name); #endif -/* PyFunctionFastCall.proto */ -#if CYTHON_FAST_PYCALL -#define __Pyx_PyFunction_FastCall(func, args, nargs)\ - __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL) -#if 1 || PY_VERSION_HEX < 0x030600B1 -static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs); -#else -#define __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs) _PyFunction_FastCallDict(func, args, nargs, kwargs) -#endif -#define __Pyx_BUILD_ASSERT_EXPR(cond)\ - (sizeof(char [1 - 2*!(cond)]) - 1) -#ifndef Py_MEMBER_SIZE -#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) -#endif - static size_t __pyx_pyframe_localsplus_offset = 0; - #include "frameobject.h" - #define __Pxy_PyFrame_Initialize_Offsets()\ - ((void)__Pyx_BUILD_ASSERT_EXPR(sizeof(PyFrameObject) == offsetof(PyFrameObject, f_localsplus) + Py_MEMBER_SIZE(PyFrameObject, f_localsplus)),\ - (void)(__pyx_pyframe_localsplus_offset = ((size_t)PyFrame_Type.tp_basicsize) - Py_MEMBER_SIZE(PyFrameObject, f_localsplus))) - #define __Pyx_PyFrame_GetLocalsplus(frame)\ - (assert(__pyx_pyframe_localsplus_offset), (PyObject **)(((char *)(frame)) + __pyx_pyframe_localsplus_offset)) -#endif - -/* PyObjectCall.proto */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw); -#else -#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw) -#endif - -/* PyObjectCallMethO.proto */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg); -#endif - -/* PyObjectCallNoArg.proto */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func); -#else -#define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL) -#endif - -/* PyCFunctionFastCall.proto */ -#if CYTHON_FAST_PYCCALL -static CYTHON_INLINE PyObject *__Pyx_PyCFunction_FastCall(PyObject *func, PyObject **args, Py_ssize_t nargs); -#else -#define __Pyx_PyCFunction_FastCall(func, args, nargs) (assert(0), NULL) -#endif - -/* PyObjectCallOneArg.proto */ -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg); - -/* RaiseArgTupleInvalid.proto */ -static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact, - Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); - -/* RaiseDoubleKeywords.proto */ -static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name); - -/* ParseKeywords.proto */ -static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],\ - PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,\ - const char* function_name); - -/* ArgTypeTest.proto */ -#define __Pyx_ArgTypeTest(obj, type, none_allowed, name, exact)\ - ((likely((Py_TYPE(obj) == type) | (none_allowed && (obj == Py_None)))) ? 1 :\ - __Pyx__ArgTypeTest(obj, type, name, exact)) -static int __Pyx__ArgTypeTest(PyObject *obj, PyTypeObject *type, const char *name, int exact); - -/* IncludeStringH.proto */ -#include - -/* BytesEquals.proto */ -static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals); - -/* UnicodeEquals.proto */ -static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals); - /* ExtTypeTest.proto */ static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); @@ -1157,6 +1153,21 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); #endif +/* PyObjectCallMethO.proto */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg); +#endif + +/* PyObjectCallNoArg.proto */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func); +#else +#define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL) +#endif + +/* PyObjectCallOneArg.proto */ +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg); + /* GetAttr.proto */ static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *, PyObject *); @@ -1314,6 +1325,7 @@ static PyTypeObject *__pyx_ptype_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo = 0; static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *(*__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info)(void); /*proto*/ static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *(*__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info)(PyCodeObject *); /*proto*/ +static PyObject *(*__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_clear_thread_local_info)(void); /*proto*/ /* Module declarations from '_pydevd_frame_eval.pydevd_frame_evaluator' */ static PyObject *__pyx_f_18_pydevd_frame_eval_22pydevd_frame_evaluator_get_bytecode_while_frame_eval(PyFrameObject *, int); /*proto*/ @@ -1330,7 +1342,6 @@ static const char __pyx_k_test[] = "__test__"; static const char __pyx_k_event[] = "event"; static const char __pyx_k_frame[] = "frame"; -static const char __pyx_k_local[] = "local"; static const char __pyx_k_state[] = "state"; static const char __pyx_k_f_back[] = "f_back"; static const char __pyx_k_import[] = "__import__"; @@ -1359,23 +1370,24 @@ static const char __pyx_k_get_func_code_info_py[] = "get_func_code_info_py"; static const char __pyx_k_has_plugin_line_breaks[] = "has_plugin_line_breaks"; static const char __pyx_k_initialize_if_possible[] = "initialize_if_possible"; -static const char __pyx_k_clear_thread_local_info[] = "clear_thread_local_info"; static const char __pyx_k_pydevd_bundle_pydevd_comm[] = "_pydevd_bundle.pydevd_comm"; static const char __pyx_k_break_on_caught_exceptions[] = "break_on_caught_exceptions"; +static const char __pyx_k_clear_thread_local_info_py[] = "clear_thread_local_info_py"; static const char __pyx_k_has_plugin_exception_breaks[] = "has_plugin_exception_breaks"; static const char __pyx_k_pydevd_frame_eval_pydevd_frame[] = "_pydevd_frame_eval.pydevd_frame_tracing"; static const char __pyx_k_pydev_imps__pydev_saved_modules[] = "_pydev_imps._pydev_saved_modules"; static const char __pyx_k_pydevd_bundle_pydevd_trace_disp[] = "_pydevd_bundle.pydevd_trace_dispatch"; static const char __pyx_k_fix_top_level_trace_and_get_trac[] = "fix_top_level_trace_and_get_trace_func"; -static const char __pyx_k_pydevd_frame_eval_pydevd_frame_2[] = "_pydevd_frame_eval/pydevd_frame_evaluator.pyx"; -static const char __pyx_k_pydevd_frame_eval_pydevd_frame_3[] = "_pydevd_frame_eval.pydevd_frame_evaluator"; +static const char __pyx_k_pydevd_frame_eval_pydevd_frame_2[] = "_pydevd_frame_eval.pydevd_frame_evaluator_common"; +static const char __pyx_k_pydevd_frame_eval_pydevd_frame_3[] = "_pydevd_frame_eval/pydevd_frame_evaluator.pyx"; +static const char __pyx_k_pydevd_frame_eval_pydevd_frame_4[] = "_pydevd_frame_eval.pydevd_frame_evaluator"; static PyObject *__pyx_n_s_GlobalDebuggerHolder; static PyObject *__pyx_n_s_arg; static PyObject *__pyx_n_s_break_on_caught_exceptions; static PyObject *__pyx_n_u_break_on_caught_exceptions; static PyObject *__pyx_n_u_call; static PyObject *__pyx_n_s_can_not_skip; -static PyObject *__pyx_n_s_clear_thread_local_info; +static PyObject *__pyx_n_s_clear_thread_local_info_py; static PyObject *__pyx_n_s_cline_in_traceback; static PyObject *__pyx_n_s_code_obj; static PyObject *__pyx_n_s_decref_py; @@ -1395,7 +1407,6 @@ static PyObject *__pyx_n_s_has_plugin_line_breaks; static PyObject *__pyx_n_s_import; static PyObject *__pyx_n_s_initialize_if_possible; -static PyObject *__pyx_n_s_local; static PyObject *__pyx_n_s_main; static PyObject *__pyx_n_s_name; static PyObject *__pyx_n_s_obj; @@ -1404,8 +1415,9 @@ static PyObject *__pyx_n_s_pydevd_bundle_pydevd_comm; static PyObject *__pyx_n_s_pydevd_bundle_pydevd_trace_disp; static PyObject *__pyx_n_s_pydevd_frame_eval_pydevd_frame; -static PyObject *__pyx_kp_s_pydevd_frame_eval_pydevd_frame_2; -static PyObject *__pyx_n_s_pydevd_frame_eval_pydevd_frame_3; +static PyObject *__pyx_n_s_pydevd_frame_eval_pydevd_frame_2; +static PyObject *__pyx_kp_s_pydevd_frame_eval_pydevd_frame_3; +static PyObject *__pyx_n_s_pydevd_frame_eval_pydevd_frame_4; static PyObject *__pyx_n_s_set_trace_func; static PyObject *__pyx_n_s_show_return_values; static PyObject *__pyx_n_s_signature_factory; @@ -1420,8 +1432,8 @@ static PyObject *__pyx_n_s_threading; static PyObject *__pyx_n_s_trace_dispatch; static PyObject *__pyx_n_s_update_globals_dict; -static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_clear_thread_local_info(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ -static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2get_thread_info_py(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ +static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_get_thread_info_py(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ +static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2clear_thread_local_info_py(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_4dummy_trace_dispatch(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_frame, PyObject *__pyx_v_event, PyObject *__pyx_v_arg); /* proto */ static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_6decref_py(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_obj); /* proto */ static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_8get_func_code_info_py(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_code_obj); /* proto */ @@ -1441,157 +1453,134 @@ static PyObject *__pyx_codeobj__12; /* Late includes */ -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":15 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":14 * * - * def clear_thread_local_info(): # <<<<<<<<<<<<<< - * global _thread_local_info - * _thread_local_info = threading.local() + * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< + * return get_thread_info() + * */ /* Python wrapper */ -static PyObject *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1clear_thread_local_info(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyMethodDef __pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_1clear_thread_local_info = {"clear_thread_local_info", (PyCFunction)__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1clear_thread_local_info, METH_NOARGS, 0}; -static PyObject *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1clear_thread_local_info(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { - PyObject *__pyx_r = 0; +static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1get_thread_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyMethodDef __pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_1get_thread_info_py = {"get_thread_info_py", (PyCFunction)__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1get_thread_info_py, METH_NOARGS, 0}; +static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_1get_thread_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { + struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_r = 0; __Pyx_RefNannyDeclarations - __Pyx_RefNannySetupContext("clear_thread_local_info (wrapper)", 0); - __pyx_r = __pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_clear_thread_local_info(__pyx_self); + __Pyx_RefNannySetupContext("get_thread_info_py (wrapper)", 0); + __pyx_r = __pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_get_thread_info_py(__pyx_self); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_clear_thread_local_info(CYTHON_UNUSED PyObject *__pyx_self) { - PyObject *__pyx_r = NULL; +static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_get_thread_info_py(CYTHON_UNUSED PyObject *__pyx_self) { + struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __Pyx_RefNannySetupContext("clear_thread_local_info", 0); + __Pyx_RefNannySetupContext("get_thread_info_py", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":17 - * def clear_thread_local_info(): - * global _thread_local_info - * _thread_local_info = threading.local() # <<<<<<<<<<<<<< + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":15 + * + * def get_thread_info_py() -> ThreadInfo: + * return get_thread_info() # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_threading); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 17, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_local); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 17, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); - if (likely(__pyx_t_2)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - __Pyx_INCREF(__pyx_t_2); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_3, function); - } - } - __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error) + __Pyx_XDECREF(((PyObject *)__pyx_r)); + __pyx_t_1 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info()); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 15, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (PyDict_SetItem(__pyx_d, __pyx_n_s_thread_local_info, __pyx_t_1) < 0) __PYX_ERR(0, 17, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_r = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *)__pyx_t_1); + __pyx_t_1 = 0; + goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":15 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":14 + * * + * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< + * return get_thread_info() * - * def clear_thread_local_info(): # <<<<<<<<<<<<<< - * global _thread_local_info - * _thread_local_info = threading.local() */ /* function exit code */ - __pyx_r = Py_None; __Pyx_INCREF(Py_None); - goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); - __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.clear_thread_local_info", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.get_thread_info_py", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; - __Pyx_XGIVEREF(__pyx_r); + __Pyx_XGIVEREF((PyObject *)__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":20 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":18 * * - * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< - * return get_thread_info() + * def clear_thread_local_info_py(): # <<<<<<<<<<<<<< + * clear_thread_local_info() * */ /* Python wrapper */ -static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3get_thread_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyMethodDef __pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_3get_thread_info_py = {"get_thread_info_py", (PyCFunction)__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3get_thread_info_py, METH_NOARGS, 0}; -static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3get_thread_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { - struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_r = 0; +static PyObject *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3clear_thread_local_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyMethodDef __pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_3clear_thread_local_info_py = {"clear_thread_local_info_py", (PyCFunction)__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3clear_thread_local_info_py, METH_NOARGS, 0}; +static PyObject *__pyx_pw_18_pydevd_frame_eval_22pydevd_frame_evaluator_3clear_thread_local_info_py(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { + PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations - __Pyx_RefNannySetupContext("get_thread_info_py (wrapper)", 0); - __pyx_r = __pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2get_thread_info_py(__pyx_self); + __Pyx_RefNannySetupContext("clear_thread_local_info_py (wrapper)", 0); + __pyx_r = __pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2clear_thread_local_info_py(__pyx_self); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2get_thread_info_py(CYTHON_UNUSED PyObject *__pyx_self) { - struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *__pyx_r = NULL; +static PyObject *__pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_2clear_thread_local_info_py(CYTHON_UNUSED PyObject *__pyx_self) { + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __Pyx_RefNannySetupContext("get_thread_info_py", 0); + __Pyx_RefNannySetupContext("clear_thread_local_info_py", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":21 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":19 * - * def get_thread_info_py() -> ThreadInfo: - * return get_thread_info() # <<<<<<<<<<<<<< + * def clear_thread_local_info_py(): + * clear_thread_local_info() # <<<<<<<<<<<<<< * * */ - __Pyx_XDECREF(((PyObject *)__pyx_r)); - __pyx_t_1 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info()); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 21, __pyx_L1_error) + __pyx_t_1 = __pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_clear_thread_local_info(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_r = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *)__pyx_t_1); - __pyx_t_1 = 0; - goto __pyx_L0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":20 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":18 * * - * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< - * return get_thread_info() + * def clear_thread_local_info_py(): # <<<<<<<<<<<<<< + * clear_thread_local_info() * */ /* function exit code */ + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.get_thread_info_py", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.clear_thread_local_info_py", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; - __Pyx_XGIVEREF((PyObject *)__pyx_r); + __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":22 * * * def dummy_trace_dispatch(frame, str event, arg): # <<<<<<<<<<<<<< @@ -1637,17 +1626,17 @@ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_event)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, 1); __PYX_ERR(0, 24, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, 1); __PYX_ERR(0, 22, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_arg)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, 2); __PYX_ERR(0, 24, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, 2); __PYX_ERR(0, 22, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "dummy_trace_dispatch") < 0)) __PYX_ERR(0, 24, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "dummy_trace_dispatch") < 0)) __PYX_ERR(0, 22, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 3) { goto __pyx_L5_argtuple_error; @@ -1662,13 +1651,13 @@ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 24, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dummy_trace_dispatch", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 22, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.dummy_trace_dispatch", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_event), (&PyUnicode_Type), 1, "event", 1))) __PYX_ERR(0, 24, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_event), (&PyUnicode_Type), 1, "event", 1))) __PYX_ERR(0, 22, __pyx_L1_error) __pyx_r = __pyx_pf_18_pydevd_frame_eval_22pydevd_frame_evaluator_4dummy_trace_dispatch(__pyx_self, __pyx_v_frame, __pyx_v_event, __pyx_v_arg); /* function exit code */ @@ -1695,32 +1684,32 @@ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("dummy_trace_dispatch", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":25 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":23 * * def dummy_trace_dispatch(frame, str event, arg): * if event == 'call': # <<<<<<<<<<<<<< * if frame.f_trace is not None: * return frame.f_trace(frame, event, arg) */ - __pyx_t_1 = (__Pyx_PyUnicode_Equals(__pyx_v_event, __pyx_n_u_call, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 25, __pyx_L1_error) + __pyx_t_1 = (__Pyx_PyUnicode_Equals(__pyx_v_event, __pyx_n_u_call, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 23, __pyx_L1_error) __pyx_t_2 = (__pyx_t_1 != 0); if (__pyx_t_2) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":26 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 * def dummy_trace_dispatch(frame, str event, arg): * if event == 'call': * if frame.f_trace is not None: # <<<<<<<<<<<<<< * return frame.f_trace(frame, event, arg) * return None */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 26, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 24, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_2 = (__pyx_t_3 != Py_None); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_1 = (__pyx_t_2 != 0); if (__pyx_t_1) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":27 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":25 * if event == 'call': * if frame.f_trace is not None: * return frame.f_trace(frame, event, arg) # <<<<<<<<<<<<<< @@ -1728,7 +1717,7 @@ * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 27, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; __pyx_t_6 = 0; @@ -1745,7 +1734,7 @@ #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[4] = {__pyx_t_5, __pyx_v_frame, __pyx_v_event, __pyx_v_arg}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -1753,13 +1742,13 @@ #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[4] = {__pyx_t_5, __pyx_v_frame, __pyx_v_event, __pyx_v_arg}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_7 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 27, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -1773,7 +1762,7 @@ __Pyx_INCREF(__pyx_v_arg); __Pyx_GIVEREF(__pyx_v_arg); PyTuple_SET_ITEM(__pyx_t_7, 2+__pyx_t_6, __pyx_v_arg); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } @@ -1782,7 +1771,7 @@ __pyx_t_3 = 0; goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":26 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 * def dummy_trace_dispatch(frame, str event, arg): * if event == 'call': * if frame.f_trace is not None: # <<<<<<<<<<<<<< @@ -1791,7 +1780,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":25 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":23 * * def dummy_trace_dispatch(frame, str event, arg): * if event == 'call': # <<<<<<<<<<<<<< @@ -1800,7 +1789,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":28 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":26 * if frame.f_trace is not None: * return frame.f_trace(frame, event, arg) * return None # <<<<<<<<<<<<<< @@ -1811,7 +1800,7 @@ __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":22 * * * def dummy_trace_dispatch(frame, str event, arg): # <<<<<<<<<<<<<< @@ -1833,7 +1822,7 @@ return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":31 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":29 * * * def decref_py(obj): # <<<<<<<<<<<<<< @@ -1861,7 +1850,7 @@ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("decref_py", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":35 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":33 * Helper to be called from Python. * ''' * Py_DECREF(obj) # <<<<<<<<<<<<<< @@ -1870,7 +1859,7 @@ */ Py_DECREF(__pyx_v_obj); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":31 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":29 * * * def decref_py(obj): # <<<<<<<<<<<<<< @@ -1885,7 +1874,7 @@ return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":38 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":36 * * * def get_func_code_info_py(code_obj) -> FuncCodeInfo: # <<<<<<<<<<<<<< @@ -1917,7 +1906,7 @@ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_func_code_info_py", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":42 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":40 * Helper to be called from Python. * ''' * return get_func_code_info( code_obj) # <<<<<<<<<<<<<< @@ -1925,13 +1914,13 @@ * */ __Pyx_XDECREF(((PyObject *)__pyx_r)); - __pyx_t_1 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info(((PyCodeObject *)__pyx_v_code_obj))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 42, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info(((PyCodeObject *)__pyx_v_code_obj))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 40, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *)__pyx_t_1); __pyx_t_1 = 0; goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":38 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":36 * * * def get_func_code_info_py(code_obj) -> FuncCodeInfo: # <<<<<<<<<<<<<< @@ -1950,7 +1939,7 @@ return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":45 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":43 * * * cdef PyObject * get_bytecode_while_frame_eval(PyFrameObject * frame_obj, int exc): # <<<<<<<<<<<<<< @@ -1998,14 +1987,14 @@ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_bytecode_while_frame_eval", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":50 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":48 * where programmatic breakpoints are added. * ''' * if GlobalDebuggerHolder is None or _thread_local_info is None or exc: # <<<<<<<<<<<<<< * # Sometimes during process shutdown these global variables become None * return _PyEval_EvalFrameDefault(frame_obj, exc) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = (__pyx_t_2 == Py_None); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -2015,7 +2004,7 @@ __pyx_t_1 = __pyx_t_4; goto __pyx_L4_bool_binop_done; } - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_thread_local_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_thread_local_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = (__pyx_t_2 == Py_None); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -2030,7 +2019,7 @@ __pyx_L4_bool_binop_done:; if (__pyx_t_1) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":52 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":50 * if GlobalDebuggerHolder is None or _thread_local_info is None or exc: * # Sometimes during process shutdown these global variables become None * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2040,7 +2029,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":50 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":48 * where programmatic breakpoints are added. * ''' * if GlobalDebuggerHolder is None or _thread_local_info is None or exc: # <<<<<<<<<<<<<< @@ -2049,7 +2038,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":59 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":57 * * cdef ThreadInfo thread_info * cdef int STATE_SUSPEND = 2 # <<<<<<<<<<<<<< @@ -2058,7 +2047,7 @@ */ __pyx_v_STATE_SUSPEND = 2; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":60 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":58 * cdef ThreadInfo thread_info * cdef int STATE_SUSPEND = 2 * cdef int CMD_STEP_INTO = 107 # <<<<<<<<<<<<<< @@ -2067,7 +2056,7 @@ */ __pyx_v_CMD_STEP_INTO = 0x6B; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":61 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":59 * cdef int STATE_SUSPEND = 2 * cdef int CMD_STEP_INTO = 107 * cdef int CMD_STEP_OVER = 108 # <<<<<<<<<<<<<< @@ -2076,7 +2065,7 @@ */ __pyx_v_CMD_STEP_OVER = 0x6C; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":62 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":60 * cdef int CMD_STEP_INTO = 107 * cdef int CMD_STEP_OVER = 108 * cdef int CMD_STEP_INTO_MY_CODE = 144 # <<<<<<<<<<<<<< @@ -2085,7 +2074,7 @@ */ __pyx_v_CMD_STEP_INTO_MY_CODE = 0x90; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":63 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":61 * cdef int CMD_STEP_OVER = 108 * cdef int CMD_STEP_INTO_MY_CODE = 144 * cdef int CMD_SMART_STEP_INTO = 128 # <<<<<<<<<<<<<< @@ -2094,7 +2083,7 @@ */ __pyx_v_CMD_SMART_STEP_INTO = 0x80; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":64 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":62 * cdef int CMD_STEP_INTO_MY_CODE = 144 * cdef int CMD_SMART_STEP_INTO = 128 * cdef bint can_skip = True # <<<<<<<<<<<<<< @@ -2103,7 +2092,7 @@ */ __pyx_v_can_skip = 1; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":65 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":63 * cdef int CMD_SMART_STEP_INTO = 128 * cdef bint can_skip = True * try: # <<<<<<<<<<<<<< @@ -2119,23 +2108,23 @@ __Pyx_XGOTREF(__pyx_t_7); /*try:*/ { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":66 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":64 * cdef bint can_skip = True * try: * thread_info = _thread_local_info.thread_info # <<<<<<<<<<<<<< * except: * thread_info = get_thread_info() */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_thread_local_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 66, __pyx_L7_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_thread_local_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 64, __pyx_L7_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_thread_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 66, __pyx_L7_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_thread_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 64, __pyx_L7_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo))))) __PYX_ERR(0, 66, __pyx_L7_error) + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo))))) __PYX_ERR(0, 64, __pyx_L7_error) __pyx_v_thread_info = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *)__pyx_t_8); __pyx_t_8 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":65 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":63 * cdef int CMD_SMART_STEP_INTO = 128 * cdef bint can_skip = True * try: # <<<<<<<<<<<<<< @@ -2151,7 +2140,7 @@ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":67 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":65 * try: * thread_info = _thread_local_info.thread_info * except: # <<<<<<<<<<<<<< @@ -2160,24 +2149,24 @@ */ /*except:*/ { __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator.get_bytecode_while_frame_eval", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_8, &__pyx_t_2, &__pyx_t_9) < 0) __PYX_ERR(0, 67, __pyx_L9_except_error) + if (__Pyx_GetException(&__pyx_t_8, &__pyx_t_2, &__pyx_t_9) < 0) __PYX_ERR(0, 65, __pyx_L9_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_GOTREF(__pyx_t_2); __Pyx_GOTREF(__pyx_t_9); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":68 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":66 * thread_info = _thread_local_info.thread_info * except: * thread_info = get_thread_info() # <<<<<<<<<<<<<< * if thread_info is None: * return _PyEval_EvalFrameDefault(frame_obj, exc) */ - __pyx_t_10 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info()); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 68, __pyx_L9_except_error) + __pyx_t_10 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info()); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 66, __pyx_L9_except_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_XDECREF_SET(__pyx_v_thread_info, ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *)__pyx_t_10)); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":69 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":67 * except: * thread_info = get_thread_info() * if thread_info is None: # <<<<<<<<<<<<<< @@ -2188,7 +2177,7 @@ __pyx_t_3 = (__pyx_t_1 != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":70 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":68 * thread_info = get_thread_info() * if thread_info is None: * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2201,7 +2190,7 @@ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; goto __pyx_L10_except_return; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":69 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":67 * except: * thread_info = get_thread_info() * if thread_info is None: # <<<<<<<<<<<<<< @@ -2216,7 +2205,7 @@ } __pyx_L9_except_error:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":65 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":63 * cdef int CMD_SMART_STEP_INTO = 128 * cdef bint can_skip = True * try: # <<<<<<<<<<<<<< @@ -2242,7 +2231,7 @@ __pyx_L12_try_end:; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":72 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":70 * return _PyEval_EvalFrameDefault(frame_obj, exc) * * if thread_info.inside_frame_eval: # <<<<<<<<<<<<<< @@ -2252,7 +2241,7 @@ __pyx_t_3 = (__pyx_v_thread_info->inside_frame_eval != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":73 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":71 * * if thread_info.inside_frame_eval: * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2262,7 +2251,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":72 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":70 * return _PyEval_EvalFrameDefault(frame_obj, exc) * * if thread_info.inside_frame_eval: # <<<<<<<<<<<<<< @@ -2271,7 +2260,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":75 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":73 * return _PyEval_EvalFrameDefault(frame_obj, exc) * * if not thread_info.fully_initialized: # <<<<<<<<<<<<<< @@ -2281,14 +2270,14 @@ __pyx_t_3 = ((!(__pyx_v_thread_info->fully_initialized != 0)) != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":76 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":74 * * if not thread_info.fully_initialized: * thread_info.initialize_if_possible() # <<<<<<<<<<<<<< * if not thread_info.fully_initialized: * return _PyEval_EvalFrameDefault(frame_obj, exc) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_thread_info), __pyx_n_s_initialize_if_possible); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 76, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_thread_info), __pyx_n_s_initialize_if_possible); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -2302,12 +2291,12 @@ } __pyx_t_9 = (__pyx_t_8) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_8) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 76, __pyx_L1_error) + if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 74, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":77 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":75 * if not thread_info.fully_initialized: * thread_info.initialize_if_possible() * if not thread_info.fully_initialized: # <<<<<<<<<<<<<< @@ -2317,7 +2306,7 @@ __pyx_t_3 = ((!(__pyx_v_thread_info->fully_initialized != 0)) != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":78 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":76 * thread_info.initialize_if_possible() * if not thread_info.fully_initialized: * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2327,7 +2316,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":77 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":75 * if not thread_info.fully_initialized: * thread_info.initialize_if_possible() * if not thread_info.fully_initialized: # <<<<<<<<<<<<<< @@ -2336,7 +2325,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":75 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":73 * return _PyEval_EvalFrameDefault(frame_obj, exc) * * if not thread_info.fully_initialized: # <<<<<<<<<<<<<< @@ -2345,7 +2334,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":81 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":79 * * # Can only get additional_info when fully initialized. * cdef PyDBAdditionalThreadInfo additional_info = thread_info.additional_info # <<<<<<<<<<<<<< @@ -2357,7 +2346,7 @@ __pyx_v_additional_info = ((struct __pyx_obj_14_pydevd_bundle_13pydevd_cython_PyDBAdditionalThreadInfo *)__pyx_t_9); __pyx_t_9 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":82 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":80 * # Can only get additional_info when fully initialized. * cdef PyDBAdditionalThreadInfo additional_info = thread_info.additional_info * if thread_info.is_pydevd_thread or additional_info.is_tracing: # <<<<<<<<<<<<<< @@ -2375,7 +2364,7 @@ __pyx_L20_bool_binop_done:; if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":84 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":82 * if thread_info.is_pydevd_thread or additional_info.is_tracing: * # Make sure that we don't trace pydevd threads or inside our own calls. * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2385,7 +2374,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":82 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":80 * # Can only get additional_info when fully initialized. * cdef PyDBAdditionalThreadInfo additional_info = thread_info.additional_info * if thread_info.is_pydevd_thread or additional_info.is_tracing: # <<<<<<<<<<<<<< @@ -2394,7 +2383,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":91 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":89 * # print('get_bytecode_while_frame_eval', frame.f_lineno, frame.f_code.co_name, frame.f_code.co_filename) * * thread_info.inside_frame_eval += 1 # <<<<<<<<<<<<<< @@ -2403,7 +2392,7 @@ */ __pyx_v_thread_info->inside_frame_eval = (__pyx_v_thread_info->inside_frame_eval + 1); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":92 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":90 * * thread_info.inside_frame_eval += 1 * additional_info.is_tracing = True # <<<<<<<<<<<<<< @@ -2412,7 +2401,7 @@ */ __pyx_v_additional_info->is_tracing = 1; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":93 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":91 * thread_info.inside_frame_eval += 1 * additional_info.is_tracing = True * try: # <<<<<<<<<<<<<< @@ -2421,22 +2410,22 @@ */ /*try:*/ { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":94 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":92 * additional_info.is_tracing = True * try: * main_debugger: object = GlobalDebuggerHolder.global_dbg # <<<<<<<<<<<<<< * * if main_debugger is None or \ */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 94, __pyx_L23_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 92, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_global_dbg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 94, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_global_dbg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 92, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_v_main_debugger = __pyx_t_2; __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":96 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":94 * main_debugger: object = GlobalDebuggerHolder.global_dbg * * if main_debugger is None or \ # <<<<<<<<<<<<<< @@ -2451,14 +2440,14 @@ goto __pyx_L26_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":97 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":95 * * if main_debugger is None or \ * not hasattr(main_debugger, "break_on_caught_exceptions") or \ # <<<<<<<<<<<<<< * not hasattr(main_debugger, "has_plugin_exception_breaks") or \ * not hasattr(main_debugger, "stop_on_failed_tests") or \ */ - __pyx_t_4 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_break_on_caught_exceptions); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 97, __pyx_L23_error) + __pyx_t_4 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_break_on_caught_exceptions); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 95, __pyx_L23_error) __pyx_t_1 = ((!(__pyx_t_4 != 0)) != 0); if (!__pyx_t_1) { } else { @@ -2466,14 +2455,14 @@ goto __pyx_L26_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":98 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":96 * if main_debugger is None or \ * not hasattr(main_debugger, "break_on_caught_exceptions") or \ * not hasattr(main_debugger, "has_plugin_exception_breaks") or \ # <<<<<<<<<<<<<< * not hasattr(main_debugger, "stop_on_failed_tests") or \ * not hasattr(main_debugger, "signature_factory"): */ - __pyx_t_1 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_has_plugin_exception_breaks); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 98, __pyx_L23_error) + __pyx_t_1 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_has_plugin_exception_breaks); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 96, __pyx_L23_error) __pyx_t_4 = ((!(__pyx_t_1 != 0)) != 0); if (!__pyx_t_4) { } else { @@ -2481,14 +2470,14 @@ goto __pyx_L26_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":99 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":97 * not hasattr(main_debugger, "break_on_caught_exceptions") or \ * not hasattr(main_debugger, "has_plugin_exception_breaks") or \ * not hasattr(main_debugger, "stop_on_failed_tests") or \ # <<<<<<<<<<<<<< * not hasattr(main_debugger, "signature_factory"): * # Debugger isn't fully initialized here yet */ - __pyx_t_4 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_stop_on_failed_tests); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 99, __pyx_L23_error) + __pyx_t_4 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_stop_on_failed_tests); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 97, __pyx_L23_error) __pyx_t_1 = ((!(__pyx_t_4 != 0)) != 0); if (!__pyx_t_1) { } else { @@ -2496,19 +2485,19 @@ goto __pyx_L26_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":100 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":98 * not hasattr(main_debugger, "has_plugin_exception_breaks") or \ * not hasattr(main_debugger, "stop_on_failed_tests") or \ * not hasattr(main_debugger, "signature_factory"): # <<<<<<<<<<<<<< * # Debugger isn't fully initialized here yet * return _PyEval_EvalFrameDefault(frame_obj, exc) */ - __pyx_t_1 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_signature_factory); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 100, __pyx_L23_error) + __pyx_t_1 = __Pyx_HasAttr(__pyx_v_main_debugger, __pyx_n_u_signature_factory); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 98, __pyx_L23_error) __pyx_t_4 = ((!(__pyx_t_1 != 0)) != 0); __pyx_t_3 = __pyx_t_4; __pyx_L26_bool_binop_done:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":96 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":94 * main_debugger: object = GlobalDebuggerHolder.global_dbg * * if main_debugger is None or \ # <<<<<<<<<<<<<< @@ -2517,7 +2506,7 @@ */ if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":102 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":100 * not hasattr(main_debugger, "signature_factory"): * # Debugger isn't fully initialized here yet * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -2527,7 +2516,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L22_return; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":96 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":94 * main_debugger: object = GlobalDebuggerHolder.global_dbg * * if main_debugger is None or \ # <<<<<<<<<<<<<< @@ -2536,7 +2525,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":103 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":101 * # Debugger isn't fully initialized here yet * return _PyEval_EvalFrameDefault(frame_obj, exc) * frame = frame_obj # <<<<<<<<<<<<<< @@ -2548,7 +2537,7 @@ __pyx_v_frame = __pyx_t_2; __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":105 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":103 * frame = frame_obj * * if thread_info.thread_trace_func is None: # <<<<<<<<<<<<<< @@ -2559,14 +2548,14 @@ __pyx_t_4 = (__pyx_t_3 != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":106 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":104 * * if thread_info.thread_trace_func is None: * trace_func, apply_to_global = fix_top_level_trace_and_get_trace_func(main_debugger, frame) # <<<<<<<<<<<<<< * if apply_to_global: * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_fix_top_level_trace_and_get_trac); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 106, __pyx_L23_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_fix_top_level_trace_and_get_trac); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_8 = NULL; __pyx_t_11 = 0; @@ -2583,7 +2572,7 @@ #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_main_debugger, __pyx_v_frame}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 2+__pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 2+__pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_2); } else @@ -2591,13 +2580,13 @@ #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_main_debugger, __pyx_v_frame}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 2+__pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 2+__pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_2); } else #endif { - __pyx_t_10 = PyTuple_New(2+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_10 = PyTuple_New(2+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -2608,7 +2597,7 @@ __Pyx_INCREF(__pyx_v_frame); __Pyx_GIVEREF(__pyx_v_frame); PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_11, __pyx_v_frame); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_10, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_10, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } @@ -2619,7 +2608,7 @@ if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 106, __pyx_L23_error) + __PYX_ERR(0, 104, __pyx_L23_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -2632,15 +2621,15 @@ __Pyx_INCREF(__pyx_t_9); __Pyx_INCREF(__pyx_t_10); #else - __pyx_t_9 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_9 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 106, __pyx_L23_error) + __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 104, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_12 = Py_TYPE(__pyx_t_8)->tp_iternext; @@ -2648,7 +2637,7 @@ __Pyx_GOTREF(__pyx_t_9); index = 1; __pyx_t_10 = __pyx_t_12(__pyx_t_8); if (unlikely(!__pyx_t_10)) goto __pyx_L32_unpacking_failed; __Pyx_GOTREF(__pyx_t_10); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_8), 2) < 0) __PYX_ERR(0, 106, __pyx_L23_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_8), 2) < 0) __PYX_ERR(0, 104, __pyx_L23_error) __pyx_t_12 = NULL; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L33_unpacking_done; @@ -2656,7 +2645,7 @@ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_12 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 106, __pyx_L23_error) + __PYX_ERR(0, 104, __pyx_L23_error) __pyx_L33_unpacking_done:; } __pyx_v_trace_func = __pyx_t_9; @@ -2664,17 +2653,17 @@ __pyx_v_apply_to_global = __pyx_t_10; __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":107 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":105 * if thread_info.thread_trace_func is None: * trace_func, apply_to_global = fix_top_level_trace_and_get_trace_func(main_debugger, frame) * if apply_to_global: # <<<<<<<<<<<<<< * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ * */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_apply_to_global); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 107, __pyx_L23_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_apply_to_global); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 105, __pyx_L23_error) if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":108 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":106 * trace_func, apply_to_global = fix_top_level_trace_and_get_trace_func(main_debugger, frame) * if apply_to_global: * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ # <<<<<<<<<<<<<< @@ -2687,7 +2676,7 @@ __Pyx_DECREF(__pyx_v_thread_info->thread_trace_func); __pyx_v_thread_info->thread_trace_func = __pyx_v_trace_func; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":107 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":105 * if thread_info.thread_trace_func is None: * trace_func, apply_to_global = fix_top_level_trace_and_get_trace_func(main_debugger, frame) * if apply_to_global: # <<<<<<<<<<<<<< @@ -2696,7 +2685,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":105 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":103 * frame = frame_obj * * if thread_info.thread_trace_func is None: # <<<<<<<<<<<<<< @@ -2705,7 +2694,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":110 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":108 * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ * * if additional_info.pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_SMART_STEP_INTO) or \ # <<<<<<<<<<<<<< @@ -2735,16 +2724,16 @@ goto __pyx_L36_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":111 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":109 * * if additional_info.pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_SMART_STEP_INTO) or \ * main_debugger.break_on_caught_exceptions or \ # <<<<<<<<<<<<<< * main_debugger.has_plugin_exception_breaks or \ * main_debugger.signature_factory or \ */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_break_on_caught_exceptions); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_break_on_caught_exceptions); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 111, __pyx_L23_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 109, __pyx_L23_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_1) { } else { @@ -2752,16 +2741,16 @@ goto __pyx_L36_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":112 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":110 * if additional_info.pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_SMART_STEP_INTO) or \ * main_debugger.break_on_caught_exceptions or \ * main_debugger.has_plugin_exception_breaks or \ # <<<<<<<<<<<<<< * main_debugger.signature_factory or \ * additional_info.pydev_step_cmd == CMD_STEP_OVER and main_debugger.show_return_values and frame.f_back is additional_info.pydev_step_stop: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_has_plugin_exception_breaks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_has_plugin_exception_breaks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 112, __pyx_L23_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 110, __pyx_L23_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_1) { } else { @@ -2769,16 +2758,16 @@ goto __pyx_L36_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":113 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":111 * main_debugger.break_on_caught_exceptions or \ * main_debugger.has_plugin_exception_breaks or \ * main_debugger.signature_factory or \ # <<<<<<<<<<<<<< * additional_info.pydev_step_cmd == CMD_STEP_OVER and main_debugger.show_return_values and frame.f_back is additional_info.pydev_step_stop: * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_signature_factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_signature_factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 113, __pyx_L23_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 111, __pyx_L23_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (!__pyx_t_1) { } else { @@ -2786,7 +2775,7 @@ goto __pyx_L36_bool_binop_done; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":114 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":112 * main_debugger.has_plugin_exception_breaks or \ * main_debugger.signature_factory or \ * additional_info.pydev_step_cmd == CMD_STEP_OVER and main_debugger.show_return_values and frame.f_back is additional_info.pydev_step_stop: # <<<<<<<<<<<<<< @@ -2799,16 +2788,16 @@ __pyx_t_4 = __pyx_t_1; goto __pyx_L36_bool_binop_done; } - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_show_return_values); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_show_return_values); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 114, __pyx_L23_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 112, __pyx_L23_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_1) { } else { __pyx_t_4 = __pyx_t_1; goto __pyx_L36_bool_binop_done; } - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_back); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_frame, __pyx_n_s_f_back); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = (__pyx_t_2 == __pyx_v_additional_info->pydev_step_stop); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -2816,7 +2805,7 @@ __pyx_t_4 = __pyx_t_3; __pyx_L36_bool_binop_done:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":110 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":108 * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ * * if additional_info.pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_SMART_STEP_INTO) or \ # <<<<<<<<<<<<<< @@ -2825,7 +2814,7 @@ */ if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":116 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":114 * additional_info.pydev_step_cmd == CMD_STEP_OVER and main_debugger.show_return_values and frame.f_back is additional_info.pydev_step_stop: * * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -2836,7 +2825,7 @@ __pyx_t_3 = (__pyx_t_4 != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":117 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":115 * * if thread_info.thread_trace_func is not None: * frame.f_trace = thread_info.thread_trace_func # <<<<<<<<<<<<<< @@ -2845,10 +2834,10 @@ */ __pyx_t_2 = __pyx_v_thread_info->thread_trace_func; __Pyx_INCREF(__pyx_t_2); - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_2) < 0) __PYX_ERR(0, 117, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_2) < 0) __PYX_ERR(0, 115, __pyx_L23_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":116 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":114 * additional_info.pydev_step_cmd == CMD_STEP_OVER and main_debugger.show_return_values and frame.f_back is additional_info.pydev_step_stop: * * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -2858,7 +2847,7 @@ goto __pyx_L46; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":119 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":117 * frame.f_trace = thread_info.thread_trace_func * else: * frame.f_trace = main_debugger.trace_dispatch # <<<<<<<<<<<<<< @@ -2866,17 +2855,17 @@ * func_code_info: FuncCodeInfo = get_func_code_info(frame_obj.f_code) */ /*else*/ { - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 119, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_10 = __pyx_t_2; __Pyx_INCREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 119, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 117, __pyx_L23_error) __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } __pyx_L46:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":110 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":108 * thread_info.thread_trace_func = trace_func # ThreadTracer.__call__ * * if additional_info.pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_SMART_STEP_INTO) or \ # <<<<<<<<<<<<<< @@ -2886,7 +2875,7 @@ goto __pyx_L35; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":121 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":119 * frame.f_trace = main_debugger.trace_dispatch * else: * func_code_info: FuncCodeInfo = get_func_code_info(frame_obj.f_code) # <<<<<<<<<<<<<< @@ -2894,12 +2883,12 @@ * # print('get_bytecode_while_frame_eval always skip', func_code_info.always_skip_code) */ /*else*/ { - __pyx_t_10 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info(__pyx_v_frame_obj->f_code)); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 121, __pyx_L23_error) + __pyx_t_10 = ((PyObject *)__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info(__pyx_v_frame_obj->f_code)); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 119, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); __pyx_v_func_code_info = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *)__pyx_t_10); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":124 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":122 * # if DEBUG: * # print('get_bytecode_while_frame_eval always skip', func_code_info.always_skip_code) * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -2909,29 +2898,29 @@ __pyx_t_3 = ((!(__pyx_v_func_code_info->always_skip_code != 0)) != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":126 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":124 * if not func_code_info.always_skip_code: * * if main_debugger.has_plugin_line_breaks: # <<<<<<<<<<<<<< * can_skip = not main_debugger.plugin.can_not_skip(main_debugger, None, frame_obj, None) * */ - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_has_plugin_line_breaks); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 126, __pyx_L23_error) + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_has_plugin_line_breaks); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 124, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 126, __pyx_L23_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 124, __pyx_L23_error) __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":127 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":125 * * if main_debugger.has_plugin_line_breaks: * can_skip = not main_debugger.plugin.can_not_skip(main_debugger, None, frame_obj, None) # <<<<<<<<<<<<<< * * if not can_skip: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_plugin); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_plugin); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_can_not_skip); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_can_not_skip); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -2949,7 +2938,7 @@ #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[5] = {__pyx_t_2, __pyx_v_main_debugger, Py_None, ((PyObject *)__pyx_v_frame_obj), Py_None}; - __pyx_t_10 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 4+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_10 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 4+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_10); } else @@ -2957,13 +2946,13 @@ #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[5] = {__pyx_t_2, __pyx_v_main_debugger, Py_None, ((PyObject *)__pyx_v_frame_obj), Py_None}; - __pyx_t_10 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 4+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_10 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_11, 4+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_10); } else #endif { - __pyx_t_8 = PyTuple_New(4+__pyx_t_11); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_8 = PyTuple_New(4+__pyx_t_11); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -2980,16 +2969,16 @@ __Pyx_INCREF(Py_None); __Pyx_GIVEREF(Py_None); PyTuple_SET_ITEM(__pyx_t_8, 3+__pyx_t_11, Py_None); - __pyx_t_10 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_8, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_10 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_8, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 127, __pyx_L23_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_10); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 125, __pyx_L23_error) __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; __pyx_v_can_skip = (!__pyx_t_3); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":129 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":127 * can_skip = not main_debugger.plugin.can_not_skip(main_debugger, None, frame_obj, None) * * if not can_skip: # <<<<<<<<<<<<<< @@ -2999,7 +2988,7 @@ __pyx_t_3 = ((!(__pyx_v_can_skip != 0)) != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":132 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":130 * # if DEBUG: * # print('get_bytecode_while_frame_eval not can_skip') * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -3010,7 +2999,7 @@ __pyx_t_4 = (__pyx_t_3 != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":133 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":131 * # print('get_bytecode_while_frame_eval not can_skip') * if thread_info.thread_trace_func is not None: * frame.f_trace = thread_info.thread_trace_func # <<<<<<<<<<<<<< @@ -3019,10 +3008,10 @@ */ __pyx_t_10 = __pyx_v_thread_info->thread_trace_func; __Pyx_INCREF(__pyx_t_10); - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 133, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 131, __pyx_L23_error) __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":132 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":130 * # if DEBUG: * # print('get_bytecode_while_frame_eval not can_skip') * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -3032,7 +3021,7 @@ goto __pyx_L50; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":135 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":133 * frame.f_trace = thread_info.thread_trace_func * else: * frame.f_trace = main_debugger.trace_dispatch # <<<<<<<<<<<<<< @@ -3040,17 +3029,17 @@ * if (can_skip and func_code_info.breakpoint_found) or main_debugger.stop_on_failed_tests: */ /*else*/ { - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 135, __pyx_L23_error) + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 133, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); __pyx_t_9 = __pyx_t_10; __Pyx_INCREF(__pyx_t_9); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_9) < 0) __PYX_ERR(0, 135, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_9) < 0) __PYX_ERR(0, 133, __pyx_L23_error) __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __pyx_L50:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":129 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":127 * can_skip = not main_debugger.plugin.can_not_skip(main_debugger, None, frame_obj, None) * * if not can_skip: # <<<<<<<<<<<<<< @@ -3059,7 +3048,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":126 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":124 * if not func_code_info.always_skip_code: * * if main_debugger.has_plugin_line_breaks: # <<<<<<<<<<<<<< @@ -3068,7 +3057,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":137 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":135 * frame.f_trace = main_debugger.trace_dispatch * * if (can_skip and func_code_info.breakpoint_found) or main_debugger.stop_on_failed_tests: # <<<<<<<<<<<<<< @@ -3087,15 +3076,15 @@ goto __pyx_L52_bool_binop_done; } __pyx_L53_next_or:; - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_stop_on_failed_tests); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 137, __pyx_L23_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_stop_on_failed_tests); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 135, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 137, __pyx_L23_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 135, __pyx_L23_error) __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_t_4 = __pyx_t_3; __pyx_L52_bool_binop_done:; if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":144 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":142 * # this means we weren't able to actually add the code * # where needed, so, fallback to tracing. * if func_code_info.new_code is None: # <<<<<<<<<<<<<< @@ -3106,7 +3095,7 @@ __pyx_t_3 = (__pyx_t_4 != 0); if (__pyx_t_3) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":145 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":143 * # where needed, so, fallback to tracing. * if func_code_info.new_code is None: * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -3117,7 +3106,7 @@ __pyx_t_4 = (__pyx_t_3 != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":146 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":144 * if func_code_info.new_code is None: * if thread_info.thread_trace_func is not None: * frame.f_trace = thread_info.thread_trace_func # <<<<<<<<<<<<<< @@ -3126,10 +3115,10 @@ */ __pyx_t_9 = __pyx_v_thread_info->thread_trace_func; __Pyx_INCREF(__pyx_t_9); - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_9) < 0) __PYX_ERR(0, 146, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_9) < 0) __PYX_ERR(0, 144, __pyx_L23_error) __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":145 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":143 * # where needed, so, fallback to tracing. * if func_code_info.new_code is None: * if thread_info.thread_trace_func is not None: # <<<<<<<<<<<<<< @@ -3139,7 +3128,7 @@ goto __pyx_L56; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":148 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":146 * frame.f_trace = thread_info.thread_trace_func * else: * frame.f_trace = main_debugger.trace_dispatch # <<<<<<<<<<<<<< @@ -3147,17 +3136,17 @@ * # print('Using frame eval break for', frame_obj.f_code.co_name) */ /*else*/ { - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 148, __pyx_L23_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_trace_dispatch); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 146, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10 = __pyx_t_9; __Pyx_INCREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 148, __pyx_L23_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_frame, __pyx_n_s_f_trace, __pyx_t_10) < 0) __PYX_ERR(0, 146, __pyx_L23_error) __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } __pyx_L56:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":144 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":142 * # this means we weren't able to actually add the code * # where needed, so, fallback to tracing. * if func_code_info.new_code is None: # <<<<<<<<<<<<<< @@ -3167,7 +3156,7 @@ goto __pyx_L55; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":151 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":149 * else: * # print('Using frame eval break for', frame_obj.f_code.co_name) * update_globals_dict( frame_obj.f_globals) # <<<<<<<<<<<<<< @@ -3175,7 +3164,7 @@ * old = frame_obj.f_code */ /*else*/ { - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_update_globals_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 151, __pyx_L23_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_update_globals_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 149, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_9))) { @@ -3189,12 +3178,12 @@ } __pyx_t_10 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_9, __pyx_t_8, ((PyObject *)__pyx_v_frame_obj->f_globals)) : __Pyx_PyObject_CallOneArg(__pyx_t_9, ((PyObject *)__pyx_v_frame_obj->f_globals)); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 151, __pyx_L23_error) + if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 149, __pyx_L23_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":152 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":150 * # print('Using frame eval break for', frame_obj.f_code.co_name) * update_globals_dict( frame_obj.f_globals) * Py_INCREF(func_code_info.new_code) # <<<<<<<<<<<<<< @@ -3206,7 +3195,7 @@ Py_INCREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":153 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":151 * update_globals_dict( frame_obj.f_globals) * Py_INCREF(func_code_info.new_code) * old = frame_obj.f_code # <<<<<<<<<<<<<< @@ -3218,7 +3207,7 @@ __pyx_v_old = __pyx_t_10; __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":154 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":152 * Py_INCREF(func_code_info.new_code) * old = frame_obj.f_code * frame_obj.f_code = func_code_info.new_code # <<<<<<<<<<<<<< @@ -3227,7 +3216,7 @@ */ __pyx_v_frame_obj->f_code = ((PyCodeObject *)__pyx_v_func_code_info->new_code); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":155 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":153 * old = frame_obj.f_code * frame_obj.f_code = func_code_info.new_code * Py_DECREF(old) # <<<<<<<<<<<<<< @@ -3238,7 +3227,7 @@ } __pyx_L55:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":137 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":135 * frame.f_trace = main_debugger.trace_dispatch * * if (can_skip and func_code_info.breakpoint_found) or main_debugger.stop_on_failed_tests: # <<<<<<<<<<<<<< @@ -3247,7 +3236,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":124 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":122 * # if DEBUG: * # print('get_bytecode_while_frame_eval always skip', func_code_info.always_skip_code) * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -3259,7 +3248,7 @@ __pyx_L35:; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":158 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":156 * * finally: * thread_info.inside_frame_eval -= 1 # <<<<<<<<<<<<<< @@ -3270,7 +3259,7 @@ /*normal exit:*/{ __pyx_v_thread_info->inside_frame_eval = (__pyx_v_thread_info->inside_frame_eval - 1); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":159 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":157 * finally: * thread_info.inside_frame_eval -= 1 * additional_info.is_tracing = False # <<<<<<<<<<<<<< @@ -3300,7 +3289,7 @@ __pyx_t_11 = __pyx_lineno; __pyx_t_13 = __pyx_clineno; __pyx_t_14 = __pyx_filename; { - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":158 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":156 * * finally: * thread_info.inside_frame_eval -= 1 # <<<<<<<<<<<<<< @@ -3309,7 +3298,7 @@ */ __pyx_v_thread_info->inside_frame_eval = (__pyx_v_thread_info->inside_frame_eval - 1); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":159 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":157 * finally: * thread_info.inside_frame_eval -= 1 * additional_info.is_tracing = False # <<<<<<<<<<<<<< @@ -3335,7 +3324,7 @@ __pyx_L22_return: { __pyx_t_18 = __pyx_r; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":158 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":156 * * finally: * thread_info.inside_frame_eval -= 1 # <<<<<<<<<<<<<< @@ -3344,7 +3333,7 @@ */ __pyx_v_thread_info->inside_frame_eval = (__pyx_v_thread_info->inside_frame_eval - 1); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":159 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":157 * finally: * thread_info.inside_frame_eval -= 1 * additional_info.is_tracing = False # <<<<<<<<<<<<<< @@ -3358,7 +3347,7 @@ __pyx_L24:; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":161 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":159 * additional_info.is_tracing = False * * return _PyEval_EvalFrameDefault(frame_obj, exc) # <<<<<<<<<<<<<< @@ -3368,7 +3357,7 @@ __pyx_r = _PyEval_EvalFrameDefault(__pyx_v_frame_obj, __pyx_v_exc); goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":45 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":43 * * * cdef PyObject * get_bytecode_while_frame_eval(PyFrameObject * frame_obj, int exc): # <<<<<<<<<<<<<< @@ -3397,7 +3386,7 @@ return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":164 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":162 * * * def frame_eval_func(): # <<<<<<<<<<<<<< @@ -3432,7 +3421,7 @@ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("frame_eval_func", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":165 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":163 * * def frame_eval_func(): * cdef PyThreadState *state = PyThreadState_Get() # <<<<<<<<<<<<<< @@ -3441,7 +3430,7 @@ */ __pyx_v_state = PyThreadState_Get(); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":166 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":164 * def frame_eval_func(): * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = get_bytecode_while_frame_eval # <<<<<<<<<<<<<< @@ -3450,19 +3439,19 @@ */ __pyx_v_state->interp->eval_frame = __pyx_f_18_pydevd_frame_eval_22pydevd_frame_evaluator_get_bytecode_while_frame_eval; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":168 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":166 * state.interp.eval_frame = get_bytecode_while_frame_eval * global dummy_tracing_holder * dummy_tracing_holder.set_trace_func(dummy_trace_dispatch) # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_dummy_tracing_holder); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 168, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_dummy_tracing_holder); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_set_trace_func); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_set_trace_func); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_dummy_trace_dispatch); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 168, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_dummy_trace_dispatch); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { @@ -3477,12 +3466,12 @@ __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_4, __pyx_t_2) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 168, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":164 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":162 * * * def frame_eval_func(): # <<<<<<<<<<<<<< @@ -3506,7 +3495,7 @@ return __pyx_r; } -/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":171 +/* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":169 * * * def stop_frame_eval(): # <<<<<<<<<<<<<< @@ -3534,7 +3523,7 @@ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("stop_frame_eval", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":172 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":170 * * def stop_frame_eval(): * cdef PyThreadState *state = PyThreadState_Get() # <<<<<<<<<<<<<< @@ -3542,14 +3531,14 @@ */ __pyx_v_state = PyThreadState_Get(); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":173 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":171 * def stop_frame_eval(): * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = _PyEval_EvalFrameDefault # <<<<<<<<<<<<<< */ __pyx_v_state->interp->eval_frame = _PyEval_EvalFrameDefault; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":171 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":169 * * * def stop_frame_eval(): # <<<<<<<<<<<<<< @@ -3616,7 +3605,7 @@ {&__pyx_n_u_break_on_caught_exceptions, __pyx_k_break_on_caught_exceptions, sizeof(__pyx_k_break_on_caught_exceptions), 0, 1, 0, 1}, {&__pyx_n_u_call, __pyx_k_call, sizeof(__pyx_k_call), 0, 1, 0, 1}, {&__pyx_n_s_can_not_skip, __pyx_k_can_not_skip, sizeof(__pyx_k_can_not_skip), 0, 0, 1, 1}, - {&__pyx_n_s_clear_thread_local_info, __pyx_k_clear_thread_local_info, sizeof(__pyx_k_clear_thread_local_info), 0, 0, 1, 1}, + {&__pyx_n_s_clear_thread_local_info_py, __pyx_k_clear_thread_local_info_py, sizeof(__pyx_k_clear_thread_local_info_py), 0, 0, 1, 1}, {&__pyx_n_s_cline_in_traceback, __pyx_k_cline_in_traceback, sizeof(__pyx_k_cline_in_traceback), 0, 0, 1, 1}, {&__pyx_n_s_code_obj, __pyx_k_code_obj, sizeof(__pyx_k_code_obj), 0, 0, 1, 1}, {&__pyx_n_s_decref_py, __pyx_k_decref_py, sizeof(__pyx_k_decref_py), 0, 0, 1, 1}, @@ -3636,7 +3625,6 @@ {&__pyx_n_s_has_plugin_line_breaks, __pyx_k_has_plugin_line_breaks, sizeof(__pyx_k_has_plugin_line_breaks), 0, 0, 1, 1}, {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1}, {&__pyx_n_s_initialize_if_possible, __pyx_k_initialize_if_possible, sizeof(__pyx_k_initialize_if_possible), 0, 0, 1, 1}, - {&__pyx_n_s_local, __pyx_k_local, sizeof(__pyx_k_local), 0, 0, 1, 1}, {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1}, {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1}, {&__pyx_n_s_obj, __pyx_k_obj, sizeof(__pyx_k_obj), 0, 0, 1, 1}, @@ -3645,8 +3633,9 @@ {&__pyx_n_s_pydevd_bundle_pydevd_comm, __pyx_k_pydevd_bundle_pydevd_comm, sizeof(__pyx_k_pydevd_bundle_pydevd_comm), 0, 0, 1, 1}, {&__pyx_n_s_pydevd_bundle_pydevd_trace_disp, __pyx_k_pydevd_bundle_pydevd_trace_disp, sizeof(__pyx_k_pydevd_bundle_pydevd_trace_disp), 0, 0, 1, 1}, {&__pyx_n_s_pydevd_frame_eval_pydevd_frame, __pyx_k_pydevd_frame_eval_pydevd_frame, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame), 0, 0, 1, 1}, - {&__pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_k_pydevd_frame_eval_pydevd_frame_2, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame_2), 0, 0, 1, 0}, - {&__pyx_n_s_pydevd_frame_eval_pydevd_frame_3, __pyx_k_pydevd_frame_eval_pydevd_frame_3, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame_3), 0, 0, 1, 1}, + {&__pyx_n_s_pydevd_frame_eval_pydevd_frame_2, __pyx_k_pydevd_frame_eval_pydevd_frame_2, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame_2), 0, 0, 1, 1}, + {&__pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_k_pydevd_frame_eval_pydevd_frame_3, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame_3), 0, 0, 1, 0}, + {&__pyx_n_s_pydevd_frame_eval_pydevd_frame_4, __pyx_k_pydevd_frame_eval_pydevd_frame_4, sizeof(__pyx_k_pydevd_frame_eval_pydevd_frame_4), 0, 0, 1, 1}, {&__pyx_n_s_set_trace_func, __pyx_k_set_trace_func, sizeof(__pyx_k_set_trace_func), 0, 0, 1, 1}, {&__pyx_n_s_show_return_values, __pyx_k_show_return_values, sizeof(__pyx_k_show_return_values), 0, 0, 1, 1}, {&__pyx_n_s_signature_factory, __pyx_k_signature_factory, sizeof(__pyx_k_signature_factory), 0, 0, 1, 1}, @@ -3671,83 +3660,83 @@ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":15 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":14 + * * + * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< + * return get_thread_info() * - * def clear_thread_local_info(): # <<<<<<<<<<<<<< - * global _thread_local_info - * _thread_local_info = threading.local() */ - __pyx_codeobj_ = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_clear_thread_local_info, 15, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj_)) __PYX_ERR(0, 15, __pyx_L1_error) + __pyx_codeobj_ = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_get_thread_info_py, 14, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj_)) __PYX_ERR(0, 14, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":20 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":18 * * - * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< - * return get_thread_info() + * def clear_thread_local_info_py(): # <<<<<<<<<<<<<< + * clear_thread_local_info() * */ - __pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_get_thread_info_py, 20, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 20, __pyx_L1_error) + __pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_clear_thread_local_info_py, 18, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 18, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":22 * * * def dummy_trace_dispatch(frame, str event, arg): # <<<<<<<<<<<<<< * if event == 'call': * if frame.f_trace is not None: */ - __pyx_tuple__3 = PyTuple_Pack(3, __pyx_n_s_frame, __pyx_n_s_event, __pyx_n_s_arg); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 24, __pyx_L1_error) + __pyx_tuple__3 = PyTuple_Pack(3, __pyx_n_s_frame, __pyx_n_s_event, __pyx_n_s_arg); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 22, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__3); __Pyx_GIVEREF(__pyx_tuple__3); - __pyx_codeobj__4 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__3, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_dummy_trace_dispatch, 24, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__4)) __PYX_ERR(0, 24, __pyx_L1_error) + __pyx_codeobj__4 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__3, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_dummy_trace_dispatch, 22, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__4)) __PYX_ERR(0, 22, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":31 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":29 * * * def decref_py(obj): # <<<<<<<<<<<<<< * ''' * Helper to be called from Python. */ - __pyx_tuple__5 = PyTuple_Pack(1, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 31, __pyx_L1_error) + __pyx_tuple__5 = PyTuple_Pack(1, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 29, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__5); __Pyx_GIVEREF(__pyx_tuple__5); - __pyx_codeobj__6 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__5, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_decref_py, 31, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__6)) __PYX_ERR(0, 31, __pyx_L1_error) + __pyx_codeobj__6 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__5, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_decref_py, 29, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__6)) __PYX_ERR(0, 29, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":38 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":36 * * * def get_func_code_info_py(code_obj) -> FuncCodeInfo: # <<<<<<<<<<<<<< * ''' * Helper to be called from Python. */ - __pyx_tuple__7 = PyTuple_Pack(1, __pyx_n_s_code_obj); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 38, __pyx_L1_error) + __pyx_tuple__7 = PyTuple_Pack(1, __pyx_n_s_code_obj); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 36, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__7); __Pyx_GIVEREF(__pyx_tuple__7); - __pyx_codeobj__8 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__7, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_get_func_code_info_py, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__8)) __PYX_ERR(0, 38, __pyx_L1_error) + __pyx_codeobj__8 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__7, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_get_func_code_info_py, 36, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__8)) __PYX_ERR(0, 36, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":164 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":162 * * * def frame_eval_func(): # <<<<<<<<<<<<<< * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = get_bytecode_while_frame_eval */ - __pyx_tuple__9 = PyTuple_Pack(1, __pyx_n_s_state); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 164, __pyx_L1_error) + __pyx_tuple__9 = PyTuple_Pack(1, __pyx_n_s_state); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 162, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__9); __Pyx_GIVEREF(__pyx_tuple__9); - __pyx_codeobj__10 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__9, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_frame_eval_func, 164, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__10)) __PYX_ERR(0, 164, __pyx_L1_error) + __pyx_codeobj__10 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__9, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_frame_eval_func, 162, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__10)) __PYX_ERR(0, 162, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":171 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":169 * * * def stop_frame_eval(): # <<<<<<<<<<<<<< * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = _PyEval_EvalFrameDefault */ - __pyx_tuple__11 = PyTuple_Pack(1, __pyx_n_s_state); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 171, __pyx_L1_error) + __pyx_tuple__11 = PyTuple_Pack(1, __pyx_n_s_state); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 169, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__11); __Pyx_GIVEREF(__pyx_tuple__11); - __pyx_codeobj__12 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__11, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_2, __pyx_n_s_stop_frame_eval, 171, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__12)) __PYX_ERR(0, 171, __pyx_L1_error) + __pyx_codeobj__12 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__11, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pydevd_frame_eval_pydevd_frame_3, __pyx_n_s_stop_frame_eval, 169, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__12)) __PYX_ERR(0, 169, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -3849,9 +3838,11 @@ __Pyx_RefNannySetupContext("__Pyx_modinit_function_import_code", 0); /*--- Function import code ---*/ __pyx_t_1 = PyImport_ImportModule("_pydevd_frame_eval.pydevd_frame_evaluator_common"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); if (__Pyx_ImportFunction(__pyx_t_1, "get_thread_info", (void (**)(void))&__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info, "struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *(void)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) if (__Pyx_ImportFunction(__pyx_t_1, "get_func_code_info", (void (**)(void))&__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info, "struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *(PyCodeObject *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) - Py_DECREF(__pyx_t_1); __pyx_t_1 = 0; + if (__Pyx_ImportFunction(__pyx_t_1, "clear_thread_local_info", (void (**)(void))&__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_clear_thread_local_info, "PyObject *(void)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -4153,117 +4144,120 @@ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":12 - * - * - * _thread_local_info = threading.local() # <<<<<<<<<<<<<< + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":11 + * from _pydevd_frame_eval.pydevd_frame_evaluator_common cimport ThreadInfo, FuncCodeInfo, get_thread_info, get_func_code_info, \ + * clear_thread_local_info + * from _pydevd_frame_eval.pydevd_frame_evaluator_common import _thread_local_info # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_threading); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 12, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_local); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 12, __pyx_L1_error) + __Pyx_INCREF(__pyx_n_s_thread_local_info); + __Pyx_GIVEREF(__pyx_n_s_thread_local_info); + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_thread_local_info); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_pydevd_frame_eval_pydevd_frame_2, __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 12, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_thread_local_info); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (PyDict_SetItem(__pyx_d, __pyx_n_s_thread_local_info, __pyx_t_1) < 0) __PYX_ERR(0, 12, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_thread_local_info, __pyx_t_1) < 0) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":15 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":14 + * * + * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< + * return get_thread_info() * - * def clear_thread_local_info(): # <<<<<<<<<<<<<< - * global _thread_local_info - * _thread_local_info = threading.local() */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_1clear_thread_local_info, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 15, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_clear_thread_local_info, __pyx_t_1) < 0) __PYX_ERR(0, 15, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_1get_thread_info_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 14, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_thread_info_py, __pyx_t_2) < 0) __PYX_ERR(0, 14, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":20 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":18 * * - * def get_thread_info_py() -> ThreadInfo: # <<<<<<<<<<<<<< - * return get_thread_info() + * def clear_thread_local_info_py(): # <<<<<<<<<<<<<< + * clear_thread_local_info() * */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_3get_thread_info_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 20, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_thread_info_py, __pyx_t_1) < 0) __PYX_ERR(0, 20, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_3clear_thread_local_info_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 18, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_clear_thread_local_info_py, __pyx_t_2) < 0) __PYX_ERR(0, 18, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":24 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":22 * * * def dummy_trace_dispatch(frame, str event, arg): # <<<<<<<<<<<<<< * if event == 'call': * if frame.f_trace is not None: */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_5dummy_trace_dispatch, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 24, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dummy_trace_dispatch, __pyx_t_1) < 0) __PYX_ERR(0, 24, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_5dummy_trace_dispatch, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dummy_trace_dispatch, __pyx_t_2) < 0) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":31 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":29 * * * def decref_py(obj): # <<<<<<<<<<<<<< * ''' * Helper to be called from Python. */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_7decref_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 31, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_decref_py, __pyx_t_1) < 0) __PYX_ERR(0, 31, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_7decref_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 29, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_decref_py, __pyx_t_2) < 0) __PYX_ERR(0, 29, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":38 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":36 * * * def get_func_code_info_py(code_obj) -> FuncCodeInfo: # <<<<<<<<<<<<<< * ''' * Helper to be called from Python. */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_9get_func_code_info_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 38, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_func_code_info_py, __pyx_t_1) < 0) __PYX_ERR(0, 38, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_9get_func_code_info_py, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 36, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_func_code_info_py, __pyx_t_2) < 0) __PYX_ERR(0, 36, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":164 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":162 * * * def frame_eval_func(): # <<<<<<<<<<<<<< * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = get_bytecode_while_frame_eval */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_11frame_eval_func, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 164, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_frame_eval_func, __pyx_t_1) < 0) __PYX_ERR(0, 164, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_11frame_eval_func, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 162, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_frame_eval_func, __pyx_t_2) < 0) __PYX_ERR(0, 162, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":171 + /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":169 * * * def stop_frame_eval(): # <<<<<<<<<<<<<< * cdef PyThreadState *state = PyThreadState_Get() * state.interp.eval_frame = _PyEval_EvalFrameDefault */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_13stop_frame_eval, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 171, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_stop_frame_eval, __pyx_t_1) < 0) __PYX_ERR(0, 171, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_18_pydevd_frame_eval_22pydevd_frame_evaluator_13stop_frame_eval, NULL, __pyx_n_s_pydevd_frame_eval_pydevd_frame_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 169, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_stop_frame_eval, __pyx_t_2) < 0) __PYX_ERR(0, 169, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "_pydevd_frame_eval/pydevd_frame_evaluator.pyx":1 * from __future__ import print_function # <<<<<<<<<<<<<< * from _pydev_imps._pydev_saved_modules import threading * from _pydevd_bundle.pydevd_comm import GlobalDebuggerHolder */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_1) < 0) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_2) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /*--- Wrapped vars code ---*/ @@ -4308,377 +4302,44 @@ } #endif -/* PyObjectGetAttrStr */ -#if CYTHON_USE_TYPE_SLOTS -static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name) { - PyTypeObject* tp = Py_TYPE(obj); - if (likely(tp->tp_getattro)) - return tp->tp_getattro(obj, attr_name); -#if PY_MAJOR_VERSION < 3 - if (likely(tp->tp_getattr)) - return tp->tp_getattr(obj, PyString_AS_STRING(attr_name)); -#endif - return PyObject_GetAttr(obj, attr_name); -} -#endif - -/* GetBuiltinName */ -static PyObject *__Pyx_GetBuiltinName(PyObject *name) { - PyObject* result = __Pyx_PyObject_GetAttrStr(__pyx_b, name); - if (unlikely(!result)) { - PyErr_Format(PyExc_NameError, -#if PY_MAJOR_VERSION >= 3 - "name '%U' is not defined", name); -#else - "name '%.200s' is not defined", PyString_AS_STRING(name)); -#endif +/* RaiseArgTupleInvalid */ +static void __Pyx_RaiseArgtupleInvalid( + const char* func_name, + int exact, + Py_ssize_t num_min, + Py_ssize_t num_max, + Py_ssize_t num_found) +{ + Py_ssize_t num_expected; + const char *more_or_less; + if (num_found < num_min) { + num_expected = num_min; + more_or_less = "at least"; + } else { + num_expected = num_max; + more_or_less = "at most"; } - return result; -} - -/* PyDictVersioning */ -#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS -static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) { - PyObject *dict = Py_TYPE(obj)->tp_dict; - return likely(dict) ? __PYX_GET_DICT_VERSION(dict) : 0; -} -static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj) { - PyObject **dictptr = NULL; - Py_ssize_t offset = Py_TYPE(obj)->tp_dictoffset; - if (offset) { -#if CYTHON_COMPILING_IN_CPYTHON - dictptr = (likely(offset > 0)) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj); -#else - dictptr = _PyObject_GetDictPtr(obj); -#endif + if (exact) { + more_or_less = "exactly"; } - return (dictptr && *dictptr) ? __PYX_GET_DICT_VERSION(*dictptr) : 0; -} -static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version) { - PyObject *dict = Py_TYPE(obj)->tp_dict; - if (unlikely(!dict) || unlikely(tp_dict_version != __PYX_GET_DICT_VERSION(dict))) - return 0; - return obj_dict_version == __Pyx_get_object_dict_version(obj); + PyErr_Format(PyExc_TypeError, + "%.200s() takes %.8s %" CYTHON_FORMAT_SSIZE_T "d positional argument%.1s (%" CYTHON_FORMAT_SSIZE_T "d given)", + func_name, more_or_less, num_expected, + (num_expected == 1) ? "" : "s", num_found); } -#endif -/* GetModuleGlobalName */ -#if CYTHON_USE_DICT_VERSIONS -static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value) -#else -static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name) -#endif +/* RaiseDoubleKeywords */ +static void __Pyx_RaiseDoubleKeywordsError( + const char* func_name, + PyObject* kw_name) { - PyObject *result; -#if !CYTHON_AVOID_BORROWED_REFS -#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1 - result = _PyDict_GetItem_KnownHash(__pyx_d, name, ((PyASCIIObject *) name)->hash); - __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) - if (likely(result)) { - return __Pyx_NewRef(result); - } else if (unlikely(PyErr_Occurred())) { - return NULL; - } -#else - result = PyDict_GetItem(__pyx_d, name); - __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) - if (likely(result)) { - return __Pyx_NewRef(result); - } -#endif -#else - result = PyObject_GetItem(__pyx_d, name); - __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) - if (likely(result)) { - return __Pyx_NewRef(result); - } - PyErr_Clear(); -#endif - return __Pyx_GetBuiltinName(name); -} - -/* PyFunctionFastCall */ -#if CYTHON_FAST_PYCALL -static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na, - PyObject *globals) { - PyFrameObject *f; - PyThreadState *tstate = __Pyx_PyThreadState_Current; - PyObject **fastlocals; - Py_ssize_t i; - PyObject *result; - assert(globals != NULL); - /* XXX Perhaps we should create a specialized - PyFrame_New() that doesn't take locals, but does - take builtins without sanity checking them. - */ - assert(tstate != NULL); - f = PyFrame_New(tstate, co, globals, NULL); - if (f == NULL) { - return NULL; - } - fastlocals = __Pyx_PyFrame_GetLocalsplus(f); - for (i = 0; i < na; i++) { - Py_INCREF(*args); - fastlocals[i] = *args++; - } - result = PyEval_EvalFrameEx(f,0); - ++tstate->recursion_depth; - Py_DECREF(f); - --tstate->recursion_depth; - return result; -} -#if 1 || PY_VERSION_HEX < 0x030600B1 -static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs) { - PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func); - PyObject *globals = PyFunction_GET_GLOBALS(func); - PyObject *argdefs = PyFunction_GET_DEFAULTS(func); - PyObject *closure; -#if PY_MAJOR_VERSION >= 3 - PyObject *kwdefs; -#endif - PyObject *kwtuple, **k; - PyObject **d; - Py_ssize_t nd; - Py_ssize_t nk; - PyObject *result; - assert(kwargs == NULL || PyDict_Check(kwargs)); - nk = kwargs ? PyDict_Size(kwargs) : 0; - if (Py_EnterRecursiveCall((char*)" while calling a Python object")) { - return NULL; - } - if ( -#if PY_MAJOR_VERSION >= 3 - co->co_kwonlyargcount == 0 && -#endif - likely(kwargs == NULL || nk == 0) && - co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) { - if (argdefs == NULL && co->co_argcount == nargs) { - result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals); - goto done; - } - else if (nargs == 0 && argdefs != NULL - && co->co_argcount == Py_SIZE(argdefs)) { - /* function called with no arguments, but all parameters have - a default value: use default values as arguments .*/ - args = &PyTuple_GET_ITEM(argdefs, 0); - result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals); - goto done; - } - } - if (kwargs != NULL) { - Py_ssize_t pos, i; - kwtuple = PyTuple_New(2 * nk); - if (kwtuple == NULL) { - result = NULL; - goto done; - } - k = &PyTuple_GET_ITEM(kwtuple, 0); - pos = i = 0; - while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) { - Py_INCREF(k[i]); - Py_INCREF(k[i+1]); - i += 2; - } - nk = i / 2; - } - else { - kwtuple = NULL; - k = NULL; - } - closure = PyFunction_GET_CLOSURE(func); -#if PY_MAJOR_VERSION >= 3 - kwdefs = PyFunction_GET_KW_DEFAULTS(func); -#endif - if (argdefs != NULL) { - d = &PyTuple_GET_ITEM(argdefs, 0); - nd = Py_SIZE(argdefs); - } - else { - d = NULL; - nd = 0; - } -#if PY_MAJOR_VERSION >= 3 - result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL, - args, (int)nargs, - k, (int)nk, - d, (int)nd, kwdefs, closure); -#else - result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL, - args, (int)nargs, - k, (int)nk, - d, (int)nd, closure); -#endif - Py_XDECREF(kwtuple); -done: - Py_LeaveRecursiveCall(); - return result; -} -#endif -#endif - -/* PyObjectCall */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) { - PyObject *result; - ternaryfunc call = func->ob_type->tp_call; - if (unlikely(!call)) - return PyObject_Call(func, arg, kw); - if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) - return NULL; - result = (*call)(func, arg, kw); - Py_LeaveRecursiveCall(); - if (unlikely(!result) && unlikely(!PyErr_Occurred())) { - PyErr_SetString( - PyExc_SystemError, - "NULL result without error in PyObject_Call"); - } - return result; -} -#endif - -/* PyObjectCallMethO */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) { - PyObject *self, *result; - PyCFunction cfunc; - cfunc = PyCFunction_GET_FUNCTION(func); - self = PyCFunction_GET_SELF(func); - if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) - return NULL; - result = cfunc(self, arg); - Py_LeaveRecursiveCall(); - if (unlikely(!result) && unlikely(!PyErr_Occurred())) { - PyErr_SetString( - PyExc_SystemError, - "NULL result without error in PyObject_Call"); - } - return result; -} -#endif - -/* PyObjectCallNoArg */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { -#if CYTHON_FAST_PYCALL - if (PyFunction_Check(func)) { - return __Pyx_PyFunction_FastCall(func, NULL, 0); - } -#endif -#ifdef __Pyx_CyFunction_USED - if (likely(PyCFunction_Check(func) || __Pyx_CyFunction_Check(func))) -#else - if (likely(PyCFunction_Check(func))) -#endif - { - if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) { - return __Pyx_PyObject_CallMethO(func, NULL); - } - } - return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL); -} -#endif - -/* PyCFunctionFastCall */ -#if CYTHON_FAST_PYCCALL -static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, PyObject **args, Py_ssize_t nargs) { - PyCFunctionObject *func = (PyCFunctionObject*)func_obj; - PyCFunction meth = PyCFunction_GET_FUNCTION(func); - PyObject *self = PyCFunction_GET_SELF(func); - int flags = PyCFunction_GET_FLAGS(func); - assert(PyCFunction_Check(func)); - assert(METH_FASTCALL == (flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST | METH_KEYWORDS | METH_STACKLESS))); - assert(nargs >= 0); - assert(nargs == 0 || args != NULL); - /* _PyCFunction_FastCallDict() must not be called with an exception set, - because it may clear it (directly or indirectly) and so the - caller loses its exception */ - assert(!PyErr_Occurred()); - if ((PY_VERSION_HEX < 0x030700A0) || unlikely(flags & METH_KEYWORDS)) { - return (*((__Pyx_PyCFunctionFastWithKeywords)(void*)meth)) (self, args, nargs, NULL); - } else { - return (*((__Pyx_PyCFunctionFast)(void*)meth)) (self, args, nargs); - } -} -#endif - -/* PyObjectCallOneArg */ -#if CYTHON_COMPILING_IN_CPYTHON -static PyObject* __Pyx__PyObject_CallOneArg(PyObject *func, PyObject *arg) { - PyObject *result; - PyObject *args = PyTuple_New(1); - if (unlikely(!args)) return NULL; - Py_INCREF(arg); - PyTuple_SET_ITEM(args, 0, arg); - result = __Pyx_PyObject_Call(func, args, NULL); - Py_DECREF(args); - return result; -} -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) { -#if CYTHON_FAST_PYCALL - if (PyFunction_Check(func)) { - return __Pyx_PyFunction_FastCall(func, &arg, 1); - } -#endif - if (likely(PyCFunction_Check(func))) { - if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) { - return __Pyx_PyObject_CallMethO(func, arg); -#if CYTHON_FAST_PYCCALL - } else if (PyCFunction_GET_FLAGS(func) & METH_FASTCALL) { - return __Pyx_PyCFunction_FastCall(func, &arg, 1); -#endif - } - } - return __Pyx__PyObject_CallOneArg(func, arg); -} -#else -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) { - PyObject *result; - PyObject *args = PyTuple_Pack(1, arg); - if (unlikely(!args)) return NULL; - result = __Pyx_PyObject_Call(func, args, NULL); - Py_DECREF(args); - return result; -} -#endif - -/* RaiseArgTupleInvalid */ -static void __Pyx_RaiseArgtupleInvalid( - const char* func_name, - int exact, - Py_ssize_t num_min, - Py_ssize_t num_max, - Py_ssize_t num_found) -{ - Py_ssize_t num_expected; - const char *more_or_less; - if (num_found < num_min) { - num_expected = num_min; - more_or_less = "at least"; - } else { - num_expected = num_max; - more_or_less = "at most"; - } - if (exact) { - more_or_less = "exactly"; - } - PyErr_Format(PyExc_TypeError, - "%.200s() takes %.8s %" CYTHON_FORMAT_SSIZE_T "d positional argument%.1s (%" CYTHON_FORMAT_SSIZE_T "d given)", - func_name, more_or_less, num_expected, - (num_expected == 1) ? "" : "s", num_found); -} - -/* RaiseDoubleKeywords */ -static void __Pyx_RaiseDoubleKeywordsError( - const char* func_name, - PyObject* kw_name) -{ - PyErr_Format(PyExc_TypeError, - #if PY_MAJOR_VERSION >= 3 - "%s() got multiple values for keyword argument '%U'", func_name, kw_name); - #else - "%s() got multiple values for keyword argument '%s'", func_name, - PyString_AsString(kw_name)); - #endif + PyErr_Format(PyExc_TypeError, + #if PY_MAJOR_VERSION >= 3 + "%s() got multiple values for keyword argument '%U'", func_name, kw_name); + #else + "%s() got multiple values for keyword argument '%s'", func_name, + PyString_AsString(kw_name)); + #endif } /* ParseKeywords */ @@ -4953,23 +4614,274 @@ #endif } -/* ExtTypeTest */ -static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { - if (unlikely(!type)) { - PyErr_SetString(PyExc_SystemError, "Missing type object"); - return 0; - } - if (likely(__Pyx_TypeCheck(obj, type))) - return 1; - PyErr_Format(PyExc_TypeError, "Cannot convert %.200s to %.200s", - Py_TYPE(obj)->tp_name, type->tp_name); - return 0; +/* PyObjectGetAttrStr */ +#if CYTHON_USE_TYPE_SLOTS +static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name) { + PyTypeObject* tp = Py_TYPE(obj); + if (likely(tp->tp_getattro)) + return tp->tp_getattro(obj, attr_name); +#if PY_MAJOR_VERSION < 3 + if (likely(tp->tp_getattr)) + return tp->tp_getattr(obj, PyString_AS_STRING(attr_name)); +#endif + return PyObject_GetAttr(obj, attr_name); } +#endif -/* GetTopmostException */ -#if CYTHON_USE_EXC_INFO_STACK -static _PyErr_StackItem * -__Pyx_PyErr_GetTopmostException(PyThreadState *tstate) +/* PyFunctionFastCall */ +#if CYTHON_FAST_PYCALL +static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na, + PyObject *globals) { + PyFrameObject *f; + PyThreadState *tstate = __Pyx_PyThreadState_Current; + PyObject **fastlocals; + Py_ssize_t i; + PyObject *result; + assert(globals != NULL); + /* XXX Perhaps we should create a specialized + PyFrame_New() that doesn't take locals, but does + take builtins without sanity checking them. + */ + assert(tstate != NULL); + f = PyFrame_New(tstate, co, globals, NULL); + if (f == NULL) { + return NULL; + } + fastlocals = __Pyx_PyFrame_GetLocalsplus(f); + for (i = 0; i < na; i++) { + Py_INCREF(*args); + fastlocals[i] = *args++; + } + result = PyEval_EvalFrameEx(f,0); + ++tstate->recursion_depth; + Py_DECREF(f); + --tstate->recursion_depth; + return result; +} +#if 1 || PY_VERSION_HEX < 0x030600B1 +static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs) { + PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func); + PyObject *globals = PyFunction_GET_GLOBALS(func); + PyObject *argdefs = PyFunction_GET_DEFAULTS(func); + PyObject *closure; +#if PY_MAJOR_VERSION >= 3 + PyObject *kwdefs; +#endif + PyObject *kwtuple, **k; + PyObject **d; + Py_ssize_t nd; + Py_ssize_t nk; + PyObject *result; + assert(kwargs == NULL || PyDict_Check(kwargs)); + nk = kwargs ? PyDict_Size(kwargs) : 0; + if (Py_EnterRecursiveCall((char*)" while calling a Python object")) { + return NULL; + } + if ( +#if PY_MAJOR_VERSION >= 3 + co->co_kwonlyargcount == 0 && +#endif + likely(kwargs == NULL || nk == 0) && + co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) { + if (argdefs == NULL && co->co_argcount == nargs) { + result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals); + goto done; + } + else if (nargs == 0 && argdefs != NULL + && co->co_argcount == Py_SIZE(argdefs)) { + /* function called with no arguments, but all parameters have + a default value: use default values as arguments .*/ + args = &PyTuple_GET_ITEM(argdefs, 0); + result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals); + goto done; + } + } + if (kwargs != NULL) { + Py_ssize_t pos, i; + kwtuple = PyTuple_New(2 * nk); + if (kwtuple == NULL) { + result = NULL; + goto done; + } + k = &PyTuple_GET_ITEM(kwtuple, 0); + pos = i = 0; + while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) { + Py_INCREF(k[i]); + Py_INCREF(k[i+1]); + i += 2; + } + nk = i / 2; + } + else { + kwtuple = NULL; + k = NULL; + } + closure = PyFunction_GET_CLOSURE(func); +#if PY_MAJOR_VERSION >= 3 + kwdefs = PyFunction_GET_KW_DEFAULTS(func); +#endif + if (argdefs != NULL) { + d = &PyTuple_GET_ITEM(argdefs, 0); + nd = Py_SIZE(argdefs); + } + else { + d = NULL; + nd = 0; + } +#if PY_MAJOR_VERSION >= 3 + result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL, + args, (int)nargs, + k, (int)nk, + d, (int)nd, kwdefs, closure); +#else + result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL, + args, (int)nargs, + k, (int)nk, + d, (int)nd, closure); +#endif + Py_XDECREF(kwtuple); +done: + Py_LeaveRecursiveCall(); + return result; +} +#endif +#endif + +/* PyCFunctionFastCall */ +#if CYTHON_FAST_PYCCALL +static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, PyObject **args, Py_ssize_t nargs) { + PyCFunctionObject *func = (PyCFunctionObject*)func_obj; + PyCFunction meth = PyCFunction_GET_FUNCTION(func); + PyObject *self = PyCFunction_GET_SELF(func); + int flags = PyCFunction_GET_FLAGS(func); + assert(PyCFunction_Check(func)); + assert(METH_FASTCALL == (flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST | METH_KEYWORDS | METH_STACKLESS))); + assert(nargs >= 0); + assert(nargs == 0 || args != NULL); + /* _PyCFunction_FastCallDict() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller loses its exception */ + assert(!PyErr_Occurred()); + if ((PY_VERSION_HEX < 0x030700A0) || unlikely(flags & METH_KEYWORDS)) { + return (*((__Pyx_PyCFunctionFastWithKeywords)(void*)meth)) (self, args, nargs, NULL); + } else { + return (*((__Pyx_PyCFunctionFast)(void*)meth)) (self, args, nargs); + } +} +#endif + +/* PyObjectCall */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) { + PyObject *result; + ternaryfunc call = func->ob_type->tp_call; + if (unlikely(!call)) + return PyObject_Call(func, arg, kw); + if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) + return NULL; + result = (*call)(func, arg, kw); + Py_LeaveRecursiveCall(); + if (unlikely(!result) && unlikely(!PyErr_Occurred())) { + PyErr_SetString( + PyExc_SystemError, + "NULL result without error in PyObject_Call"); + } + return result; +} +#endif + +/* GetBuiltinName */ +static PyObject *__Pyx_GetBuiltinName(PyObject *name) { + PyObject* result = __Pyx_PyObject_GetAttrStr(__pyx_b, name); + if (unlikely(!result)) { + PyErr_Format(PyExc_NameError, +#if PY_MAJOR_VERSION >= 3 + "name '%U' is not defined", name); +#else + "name '%.200s' is not defined", PyString_AS_STRING(name)); +#endif + } + return result; +} + +/* PyDictVersioning */ +#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS +static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) { + PyObject *dict = Py_TYPE(obj)->tp_dict; + return likely(dict) ? __PYX_GET_DICT_VERSION(dict) : 0; +} +static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj) { + PyObject **dictptr = NULL; + Py_ssize_t offset = Py_TYPE(obj)->tp_dictoffset; + if (offset) { +#if CYTHON_COMPILING_IN_CPYTHON + dictptr = (likely(offset > 0)) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj); +#else + dictptr = _PyObject_GetDictPtr(obj); +#endif + } + return (dictptr && *dictptr) ? __PYX_GET_DICT_VERSION(*dictptr) : 0; +} +static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version) { + PyObject *dict = Py_TYPE(obj)->tp_dict; + if (unlikely(!dict) || unlikely(tp_dict_version != __PYX_GET_DICT_VERSION(dict))) + return 0; + return obj_dict_version == __Pyx_get_object_dict_version(obj); +} +#endif + +/* GetModuleGlobalName */ +#if CYTHON_USE_DICT_VERSIONS +static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value) +#else +static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name) +#endif +{ + PyObject *result; +#if !CYTHON_AVOID_BORROWED_REFS +#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1 + result = _PyDict_GetItem_KnownHash(__pyx_d, name, ((PyASCIIObject *) name)->hash); + __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) + if (likely(result)) { + return __Pyx_NewRef(result); + } else if (unlikely(PyErr_Occurred())) { + return NULL; + } +#else + result = PyDict_GetItem(__pyx_d, name); + __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) + if (likely(result)) { + return __Pyx_NewRef(result); + } +#endif +#else + result = PyObject_GetItem(__pyx_d, name); + __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version) + if (likely(result)) { + return __Pyx_NewRef(result); + } + PyErr_Clear(); +#endif + return __Pyx_GetBuiltinName(name); +} + +/* ExtTypeTest */ +static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { + if (unlikely(!type)) { + PyErr_SetString(PyExc_SystemError, "Missing type object"); + return 0; + } + if (likely(__Pyx_TypeCheck(obj, type))) + return 1; + PyErr_Format(PyExc_TypeError, "Cannot convert %.200s to %.200s", + Py_TYPE(obj)->tp_name, type->tp_name); + return 0; +} + +/* GetTopmostException */ +#if CYTHON_USE_EXC_INFO_STACK +static _PyErr_StackItem * +__Pyx_PyErr_GetTopmostException(PyThreadState *tstate) { _PyErr_StackItem *exc_info = tstate->exc_info; while ((exc_info->exc_type == NULL || exc_info->exc_type == Py_None) && @@ -5096,6 +5008,88 @@ return -1; } +/* PyObjectCallMethO */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) { + PyObject *self, *result; + PyCFunction cfunc; + cfunc = PyCFunction_GET_FUNCTION(func); + self = PyCFunction_GET_SELF(func); + if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) + return NULL; + result = cfunc(self, arg); + Py_LeaveRecursiveCall(); + if (unlikely(!result) && unlikely(!PyErr_Occurred())) { + PyErr_SetString( + PyExc_SystemError, + "NULL result without error in PyObject_Call"); + } + return result; +} +#endif + +/* PyObjectCallNoArg */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { +#if CYTHON_FAST_PYCALL + if (PyFunction_Check(func)) { + return __Pyx_PyFunction_FastCall(func, NULL, 0); + } +#endif +#ifdef __Pyx_CyFunction_USED + if (likely(PyCFunction_Check(func) || __Pyx_CyFunction_Check(func))) +#else + if (likely(PyCFunction_Check(func))) +#endif + { + if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) { + return __Pyx_PyObject_CallMethO(func, NULL); + } + } + return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL); +} +#endif + +/* PyObjectCallOneArg */ +#if CYTHON_COMPILING_IN_CPYTHON +static PyObject* __Pyx__PyObject_CallOneArg(PyObject *func, PyObject *arg) { + PyObject *result; + PyObject *args = PyTuple_New(1); + if (unlikely(!args)) return NULL; + Py_INCREF(arg); + PyTuple_SET_ITEM(args, 0, arg); + result = __Pyx_PyObject_Call(func, args, NULL); + Py_DECREF(args); + return result; +} +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) { +#if CYTHON_FAST_PYCALL + if (PyFunction_Check(func)) { + return __Pyx_PyFunction_FastCall(func, &arg, 1); + } +#endif + if (likely(PyCFunction_Check(func))) { + if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) { + return __Pyx_PyObject_CallMethO(func, arg); +#if CYTHON_FAST_PYCCALL + } else if (PyCFunction_GET_FLAGS(func) & METH_FASTCALL) { + return __Pyx_PyCFunction_FastCall(func, &arg, 1); +#endif + } + } + return __Pyx__PyObject_CallOneArg(func, arg); +} +#else +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) { + PyObject *result; + PyObject *args = PyTuple_Pack(1, arg); + if (unlikely(!args)) return NULL; + result = __Pyx_PyObject_Call(func, args, NULL); + Py_DECREF(args); + return result; +} +#endif + /* GetAttr */ static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *o, PyObject *n) { #if CYTHON_USE_TYPE_SLOTS diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.c pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.c --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.c 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.c 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.19 */ +/* Generated by Cython 0.29.21 */ /* BEGIN: Cython Metadata { @@ -26,8 +26,8 @@ #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) #error Cython requires Python 2.6+ or Python 3.3+. #else -#define CYTHON_ABI "0_29_19" -#define CYTHON_HEX_VERSION 0x001D13F0 +#define CYTHON_ABI "0_29_21" +#define CYTHON_HEX_VERSION 0x001D15F0 #define CYTHON_FUTURE_DIVISION 1 #include #ifndef offsetof @@ -454,7 +454,11 @@ #define __Pyx_PyUnicode_DATA(u) PyUnicode_DATA(u) #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i) #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch) + #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE) #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) + #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) + #endif #else #define CYTHON_PEP393_ENABLED 0 #define PyUnicode_1BYTE_KIND 1 @@ -517,6 +521,13 @@ #ifndef PySet_CheckExact #define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type) #endif +#if PY_VERSION_HEX >= 0x030900A4 + #define __Pyx_SET_REFCNT(obj, refcnt) Py_SET_REFCNT(obj, refcnt) + #define __Pyx_SET_SIZE(obj, size) Py_SET_SIZE(obj, size) +#else + #define __Pyx_SET_REFCNT(obj, refcnt) Py_REFCNT(obj) = (refcnt) + #define __Pyx_SET_SIZE(obj, size) Py_SIZE(obj) = (size) +#endif #if CYTHON_ASSUME_SAFE_MACROS #define __Pyx_PySequence_SIZE(seq) Py_SIZE(seq) #else @@ -556,7 +567,7 @@ #define __Pyx_PyInt_AsHash_t PyInt_AsSsize_t #endif #if PY_MAJOR_VERSION >= 3 - #define __Pyx_PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : (Py_INCREF(func), func)) + #define __Pyx_PyMethod_New(func, self, klass) ((self) ? ((void)(klass), PyMethod_New(func, self)) : __Pyx_NewRef(func)) #else #define __Pyx_PyMethod_New(func, self, klass) PyMethod_New(func, self, klass) #endif @@ -4615,6 +4626,78 @@ /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":113 * * + * cdef clear_thread_local_info(): # <<<<<<<<<<<<<< + * global _thread_local_info + * _thread_local_info = threading.local() + */ + +static PyObject *__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_clear_thread_local_info(void) { + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; + __Pyx_RefNannySetupContext("clear_thread_local_info", 0); + + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":115 + * cdef clear_thread_local_info(): + * global _thread_local_info + * _thread_local_info = threading.local() # <<<<<<<<<<<<<< + * + * + */ + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_threading); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_local); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); + if (likely(__pyx_t_2)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + __Pyx_INCREF(__pyx_t_2); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_3, function); + } + } + __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + if (PyDict_SetItem(__pyx_d, __pyx_n_s_thread_local_info, __pyx_t_1) < 0) __PYX_ERR(0, 115, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":113 + * + * + * cdef clear_thread_local_info(): # <<<<<<<<<<<<<< + * global _thread_local_info + * _thread_local_info = threading.local() + */ + + /* function exit code */ + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1_error:; + __Pyx_XDECREF(__pyx_t_1); + __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_3); + __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator_common.clear_thread_local_info", __pyx_clineno, __pyx_lineno, __pyx_filename); + __pyx_r = 0; + __pyx_L0:; + __Pyx_XGIVEREF(__pyx_r); + __Pyx_RefNannyFinishContext(); + return __pyx_r; +} + +/* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":118 + * + * * cdef FuncCodeInfo get_func_code_info(PyCodeObject * code_obj): # <<<<<<<<<<<<<< * ''' * Provides code-object related info. @@ -4661,35 +4744,35 @@ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_func_code_info", 0); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":128 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":133 * # print('get_func_code_info', f_code.co_name, f_code.co_filename) * * cdef object main_debugger = GlobalDebuggerHolder.global_dbg # <<<<<<<<<<<<<< * * cdef void * extra */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_GlobalDebuggerHolder); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_global_dbg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_global_dbg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_main_debugger = __pyx_t_2; __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":131 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":136 * * cdef void * extra * _PyCode_GetExtra( code_obj, _code_extra_index, & extra) # <<<<<<<<<<<<<< * if extra is not NULL: * extra_obj = extra */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_code_extra_index); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_code_extra_index); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyIndex_AsSsize_t(__pyx_t_2); if (unlikely((__pyx_t_3 == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyIndex_AsSsize_t(__pyx_t_2); if (unlikely((__pyx_t_3 == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; (void)(_PyCode_GetExtra(((PyObject *)__pyx_v_code_obj), __pyx_t_3, (&__pyx_v_extra))); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":132 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":137 * cdef void * extra * _PyCode_GetExtra( code_obj, _code_extra_index, & extra) * if extra is not NULL: # <<<<<<<<<<<<<< @@ -4699,7 +4782,7 @@ __pyx_t_4 = ((__pyx_v_extra != NULL) != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":133 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":138 * _PyCode_GetExtra( code_obj, _code_extra_index, & extra) * if extra is not NULL: * extra_obj = extra # <<<<<<<<<<<<<< @@ -4708,7 +4791,7 @@ */ __pyx_v_extra_obj = ((PyObject *)__pyx_v_extra); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":134 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":139 * if extra is not NULL: * extra_obj = extra * if extra_obj is not NULL: # <<<<<<<<<<<<<< @@ -4718,7 +4801,7 @@ __pyx_t_4 = ((__pyx_v_extra_obj != NULL) != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":135 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":140 * extra_obj = extra * if extra_obj is not NULL: * func_code_info_obj = extra_obj # <<<<<<<<<<<<<< @@ -4730,25 +4813,25 @@ __pyx_v_func_code_info_obj = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *)__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":136 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":141 * if extra_obj is not NULL: * func_code_info_obj = extra_obj * if func_code_info_obj.breakpoints_mtime == main_debugger.mtime: # <<<<<<<<<<<<<< * # if DEBUG: * # print('get_func_code_info: matched mtime', f_code.co_name, f_code.co_filename) */ - __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_func_code_info_obj->breakpoints_mtime); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_func_code_info_obj->breakpoints_mtime); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 141, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_mtime); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_mtime); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 141, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_t_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_t_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 141, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 136, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 141, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":140 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":145 * # print('get_func_code_info: matched mtime', f_code.co_name, f_code.co_filename) * * return func_code_info_obj # <<<<<<<<<<<<<< @@ -4760,7 +4843,7 @@ __pyx_r = __pyx_v_func_code_info_obj; goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":136 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":141 * if extra_obj is not NULL: * func_code_info_obj = extra_obj * if func_code_info_obj.breakpoints_mtime == main_debugger.mtime: # <<<<<<<<<<<<<< @@ -4769,7 +4852,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":134 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":139 * if extra is not NULL: * extra_obj = extra * if extra_obj is not NULL: # <<<<<<<<<<<<<< @@ -4778,7 +4861,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":132 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":137 * cdef void * extra * _PyCode_GetExtra( code_obj, _code_extra_index, & extra) * if extra is not NULL: # <<<<<<<<<<<<<< @@ -4787,7 +4870,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":142 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":147 * return func_code_info_obj * * cdef str co_filename = code_obj.co_filename # <<<<<<<<<<<<<< @@ -4799,7 +4882,7 @@ __pyx_v_co_filename = ((PyObject*)__pyx_t_5); __pyx_t_5 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":143 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":148 * * cdef str co_filename = code_obj.co_filename * cdef str co_name = code_obj.co_name # <<<<<<<<<<<<<< @@ -4811,32 +4894,32 @@ __pyx_v_co_name = ((PyObject*)__pyx_t_5); __pyx_t_5 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":145 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":150 * cdef str co_name = code_obj.co_name * * func_code_info = FuncCodeInfo() # <<<<<<<<<<<<<< * func_code_info.breakpoints_mtime = main_debugger.mtime * */ - __pyx_t_5 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 145, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 150, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_v_func_code_info = ((struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *)__pyx_t_5); __pyx_t_5 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":146 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":151 * * func_code_info = FuncCodeInfo() * func_code_info.breakpoints_mtime = main_debugger.mtime # <<<<<<<<<<<<<< * * func_code_info.co_filename = co_filename */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_mtime); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 146, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_mtime); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 146, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_func_code_info->breakpoints_mtime = __pyx_t_6; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":148 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":153 * func_code_info.breakpoints_mtime = main_debugger.mtime * * func_code_info.co_filename = co_filename # <<<<<<<<<<<<<< @@ -4849,7 +4932,7 @@ __Pyx_DECREF(__pyx_v_func_code_info->co_filename); __pyx_v_func_code_info->co_filename = __pyx_v_co_filename; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":150 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":155 * func_code_info.co_filename = co_filename * * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -4859,7 +4942,7 @@ __pyx_t_4 = ((!(__pyx_v_func_code_info->always_skip_code != 0)) != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":151 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":156 * * if not func_code_info.always_skip_code: * try: # <<<<<<<<<<<<<< @@ -4875,22 +4958,22 @@ __Pyx_XGOTREF(__pyx_t_9); /*try:*/ { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":152 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":157 * if not func_code_info.always_skip_code: * try: * abs_path_real_path_and_base = NORM_PATHS_AND_BASE_CONTAINER[co_filename] # <<<<<<<<<<<<<< * except: * abs_path_real_path_and_base = get_abs_path_real_path_and_base_from_file(co_filename) */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_NORM_PATHS_AND_BASE_CONTAINER); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 152, __pyx_L7_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_NORM_PATHS_AND_BASE_CONTAINER); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 157, __pyx_L7_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_t_5, __pyx_v_co_filename); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 152, __pyx_L7_error) + __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_t_5, __pyx_v_co_filename); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 157, __pyx_L7_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_abs_path_real_path_and_base = __pyx_t_1; __pyx_t_1 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":151 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":156 * * if not func_code_info.always_skip_code: * try: # <<<<<<<<<<<<<< @@ -4907,7 +4990,7 @@ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":153 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":158 * try: * abs_path_real_path_and_base = NORM_PATHS_AND_BASE_CONTAINER[co_filename] * except: # <<<<<<<<<<<<<< @@ -4916,19 +4999,19 @@ */ /*except:*/ { __Pyx_AddTraceback("_pydevd_frame_eval.pydevd_frame_evaluator_common.get_func_code_info", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_5, &__pyx_t_2) < 0) __PYX_ERR(0, 153, __pyx_L9_except_error) + if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_5, &__pyx_t_2) < 0) __PYX_ERR(0, 158, __pyx_L9_except_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GOTREF(__pyx_t_5); __Pyx_GOTREF(__pyx_t_2); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":154 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":159 * abs_path_real_path_and_base = NORM_PATHS_AND_BASE_CONTAINER[co_filename] * except: * abs_path_real_path_and_base = get_abs_path_real_path_and_base_from_file(co_filename) # <<<<<<<<<<<<<< * * func_code_info.real_path = abs_path_real_path_and_base[1] */ - __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_get_abs_path_real_path_and_base); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 154, __pyx_L9_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_get_abs_path_real_path_and_base); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 159, __pyx_L9_except_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_11))) { @@ -4942,7 +5025,7 @@ } __pyx_t_10 = (__pyx_t_12) ? __Pyx_PyObject_Call2Args(__pyx_t_11, __pyx_t_12, __pyx_v_co_filename) : __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_v_co_filename); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 154, __pyx_L9_except_error) + if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 159, __pyx_L9_except_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_XDECREF_SET(__pyx_v_abs_path_real_path_and_base, __pyx_t_10); @@ -4954,7 +5037,7 @@ } __pyx_L9_except_error:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":151 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":156 * * if not func_code_info.always_skip_code: * try: # <<<<<<<<<<<<<< @@ -4974,32 +5057,32 @@ __pyx_L12_try_end:; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":156 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":161 * abs_path_real_path_and_base = get_abs_path_real_path_and_base_from_file(co_filename) * * func_code_info.real_path = abs_path_real_path_and_base[1] # <<<<<<<<<<<<<< * * file_type = get_file_type(abs_path_real_path_and_base[-1]) # we don't want to debug anything related to pydevd */ - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_abs_path_real_path_and_base, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 156, __pyx_L1_error) + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_abs_path_real_path_and_base, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 161, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (!(likely(PyUnicode_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "unicode", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 156, __pyx_L1_error) + if (!(likely(PyUnicode_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "unicode", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 161, __pyx_L1_error) __Pyx_GIVEREF(__pyx_t_2); __Pyx_GOTREF(__pyx_v_func_code_info->real_path); __Pyx_DECREF(__pyx_v_func_code_info->real_path); __pyx_v_func_code_info->real_path = ((PyObject*)__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":158 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":163 * func_code_info.real_path = abs_path_real_path_and_base[1] * * file_type = get_file_type(abs_path_real_path_and_base[-1]) # we don't want to debug anything related to pydevd # <<<<<<<<<<<<<< * if file_type is not None: * func_code_info.always_skip_code = True */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_get_file_type); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 158, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_get_file_type); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 163, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_abs_path_real_path_and_base, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 158, __pyx_L1_error) + __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_abs_path_real_path_and_base, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 163, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_10 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { @@ -5014,13 +5097,13 @@ __pyx_t_2 = (__pyx_t_10) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_10, __pyx_t_1) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1); __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 158, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 163, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_file_type = __pyx_t_2; __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":159 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":164 * * file_type = get_file_type(abs_path_real_path_and_base[-1]) # we don't want to debug anything related to pydevd * if file_type is not None: # <<<<<<<<<<<<<< @@ -5031,7 +5114,7 @@ __pyx_t_13 = (__pyx_t_4 != 0); if (__pyx_t_13) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":160 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":165 * file_type = get_file_type(abs_path_real_path_and_base[-1]) # we don't want to debug anything related to pydevd * if file_type is not None: * func_code_info.always_skip_code = True # <<<<<<<<<<<<<< @@ -5040,7 +5123,7 @@ */ __pyx_v_func_code_info->always_skip_code = 1; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":159 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":164 * * file_type = get_file_type(abs_path_real_path_and_base[-1]) # we don't want to debug anything related to pydevd * if file_type is not None: # <<<<<<<<<<<<<< @@ -5049,7 +5132,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":150 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":155 * func_code_info.co_filename = co_filename * * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -5058,7 +5141,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":162 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":167 * func_code_info.always_skip_code = True * * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -5068,7 +5151,7 @@ __pyx_t_13 = ((!(__pyx_v_func_code_info->always_skip_code != 0)) != 0); if (__pyx_t_13) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":163 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":168 * * if not func_code_info.always_skip_code: * was_break: bool = False # <<<<<<<<<<<<<< @@ -5077,7 +5160,7 @@ */ __pyx_v_was_break = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":164 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":169 * if not func_code_info.always_skip_code: * was_break: bool = False * if main_debugger is not None: # <<<<<<<<<<<<<< @@ -5088,16 +5171,16 @@ __pyx_t_4 = (__pyx_t_13 != 0); if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":165 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":170 * was_break: bool = False * if main_debugger is not None: * breakpoints: dict = main_debugger.breakpoints.get(func_code_info.real_path) # <<<<<<<<<<<<<< * # print('\n---') * # print(main_debugger.breakpoints) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_breakpoints); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 165, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_main_debugger, __pyx_n_s_breakpoints); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 170, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 165, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 170, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_5 = NULL; @@ -5112,14 +5195,14 @@ } __pyx_t_2 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v_func_code_info->real_path) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_func_code_info->real_path); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 165, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 170, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "dict", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 165, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "dict", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 170, __pyx_L1_error) __pyx_v_breakpoints = ((PyObject*)__pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":170 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":175 * # print(func_code_info.real_path) * # print(main_debugger.breakpoints.get(func_code_info.real_path)) * code_obj_py: object = code_obj # <<<<<<<<<<<<<< @@ -5131,26 +5214,26 @@ __pyx_v_code_obj_py = __pyx_t_2; __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":171 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":176 * # print(main_debugger.breakpoints.get(func_code_info.real_path)) * code_obj_py: object = code_obj * if breakpoints: # <<<<<<<<<<<<<< * # if DEBUG: * # print('found breakpoints', code_obj_py.co_name, breakpoints) */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_breakpoints); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 171, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_breakpoints); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 176, __pyx_L1_error) if (__pyx_t_4) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":174 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":179 * # if DEBUG: * # print('found breakpoints', code_obj_py.co_name, breakpoints) * for offset, line in dis.findlinestarts(code_obj_py): # <<<<<<<<<<<<<< * if line in breakpoints: * breakpoint = breakpoints[line] */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_dis); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 174, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_dis); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_findlinestarts); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_findlinestarts); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -5165,16 +5248,16 @@ } __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_1, __pyx_v_code_obj_py) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_code_obj_py); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 174, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { __pyx_t_5 = __pyx_t_2; __Pyx_INCREF(__pyx_t_5); __pyx_t_3 = 0; __pyx_t_14 = NULL; } else { - __pyx_t_3 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_3 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_14 = Py_TYPE(__pyx_t_5)->tp_iternext; if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_14 = Py_TYPE(__pyx_t_5)->tp_iternext; if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 179, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; for (;;) { @@ -5182,17 +5265,17 @@ if (likely(PyList_CheckExact(__pyx_t_5))) { if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_5)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 179, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_5, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_5, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } else { if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_5)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 179, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_5, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_5, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } @@ -5202,7 +5285,7 @@ PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 174, __pyx_L1_error) + else __PYX_ERR(0, 179, __pyx_L1_error) } break; } @@ -5214,7 +5297,7 @@ if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 174, __pyx_L1_error) + __PYX_ERR(0, 179, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -5227,15 +5310,15 @@ __Pyx_INCREF(__pyx_t_1); __Pyx_INCREF(__pyx_t_10); #else - __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_11 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 174, __pyx_L1_error) + __pyx_t_11 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_15 = Py_TYPE(__pyx_t_11)->tp_iternext; @@ -5243,7 +5326,7 @@ __Pyx_GOTREF(__pyx_t_1); index = 1; __pyx_t_10 = __pyx_t_15(__pyx_t_11); if (unlikely(!__pyx_t_10)) goto __pyx_L21_unpacking_failed; __Pyx_GOTREF(__pyx_t_10); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_15(__pyx_t_11), 2) < 0) __PYX_ERR(0, 174, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_15(__pyx_t_11), 2) < 0) __PYX_ERR(0, 179, __pyx_L1_error) __pyx_t_15 = NULL; __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; goto __pyx_L22_unpacking_done; @@ -5251,7 +5334,7 @@ __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __pyx_t_15 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 174, __pyx_L1_error) + __PYX_ERR(0, 179, __pyx_L1_error) __pyx_L22_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_offset, __pyx_t_1); @@ -5259,7 +5342,7 @@ __Pyx_XDECREF_SET(__pyx_v_line, __pyx_t_10); __pyx_t_10 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":175 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":180 * # print('found breakpoints', code_obj_py.co_name, breakpoints) * for offset, line in dis.findlinestarts(code_obj_py): * if line in breakpoints: # <<<<<<<<<<<<<< @@ -5268,13 +5351,13 @@ */ if (unlikely(__pyx_v_breakpoints == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); - __PYX_ERR(0, 175, __pyx_L1_error) + __PYX_ERR(0, 180, __pyx_L1_error) } - __pyx_t_4 = (__Pyx_PyDict_ContainsTF(__pyx_v_line, __pyx_v_breakpoints, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 175, __pyx_L1_error) + __pyx_t_4 = (__Pyx_PyDict_ContainsTF(__pyx_v_line, __pyx_v_breakpoints, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 180, __pyx_L1_error) __pyx_t_13 = (__pyx_t_4 != 0); if (__pyx_t_13) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":176 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":181 * for offset, line in dis.findlinestarts(code_obj_py): * if line in breakpoints: * breakpoint = breakpoints[line] # <<<<<<<<<<<<<< @@ -5283,14 +5366,14 @@ */ if (unlikely(__pyx_v_breakpoints == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 176, __pyx_L1_error) + __PYX_ERR(0, 181, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyDict_GetItem(__pyx_v_breakpoints, __pyx_v_line); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 176, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_GetItem(__pyx_v_breakpoints, __pyx_v_line); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 181, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_XDECREF_SET(__pyx_v_breakpoint, __pyx_t_2); __pyx_t_2 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":179 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":184 * # if DEBUG: * # print('created breakpoint', code_obj_py.co_name, line) * func_code_info.breakpoints_created.add(line) # <<<<<<<<<<<<<< @@ -5299,11 +5382,11 @@ */ if (unlikely(__pyx_v_func_code_info->breakpoints_created == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add"); - __PYX_ERR(0, 179, __pyx_L1_error) + __PYX_ERR(0, 184, __pyx_L1_error) } - __pyx_t_16 = PySet_Add(__pyx_v_func_code_info->breakpoints_created, __pyx_v_line); if (unlikely(__pyx_t_16 == ((int)-1))) __PYX_ERR(0, 179, __pyx_L1_error) + __pyx_t_16 = PySet_Add(__pyx_v_func_code_info->breakpoints_created, __pyx_v_line); if (unlikely(__pyx_t_16 == ((int)-1))) __PYX_ERR(0, 184, __pyx_L1_error) - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":180 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":185 * # print('created breakpoint', code_obj_py.co_name, line) * func_code_info.breakpoints_created.add(line) * func_code_info.breakpoint_found = True # <<<<<<<<<<<<<< @@ -5312,24 +5395,24 @@ */ __pyx_v_func_code_info->breakpoint_found = 1; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":182 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":187 * func_code_info.breakpoint_found = True * * success, new_code = insert_code( # <<<<<<<<<<<<<< * code_obj_py, create_pydev_trace_code_wrapper(line), line) * */ - __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_insert_code); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 182, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_insert_code); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":183 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":188 * * success, new_code = insert_code( * code_obj_py, create_pydev_trace_code_wrapper(line), line) # <<<<<<<<<<<<<< * * if success: */ - __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_create_pydev_trace_code_wrapper); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 183, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_create_pydev_trace_code_wrapper); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 188, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_11))) { @@ -5343,7 +5426,7 @@ } __pyx_t_1 = (__pyx_t_12) ? __Pyx_PyObject_Call2Args(__pyx_t_11, __pyx_t_12, __pyx_v_line) : __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_v_line); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 183, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 188, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __pyx_t_11 = NULL; @@ -5361,7 +5444,7 @@ #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_10)) { PyObject *__pyx_temp[4] = {__pyx_t_11, __pyx_v_code_obj_py, __pyx_t_1, __pyx_v_line}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_10, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_10, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -5370,14 +5453,14 @@ #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_10)) { PyObject *__pyx_temp[4] = {__pyx_t_11, __pyx_v_code_obj_py, __pyx_t_1, __pyx_v_line}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_10, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_10, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else #endif { - __pyx_t_12 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_12 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); if (__pyx_t_11) { __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_11); __pyx_t_11 = NULL; @@ -5391,7 +5474,7 @@ __Pyx_GIVEREF(__pyx_v_line); PyTuple_SET_ITEM(__pyx_t_12, 2+__pyx_t_6, __pyx_v_line); __pyx_t_1 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_t_12, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_t_12, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; } @@ -5402,7 +5485,7 @@ if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 182, __pyx_L1_error) + __PYX_ERR(0, 187, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -5415,15 +5498,15 @@ __Pyx_INCREF(__pyx_t_10); __Pyx_INCREF(__pyx_t_12); #else - __pyx_t_10 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_10 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); - __pyx_t_12 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_12 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 182, __pyx_L1_error) + __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_15 = Py_TYPE(__pyx_t_1)->tp_iternext; @@ -5431,7 +5514,7 @@ __Pyx_GOTREF(__pyx_t_10); index = 1; __pyx_t_12 = __pyx_t_15(__pyx_t_1); if (unlikely(!__pyx_t_12)) goto __pyx_L24_unpacking_failed; __Pyx_GOTREF(__pyx_t_12); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_15(__pyx_t_1), 2) < 0) __PYX_ERR(0, 182, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_15(__pyx_t_1), 2) < 0) __PYX_ERR(0, 187, __pyx_L1_error) __pyx_t_15 = NULL; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; goto __pyx_L25_unpacking_done; @@ -5439,11 +5522,11 @@ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_15 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 182, __pyx_L1_error) + __PYX_ERR(0, 187, __pyx_L1_error) __pyx_L25_unpacking_done:; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":182 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":187 * func_code_info.breakpoint_found = True * * success, new_code = insert_code( # <<<<<<<<<<<<<< @@ -5455,17 +5538,17 @@ __Pyx_XDECREF_SET(__pyx_v_new_code, __pyx_t_12); __pyx_t_12 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":185 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":190 * code_obj_py, create_pydev_trace_code_wrapper(line), line) * * if success: # <<<<<<<<<<<<<< * func_code_info.new_code = new_code * code_obj_py = new_code */ - __pyx_t_13 = __Pyx_PyObject_IsTrue(__pyx_v_success); if (unlikely(__pyx_t_13 < 0)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyObject_IsTrue(__pyx_v_success); if (unlikely(__pyx_t_13 < 0)) __PYX_ERR(0, 190, __pyx_L1_error) if (__pyx_t_13) { - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":186 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":191 * * if success: * func_code_info.new_code = new_code # <<<<<<<<<<<<<< @@ -5478,7 +5561,7 @@ __Pyx_DECREF(__pyx_v_func_code_info->new_code); __pyx_v_func_code_info->new_code = __pyx_v_new_code; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":187 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":192 * if success: * func_code_info.new_code = new_code * code_obj_py = new_code # <<<<<<<<<<<<<< @@ -5488,7 +5571,7 @@ __Pyx_INCREF(__pyx_v_new_code); __Pyx_DECREF_SET(__pyx_v_code_obj_py, __pyx_v_new_code); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":185 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":190 * code_obj_py, create_pydev_trace_code_wrapper(line), line) * * if success: # <<<<<<<<<<<<<< @@ -5498,7 +5581,7 @@ goto __pyx_L26; } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":189 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":194 * code_obj_py = new_code * else: * func_code_info.new_code = None # <<<<<<<<<<<<<< @@ -5512,7 +5595,7 @@ __Pyx_DECREF(__pyx_v_func_code_info->new_code); __pyx_v_func_code_info->new_code = Py_None; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":190 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":195 * else: * func_code_info.new_code = None * break # <<<<<<<<<<<<<< @@ -5523,7 +5606,7 @@ } __pyx_L26:; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":175 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":180 * # print('found breakpoints', code_obj_py.co_name, breakpoints) * for offset, line in dis.findlinestarts(code_obj_py): * if line in breakpoints: # <<<<<<<<<<<<<< @@ -5532,7 +5615,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":174 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":179 * # if DEBUG: * # print('found breakpoints', code_obj_py.co_name, breakpoints) * for offset, line in dis.findlinestarts(code_obj_py): # <<<<<<<<<<<<<< @@ -5543,7 +5626,7 @@ __pyx_L20_break:; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":171 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":176 * # print(main_debugger.breakpoints.get(func_code_info.real_path)) * code_obj_py: object = code_obj * if breakpoints: # <<<<<<<<<<<<<< @@ -5552,7 +5635,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":164 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":169 * if not func_code_info.always_skip_code: * was_break: bool = False * if main_debugger is not None: # <<<<<<<<<<<<<< @@ -5561,7 +5644,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":162 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":167 * func_code_info.always_skip_code = True * * if not func_code_info.always_skip_code: # <<<<<<<<<<<<<< @@ -5570,7 +5653,7 @@ */ } - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":192 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":197 * break * * Py_INCREF(func_code_info) # <<<<<<<<<<<<<< @@ -5579,20 +5662,20 @@ */ Py_INCREF(((PyObject *)__pyx_v_func_code_info)); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":193 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":198 * * Py_INCREF(func_code_info) * _PyCode_SetExtra( code_obj, _code_extra_index, func_code_info) # <<<<<<<<<<<<<< * * return func_code_info */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_code_extra_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 193, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_code_extra_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 198, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_3 == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 193, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_3 == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 198, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; (void)(_PyCode_SetExtra(((PyObject *)__pyx_v_code_obj), __pyx_t_3, ((PyObject *)__pyx_v_func_code_info))); - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":195 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":200 * _PyCode_SetExtra( code_obj, _code_extra_index, func_code_info) * * return func_code_info # <<<<<<<<<<<<<< @@ -5602,7 +5685,7 @@ __pyx_r = __pyx_v_func_code_info; goto __pyx_L0; - /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":113 + /* "_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx":118 * * * cdef FuncCodeInfo get_func_code_info(PyCodeObject * code_obj): # <<<<<<<<<<<<<< @@ -7165,6 +7248,7 @@ /*--- Function export code ---*/ if (__Pyx_ExportFunction("get_thread_info", (void (*)(void))__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_thread_info, "struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_ThreadInfo *(void)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) if (__Pyx_ExportFunction("get_func_code_info", (void (*)(void))__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_get_func_code_info, "struct __pyx_obj_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_FuncCodeInfo *(PyCodeObject *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_ExportFunction("clear_thread_local_info", (void (*)(void))__pyx_f_18_pydevd_frame_eval_29pydevd_frame_evaluator_common_clear_thread_local_info, "PyObject *(void)") < 0) __PYX_ERR(0, 1, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp36-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp36-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp36-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp36-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp37-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp37-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp37-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp37-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp38-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp38-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp38-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp38-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-36m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-36m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-37m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-37m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-38-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-38-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-39-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-39-darwin.so differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pxd pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pxd --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pxd 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pxd 2020-12-01 23:26:18.000000000 +0000 @@ -93,4 +93,5 @@ cdef public int breakpoints_mtime cdef ThreadInfo get_thread_info() -cdef FuncCodeInfo get_func_code_info(PyCodeObject *code_obj) \ No newline at end of file +cdef FuncCodeInfo get_func_code_info(PyCodeObject *code_obj) +cdef clear_thread_local_info() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx 2020-12-01 23:26:18.000000000 +0000 @@ -110,6 +110,11 @@ return thread_info +cdef clear_thread_local_info(): + global _thread_local_info + _thread_local_info = threading.local() + + cdef FuncCodeInfo get_func_code_info(PyCodeObject * code_obj): ''' Provides code-object related info. Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_37_64.cpython-37m-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_37_64.cpython-37m-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_38_64.cpython-38-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_38_64.cpython-38-darwin.so differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_39_64.cpython-39-darwin.so and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_39_64.cpython-39-darwin.so differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39.pyx pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39.pyx --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39.pyx 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39.pyx 2020-12-01 23:26:18.000000000 +0000 @@ -6,15 +6,13 @@ from _pydevd_bundle.pydevd_cython cimport PyDBAdditionalThreadInfo -from _pydevd_frame_eval.pydevd_frame_evaluator_common cimport ThreadInfo, FuncCodeInfo, get_thread_info, get_func_code_info +from _pydevd_frame_eval.pydevd_frame_evaluator_common cimport ThreadInfo, FuncCodeInfo, get_thread_info, get_func_code_info, \ + clear_thread_local_info +from _pydevd_frame_eval.pydevd_frame_evaluator_common import _thread_local_info -_thread_local_info = threading.local() - - -def clear_thread_local_info(): - global _thread_local_info - _thread_local_info = threading.local() +def clear_thread_local_info_py(): + clear_thread_local_info() def get_thread_info_py() -> ThreadInfo: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx 2020-12-01 23:26:18.000000000 +0000 @@ -6,21 +6,19 @@ from _pydevd_bundle.pydevd_cython cimport PyDBAdditionalThreadInfo -from _pydevd_frame_eval.pydevd_frame_evaluator_common cimport ThreadInfo, FuncCodeInfo, get_thread_info, get_func_code_info - - -_thread_local_info = threading.local() - - -def clear_thread_local_info(): - global _thread_local_info - _thread_local_info = threading.local() +from _pydevd_frame_eval.pydevd_frame_evaluator_common cimport ThreadInfo, FuncCodeInfo, get_thread_info, get_func_code_info, \ + clear_thread_local_info +from _pydevd_frame_eval.pydevd_frame_evaluator_common import _thread_local_info def get_thread_info_py() -> ThreadInfo: return get_thread_info() +def clear_thread_local_info_py(): + clear_thread_local_info() + + def dummy_trace_dispatch(frame, str event, arg): if event == 'call': if frame.f_trace is not None: Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_32.cp36-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_32.cp36-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_64.cp36-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_64.cp36-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_32.cp37-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_32.cp37-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_64.cp37-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_64.cp37-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_38_32.cp38-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_38_32.cp38-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_38_64.cp38-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_38_64.cp38-win_amd64.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_39_32.cp39-win32.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_39_32.cp39-win32.pyd differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_39_64.cp39-win_amd64.pyd and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_39_64.cp39-win_amd64.pyd differ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevd.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevd.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydevd.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydevd.py 2020-12-01 23:26:18.000000000 +0000 @@ -346,6 +346,35 @@ yield +# noinspection SpellCheckingInspection +def stoptrace(): + """Stops tracing in the current process and undoes all monkey-patches done by the debugger.""" + global connected + + if connected: + pydevd_tracing.restore_sys_set_trace_func() + sys.settrace(None) + try: + # Not available in Jython! + threading.settrace(None) # Disable tracing for all future threads. + except: + pass + + from _pydev_bundle.pydev_monkey import undo_patch_thread_modules + undo_patch_thread_modules() + + debugger = get_global_debugger() + + if debugger: + + debugger.set_trace_for_frame_and_parents(get_frame(), disable=True) + debugger.exiting() + + kill_all_pydev_threads() + + connected = False + + #======================================================================================================================= # PyDB #======================================================================================================================= @@ -1468,8 +1497,16 @@ return globals def exiting(self): - sys.stdout.flush() - sys.stderr.flush() + # noinspection PyBroadException + try: + sys.stdout.flush() + except: + pass + # noinspection PyBroadException + try: + sys.stderr.flush() + except: + pass self.check_output_redirect() cmd = self.cmd_factory.make_exit_message() self.writer.add_command(cmd) @@ -1498,6 +1535,15 @@ frame_eval_func = frame_eval_func dummy_trace_dispatch = dummy_trace_dispatch + # noinspection SpellCheckingInspection + @staticmethod + def stoptrace(): + """A proxy method for calling :func:`stoptrace` from the modules where direct import + is impossible because, for example, a circular dependency.""" + PyDBDaemonThread.created_pydb_daemon_threads = {} + stoptrace() + + def set_debug(setup): setup['DEBUG_RECORD_SOCKET_READS'] = True setup['DEBUG_TRACE_BREAKPOINTS'] = 1 @@ -1516,11 +1562,11 @@ pydevd_utils.dump_threads(stream) -def usage(doExit=0): +def usage(do_exit=True, exit_code=0): sys.stdout.write('Usage:\n') - sys.stdout.write('pydevd.py --port N [(--client hostname) | --server] --file executable [file_options]\n') - if doExit: - sys.exit(0) + sys.stdout.write('\tpydevd.py --port N [(--client hostname) | --server] --file executable [file_options]\n') + if do_exit: + sys.exit(exit_code) class _CustomWriter(object): @@ -1689,6 +1735,7 @@ SetupHolder.setup = setup debugger = PyDB() + pydev_log.debug("pydev debugger: process %d is connecting\n" % os.getpid()) debugger.connect(host, port) # Note: connect can raise error. # Mark connected only if it actually succeeded. @@ -1763,31 +1810,6 @@ debugger.set_suspend(t, CMD_SET_BREAK) -def stoptrace(): - global connected - if connected: - pydevd_tracing.restore_sys_set_trace_func() - sys.settrace(None) - try: - #not available in jython! - threading.settrace(None) # for all future threads - except: - pass - - from _pydev_bundle.pydev_monkey import undo_patch_thread_modules - undo_patch_thread_modules() - - debugger = get_global_debugger() - - if debugger: - - debugger.set_trace_for_frame_and_parents(get_frame(), disable=True) - debugger.exiting() - - kill_all_pydev_threads() - - connected = False - class Dispatcher(object): def __init__(self): self.port = None @@ -1797,7 +1819,7 @@ self.port = port self.client = start_client(self.host, self.port) self.reader = DispatchReader(self) - self.reader.pydev_do_not_trace = False #we run reader in the same thread so we don't want to loose tracing + self.reader.pydev_do_not_trace = False # We run reader in the same thread so we don't want to loose tracing. self.reader.run() def close(self): @@ -1976,7 +1998,11 @@ SetupHolder.setup = setup except ValueError: traceback.print_exc() - usage(1) + usage(exit_code=1) + + # noinspection PyUnboundLocalVariable + if setup['help']: + usage() if setup['print-in-debugger-startup']: try: @@ -2023,8 +2049,8 @@ dispatcher.connect(host, port) if dispatcher.port is not None: port = dispatcher.port - pydev_log.debug("Received port %d\n" %port) - pydev_log.info("pydev debugger: process %d is connecting\n"% os.getpid()) + pydev_log.debug("Received port %d\n" % port) + pydev_log.debug("pydev debugger: process %d is connecting\n" % os.getpid()) try: pydev_monkey.patch_new_process_functions() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_fixtures.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_fixtures.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_fixtures.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_fixtures.py 2020-12-01 23:26:18.000000000 +0000 @@ -375,6 +375,43 @@ @pytest.fixture +def case_setup_multiproc(): + + runner = DebuggerRunnerSimple() + + class WriterThread(debugger_unittest.AbstractDispatcherThread): + def all_finished_ok(self): + for w in self.writers: + w.finished_ok = True + self.finished_ok = True + + class CaseSetup(object): + + @contextmanager + def test_file( + self, + filename, + **kwargs + ): + + def update_command_line_args(writer, args): + ret = debugger_unittest.AbstractWriterThread.update_command_line_args(writer, args) + ret.insert(ret.index('--qt-support'), '--multiproc') + return ret + + WriterThread.update_command_line_args = update_command_line_args + WriterThread.TEST_FILE = debugger_unittest._get_debugger_test_file(filename) + for key, value in kwargs.items(): + assert hasattr(WriterThread, key) + setattr(WriterThread, key, value) + + with runner.check_case(WriterThread) as writer: + yield writer + + return CaseSetup() + + +@pytest.fixture def case_setup_m_switch(): runner = DebuggerRunnerSimple() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_unittest.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_unittest.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_unittest.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/debugger_unittest.py 2020-12-01 23:26:18.000000000 +0000 @@ -450,6 +450,30 @@ "\n\n===========================\nLog:\n" + '\n'.join(getattr(writerThread, 'log', []))) +# noinspection PyProtectedMember +def _create_socket(port=None): + if hasattr(_create_socket, '_used_ports'): + assert port not in _create_socket._used_ports, 'Socket already initialized.' + else: + _create_socket._used_ports = set() + + if port is not None: + _create_socket._used_ports.add(port) + + from _pydev_bundle.pydev_localhost import get_socket_name + if SHOW_WRITES_AND_READS: + print('start_socket') + + if port is None: + socket_name = get_socket_name(close=True) + else: + socket_name = (pydev_localhost.get_localhost(), port) + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + sock.bind(socket_name) + return sock + + #======================================================================================================================= # AbstractWriterThread #======================================================================================================================= @@ -485,7 +509,8 @@ 'warning: Debugger speedups', 'pydev debugger: New process is launching', 'pydev debugger: To debug that process', - )): + 'pydev debugger: process' + )): return True if re.match(r'^(\d+)\t(\d)+', line): @@ -592,20 +617,9 @@ return self.reader_thread.get_next_message(context_message, timeout=timeout) def start_socket(self, port=None): - assert not hasattr(self, 'port'), 'Socket already initialized.' - from _pydev_bundle.pydev_localhost import get_socket_name - if SHOW_WRITES_AND_READS: - print('start_socket') - self._sequence = -1 - if port is None: - socket_name = get_socket_name(close=True) - else: - socket_name = (pydev_localhost.get_localhost(), port) - server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - server_socket.bind(socket_name) - self.port = socket_name[1] + server_socket = _create_socket(port) + self.port = server_socket.getsockname()[1] server_socket.listen(1) if SHOW_WRITES_AND_READS: print('Waiting in socket.accept()') @@ -1050,6 +1064,38 @@ wait_for_condition(condition, msg, timeout=5, sleep=.5) +class AbstractDispatcherThread(AbstractWriterThread): + """For using with the ``--multiproc`` option. Allocates new writers and dispatches breakpoints to them.""" + def __init__(self): + super(AbstractDispatcherThread, self).__init__() + self.writers = [] + self._sequence = -1 + self._breakpoints = [] + + def run(self): + server_socket = _create_socket() + server_socket.listen(1) + self.port = server_socket.getsockname()[1] + self.finished_initialization = True + + while True: + self.sock, addr = server_socket.accept() + new_writer = AbstractWriterThread() + new_writer.TEST_FILE = self.TEST_FILE + new_writer.start() + wait_for_condition(lambda: hasattr(new_writer, 'port')) + self.write('99\t-1\t%d' % new_writer.port) + wait_for_condition(lambda: new_writer.finished_initialization) + + for args, kwargs in self._breakpoints: + new_writer.write_add_breakpoint(*args, **kwargs) + + self.writers.append(new_writer) + + def write_add_breakpoint(self, *args, **kwargs): + self._breakpoints.append((args, kwargs)) + + def _get_debugger_test_file(filename): try: rPath = os.path.realpath # @UndefinedVariable diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_environment_reset_on_fork.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_environment_reset_on_fork.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_environment_reset_on_fork.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_environment_reset_on_fork.py 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,36 @@ +""" +Check that the debugging environment is reset when forking a new process. + +In particular it tests that: + +- a new instance of the debugger is created in the forked process +- all thread tracing functions are reset on fork so the original debugger instance does not leak through them + +.. note:: Meaningful only when frame evaluation is enabled. + +""" +import os +import sys + +from _pydevd_bundle.pydevd_constants import get_global_debugger +from _pydevd_frame_eval.pydevd_frame_eval_cython_wrapper import get_thread_info_py + + +def _get_thread_trace_func_debugger(): + thread_info = get_thread_info_py() + # noinspection PyProtectedMember + return thread_info.thread_trace_func._args[0] + + +if __name__ == '__main__': + original_debugger = get_global_debugger() + pid = os.fork() # break here + if pid == 0: + debugger_in_fork = get_global_debugger() + assert original_debugger is not debugger_in_fork, "The debugger in the forked process is a copy of the original debugger." + # noinspection PyProtectedMember,PyUnresolvedReferences,PyUnresolvedReferences + frame = sys._getframe() + assert frame.f_trace is not None, "The trace function expected to be set, but it is `None`." + assert original_debugger is not _get_thread_trace_func_debugger(), "The thread trace function uses the debugger from the parent " \ + "process. " + print('TEST SUCEEDED') diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_fork.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_fork.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_fork.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_fork.py 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,6 @@ +import os + +if __name__ == '__main__': + pid = os.fork() + if pid == 0: + print('TEST SUCEEDED!') # break here diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/test_debugger.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/test_debugger.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/test_debugger.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/test_debugger.py 2020-12-01 23:26:18.000000000 +0000 @@ -2129,6 +2129,55 @@ writer.write_run_thread(hit2.thread_id) writer.finished_ok = True + +@pytest.mark.skipif(not IS_CPYTHON, reason='CPython only test.') +def test_fork_no_attach(case_setup): + with case_setup.test_file('_debugger_case_fork.py') as writer: + writer.write_add_breakpoint(writer.get_line_index_with_content('break here')) + writer.write_make_initial_run() + writer.finished_ok = True + + +@pytest.mark.skipif(not IS_CPYTHON, reason='CPython only test.') +def test_fork_with_attach_no_breakpoints(case_setup_multiproc): + with case_setup_multiproc.test_file('_debugger_case_fork.py') as writer: + wait_for_condition(lambda: len(writer.writers) == 1) + writer1 = writer.writers[0] + writer1.write_make_initial_run() + + wait_for_condition(lambda: len(writer.writers) == 2) + writer2 = writer.writers[1] + writer2.write_make_initial_run() + + for w in writer.writers: + w.finished_ok = True + + writer.finished_ok = True + + +@pytest.mark.skip('PY-44245 - forking with breakpoints available hangs the debugger') +@pytest.mark.skipif(not IS_CPYTHON, reason='CPython only test.') +def test_fork_with_attach(case_setup_multiproc): + with case_setup_multiproc.test_file('_debugger_case_fork.py') as writer: + break_line = writer.get_line_index_with_content('break here') + writer.write_add_breakpoint(break_line) + + wait_for_condition(lambda: len(writer.writers) == 1) + writer1 = writer.writers[0] + writer1.write_make_initial_run() + + wait_for_condition(lambda: len(writer.writers) == 2) + writer2 = writer.writers[1] + writer2.write_make_initial_run() + + hit1 = writer1.wait_for_breakpoint_hit() + writer1.write_run_thread(hit1.thread_id) + + for w in writer.writers: + w.finished_ok = True + + writer.finished_ok = True + @pytest.mark.skipif(not IS_CPYTHON, reason='CPython only test.') def test_remote_debugger_basic(case_setup_remote): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py --- pycharm-2020.2.5/plugins/python-ce/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py 2020-12-01 23:26:18.000000000 +0000 @@ -4,7 +4,7 @@ import time from contextlib import contextmanager -from pydev_tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON +from pydev_tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON, wait_for_condition from pydev_tests_python.debug_constants import TEST_CYTHON pytest_plugins = [ @@ -14,20 +14,21 @@ pytestmark = pytest.mark.skipif(not IS_PY36_OR_GREATER or not IS_CPYTHON or not TEST_CYTHON, reason='Requires CPython >= 3.6') +def _get_environ(writer): + env = os.environ.copy() + env['PYDEVD_USE_FRAME_EVAL'] = 'YES' + env['PYDEVD_USE_CYTHON'] = 'YES' + return env + + @pytest.fixture def case_setup_force_frame_eval(case_setup): - def get_environ(writer): - env = os.environ.copy() - env['PYDEVD_USE_FRAME_EVAL'] = 'YES' - env['PYDEVD_USE_CYTHON'] = 'YES' - return env - original_test_file = case_setup.test_file @contextmanager def test_file(*args, **kwargs): - kwargs.setdefault('get_environ', get_environ) + kwargs.setdefault('get_environ', _get_environ) with original_test_file(*args, **kwargs) as writer: yield writer @@ -251,3 +252,39 @@ writer.write_run_thread(hit.thread_id) writer.finished_ok = True + + +@pytest.fixture +def case_setup_multiproc_force_frame_eval(case_setup_multiproc): + + original_test_file = case_setup_multiproc.test_file + + @contextmanager + def test_file(*args, **kwargs): + kwargs.setdefault('get_environ', _get_environ) + with original_test_file(*args, **kwargs) as writer: + yield writer + + case_setup_multiproc.test_file = test_file + return case_setup_multiproc + + +def test_frame_eval_reset_environment_on_fork(case_setup_multiproc_force_frame_eval): + with case_setup_multiproc_force_frame_eval.test_file('_debugger_case_environment_reset_on_fork.py') as writer: + break_line = writer.get_line_index_with_content('break here') + + writer.write_add_breakpoint(break_line) + + wait_for_condition(lambda: len(writer.writers) == 1) + writer1 = writer.writers[0] + + writer1.write_make_initial_run() + + hit = writer1.wait_for_breakpoint_hit(line=break_line) + writer1.write_run_thread(hit.thread_id) + + wait_for_condition(lambda: len(writer.writers) == 2) + writer2 = writer.writers[1] + writer2.write_make_initial_run() + + writer.all_finished_ok() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/python-skeletons/lettuce/__init__.py pycharm-2020.3/plugins/python-ce/helpers/python-skeletons/lettuce/__init__.py --- pycharm-2020.2.5/plugins/python-ce/helpers/python-skeletons/lettuce/__init__.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/python-skeletons/lettuce/__init__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# coding=utf-8 -__author__ = 'Ilya.Kazakevich' diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/python-skeletons/lettuce/terrain.py pycharm-2020.3/plugins/python-ce/helpers/python-skeletons/lettuce/terrain.py --- pycharm-2020.2.5/plugins/python-ce/helpers/python-skeletons/lettuce/terrain.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/python-skeletons/lettuce/terrain.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -# coding=utf-8 -""" -Lettuce terrain hooks: http://lettuce.it/reference/terrain.html -""" -__author__ = 'Ilya.Kazakevich' - - -class __When(object): - @staticmethod - def all(function): - """ - Runs before/after all features, scenarios and steps - """ - pass - - @staticmethod - def each_step(function): - """ - Runs before/after each step - """ - pass - - @staticmethod - def each_scenario(function): - """ - Runs before/after each scenario - """ - pass - - @staticmethod - def each_outline(function): - """ - Runs before/after each outline in scenario outline. - Accepts scenario (object) and outline(dict) as arguments. - Available only since 0.22 - """ - pass - - @staticmethod - def each_background(function): - """ - Runs before/after each background - """ - pass - - @staticmethod - def each_feature(function): - """ - Runs before/after each feature - """ - pass - - @staticmethod - def each_app(function): - """ - Runs before/after each Django app. - """ - pass - - @staticmethod - def runserver(function): - """ - Runs before/after lettuce starts up the built-in http server. - """ - pass - - @staticmethod - def handle_request(function): - """ - Runs before/after lettuce’s built-in HTTP server responds to a request. - """ - pass - - -before = __When() -after = __When() - diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/tools/versions.xml pycharm-2020.3/plugins/python-ce/helpers/tools/versions.xml --- pycharm-2020.2.5/plugins/python-ce/helpers/tools/versions.xml 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/tools/versions.xml 2020-12-01 23:26:18.000000000 +0000 @@ -25,11 +25,15 @@ _gdbm _imp _io + _lzma _markupbase _md5 + _msi _opcode _operator _osx_support + _overlapped + _peg_parser _pickle _posixshmem _posixsubprocess @@ -54,11 +58,14 @@ _testinternalcapi _testmultiphase _thread + _tkinter _tracemalloc _uuid _weakrefset + _winapi _xxsubinterpreters _xxtestfuzz + _zoneinfo antigravity argparse asyncio @@ -87,6 +94,7 @@ asyncio.subprocess asyncio.tasks asyncio.test_utils + asyncio.threads asyncio.transports asyncio.trsock asyncio.unix_events @@ -160,6 +168,7 @@ ensurepip._uninstall enum faulthandler + graphlib html html.entities html.parser @@ -304,11 +313,14 @@ idlelib.zoomheight idlelib.zzdummy importlib + importlib._abc importlib._bootstrap importlib._bootstrap_external + importlib._common importlib.abc importlib.machinery importlib.metadata + importlib.readers importlib.resources importlib.util ipaddress @@ -322,6 +334,11 @@ lib2to3.tests.__main__ linuxaudiodev lzma + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multiprocessing.context multiprocessing.forkserver multiprocessing.popen_fork @@ -333,6 +350,7 @@ multiprocessing.semaphore_tracker multiprocessing.shared_memory multiprocessing.spawn + nt ossaudiodev pathlib pip @@ -649,7 +667,6 @@ sysconfig tkinter tkinter.__main__ - tkinter._fix tkinter.colorchooser tkinter.commondialog tkinter.constants @@ -706,6 +723,7 @@ turtledemo.yinyang typing unittest.__main__ + unittest._log unittest.async_case unittest.case unittest.loader @@ -753,11 +771,17 @@ urllib.robotparser venv venv.__main__ + winreg + winsound xmlrpc xmlrpc.client xmlrpc.server xxlimited zipapp + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo BlockingIOError BrokenPipeError ChildProcessError @@ -777,6 +801,7 @@ ResourceWarning StopAsyncIteration TimeoutError + WindowsError __build_class__ __loader__ __spec__ @@ -806,10 +831,14 @@ _fileio _gdbm _imp + _lzma _markupbase _md5 + _msi _opcode _operator + _overlapped + _peg_parser _pickle _posixshmem _posixsubprocess @@ -832,10 +861,13 @@ _testinternalcapi _testmultiphase _thread + _tkinter _tracemalloc _uuid + _winapi _xxsubinterpreters _xxtestfuzz + _zoneinfo asyncio asyncio.__main__ asyncio.base_events @@ -862,6 +894,7 @@ asyncio.subprocess asyncio.tasks asyncio.test_utils + asyncio.threads asyncio.transports asyncio.trsock asyncio.unix_events @@ -908,6 +941,7 @@ ensurepip._bundled enum faulthandler + graphlib html html.entities html.parser @@ -1024,11 +1058,14 @@ idlelib.window idlelib.zoomheight idlelib.zzdummy + importlib._abc importlib._bootstrap importlib._bootstrap_external + importlib._common importlib.abc importlib.machinery importlib.metadata + importlib.readers importlib.resources importlib.util ipaddress @@ -1036,6 +1073,11 @@ lib2to3.fixes.fix_reload lib2to3.tests.__main__ lzma + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multiprocessing.context multiprocessing.forkserver multiprocessing.popen_fork @@ -1047,6 +1089,7 @@ multiprocessing.semaphore_tracker multiprocessing.shared_memory multiprocessing.spawn + nt pathlib pydoc_topics queue @@ -1058,7 +1101,6 @@ statistics tkinter tkinter.__main__ - tkinter._fix tkinter.colorchooser tkinter.commondialog tkinter.constants @@ -1113,6 +1155,7 @@ turtledemo.wikipedia turtledemo.yinyang typing + unittest._log unittest.async_case unittest.mock unittest.test.__main__ @@ -1137,11 +1180,17 @@ urllib.robotparser venv venv.__main__ + winreg + winsound xmlrpc xmlrpc.client xmlrpc.server xxlimited zipapp + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo BlockingIOError BrokenPipeError ChildProcessError @@ -1161,6 +1210,7 @@ ResourceWarning StopAsyncIteration TimeoutError + WindowsError __build_class__ __loader__ __spec__ @@ -1168,18 +1218,21 @@ breakpoint exec - + BaseHTTPServer Bastion + CDROM CGIHTTPServer Canvas ConfigParser Cookie + DLFCN Dialog DocXMLRPCServer FileDialog FixTk HTMLParser + IN MimeWriter Queue ScrolledText @@ -1188,6 +1241,7 @@ SimpleXMLRPCServer SocketServer StringIO + TYPES Tix Tkconstants Tkdnd @@ -1199,40 +1253,32 @@ _MozillaCookieJar __builtin__ __main__ - _abc _abcoll - _aix_support - _asyncio - _blake2 - _bootsubprocess _bytesio - _compression - _contextvars + _crypt + _ctypes_test + _curses + _curses_panel + _dbm + _dummy_thread _fileio + _gdbm _hotshot + _peg_parser _posixshmem - _py_abc - _pydecimal - _queue - _sha3 - _signal - _statistics + _posixsubprocess + _sysconfigdata _sysconfigdata__linux_x86_64-linux-gnu _sysconfigdata_m_linux_x86_64-linux-gnu + _testbuffer + _testcapi + _testimportmultiple _testinternalcapi _testmultiphase - _uuid - _xxsubinterpreters _xxtestfuzz anydbm - asyncio.__main__ - asyncio.base_futures - asyncio.base_tasks - asyncio.exceptions - asyncio.format_helpers - asyncio.runners - asyncio.staggered - asyncio.trsock + asyncio.compat + asyncio.test_utils audiodev bsddb bsddb.db @@ -1268,6 +1314,7 @@ bsddb.test.test_thread cPickle cStringIO + collections.__main__ commands compiler compiler.ast @@ -1280,41 +1327,38 @@ compiler.syntax compiler.transformer compiler.visitor - contextvars cookielib copy_reg - ctypes._aix ctypes.test.runtests ctypes.test.test_errcheck ctypes.test.test_integers curses.wrapper - dataclasses dbhash dircache - distutils._msvccompiler distutils.emxccompiler distutils.mwerkscompiler distutils.tests.setuptools_build_ext distutils.tests.setuptools_extension distutils.tests.test_ccompiler - distutils.tests.test_msvccompiler dumbdbm dummy_thread + dummy_threading email.test email.test.test_email email.test.test_email_codecs email.test.test_email_codecs_renamed email.test.test_email_renamed email.test.test_email_torture - encodings.koi8_t - encodings.kz1048 - encodings.oem + encodings.cp65001 + encodings.mac_centeuro encodings.string_escape - ensurepip._bundled + encodings.unicode_internal exceptions + fcntl fpformat future_builtins gdbm + grp hotshot hotshot.log hotshot.stats @@ -1322,118 +1366,79 @@ htmlentitydefs htmllib httplib + idlelib.AutoComplete + idlelib.AutoCompleteWindow + idlelib.AutoExpand + idlelib.Bindings + idlelib.CallTipWindow + idlelib.CallTips + idlelib.ClassBrowser + idlelib.CodeContext + idlelib.ColorDelegator + idlelib.Debugger + idlelib.Delegator + idlelib.EditorWindow + idlelib.FileList + idlelib.FormatParagraph + idlelib.GrepDialog + idlelib.HyperParser + idlelib.IOBinding + idlelib.IdleHistory + idlelib.MultiCall + idlelib.MultiStatusBar + idlelib.ObjectBrowser + idlelib.OutputWindow + idlelib.ParenMatch + idlelib.PathBrowser + idlelib.Percolator + idlelib.PyParse + idlelib.PyShell + idlelib.RemoteDebugger + idlelib.RemoteObjectBrowser + idlelib.ReplaceDialog + idlelib.RstripExtension + idlelib.ScriptBinding + idlelib.ScrolledList + idlelib.SearchDialog + idlelib.SearchDialogBase + idlelib.SearchEngine + idlelib.StackViewer + idlelib.ToolTip + idlelib.TreeWidget + idlelib.UndoDelegator + idlelib.WidgetRedirector + idlelib.WindowList + idlelib.ZoomHeight idlelib._pyclbr - idlelib.autocomplete - idlelib.autocomplete_w - idlelib.autoexpand - idlelib.browser - idlelib.calltip - idlelib.calltip_w - idlelib.codecontext - idlelib.colorizer - idlelib.config - idlelib.config_key - idlelib.configdialog - idlelib.debugger - idlelib.debugger_r - idlelib.debugobj - idlelib.debugobj_r - idlelib.delegator - idlelib.dynoption - idlelib.editor - idlelib.filelist - idlelib.format - idlelib.grep - idlelib.help_about - idlelib.history - idlelib.hyperparser - idlelib.idle_test.template - idlelib.idle_test.test_autocomplete_w - idlelib.idle_test.test_browser - idlelib.idle_test.test_calltip - idlelib.idle_test.test_calltip_w - idlelib.idle_test.test_codecontext - idlelib.idle_test.test_colorizer - idlelib.idle_test.test_config + idlelib.aboutDialog + idlelib.configDialog + idlelib.configHandler + idlelib.configHelpSourceEdit + idlelib.configSectionNameDialog + idlelib.dynOptionMenuWidget + idlelib.idle_test.test_calltips idlelib.idle_test.test_config_help - idlelib.idle_test.test_config_key - idlelib.idle_test.test_debugger - idlelib.idle_test.test_debugger_r - idlelib.idle_test.test_debugobj - idlelib.idle_test.test_debugobj_r - idlelib.idle_test.test_editmenu - idlelib.idle_test.test_filelist - idlelib.idle_test.test_format - idlelib.idle_test.test_help - idlelib.idle_test.test_help_about + idlelib.idle_test.test_config_name + idlelib.idle_test.test_formatparagraph idlelib.idle_test.test_helpabout - idlelib.idle_test.test_history - idlelib.idle_test.test_iomenu - idlelib.idle_test.test_macosx - idlelib.idle_test.test_mainmenu - idlelib.idle_test.test_multicall - idlelib.idle_test.test_outwin + idlelib.idle_test.test_idlehistory + idlelib.idle_test.test_io idlelib.idle_test.test_paragraph - idlelib.idle_test.test_percolator - idlelib.idle_test.test_pyparse - idlelib.idle_test.test_pyshell - idlelib.idle_test.test_query - idlelib.idle_test.test_redirector - idlelib.idle_test.test_replace idlelib.idle_test.test_replacedialog - idlelib.idle_test.test_rpc - idlelib.idle_test.test_run - idlelib.idle_test.test_runscript - idlelib.idle_test.test_scrolledlist - idlelib.idle_test.test_search - idlelib.idle_test.test_searchbase + idlelib.idle_test.test_rstrip idlelib.idle_test.test_searchdialog - idlelib.idle_test.test_sidebar - idlelib.idle_test.test_squeezer - idlelib.idle_test.test_stackviewer - idlelib.idle_test.test_statusbar - idlelib.idle_test.test_tooltip - idlelib.idle_test.test_tree - idlelib.idle_test.test_undo + idlelib.idle_test.test_searchdialogbase idlelib.idle_test.test_undodelegator - idlelib.idle_test.test_window - idlelib.idle_test.test_zoomheight - idlelib.iomenu - idlelib.macosx - idlelib.mainmenu - idlelib.multicall - idlelib.outwin + idlelib.idle_test.test_widgetredir + idlelib.idlever + idlelib.keybindingDialog + idlelib.macosxSupport idlelib.paragraph - idlelib.parenmatch - idlelib.pathbrowser - idlelib.percolator - idlelib.pyparse - idlelib.pyshell - idlelib.query - idlelib.redirector - idlelib.replace idlelib.rstrip - idlelib.runscript - idlelib.scrolledlist - idlelib.search - idlelib.searchbase - idlelib.searchengine - idlelib.sidebar - idlelib.squeezer - idlelib.stackviewer - idlelib.statusbar + idlelib.tabbedpages idlelib.testcode - idlelib.textview - idlelib.tooltip - idlelib.tree - idlelib.undo - idlelib.window - idlelib.zoomheight - idlelib.zzdummy + idlelib.textView ihooks - importlib._bootstrap_external - importlib.metadata - importlib.resources imputil json.tests json.tests.test_check_circular @@ -1453,7 +1458,10 @@ json.tests.test_speedups json.tests.test_tool json.tests.test_unicode + lib2to3.fixes.fix_callable linuxaudiodev + macpath + macurl2path markupbase md5 mhlib @@ -1461,11 +1469,13 @@ mimify multifile multiprocessing.forking - multiprocessing.resource_tracker - multiprocessing.shared_memory + multiprocessing.semaphore_tracker mutex new + nis os2emxpath + ossaudiodev + parser pip pip.__main__ pip._internal @@ -1769,23 +1779,30 @@ pip._vendor.webencodings.tests pip._vendor.webencodings.x_user_defined popen2 + posix posixfile + pwd pydoc_topics + readline repr + resource rexec rfc822 robotparser - secrets sets sgmllib sha - sqlite3.test.backup + spwd sqlite3.test.py25tests sre statvfs stringold strop sunaudio + symbol + syslog + termios + test thread tkColorChooser tkCommonDialog @@ -1795,27 +1812,17 @@ tkSimpleDialog toaiff ttk - turtledemo.rosette - turtledemo.sorting_animate - typing - unittest.async_case - unittest.test.test_async_case - unittest.test.testmock.testasync - unittest.test.testmock.testsealable + turtledemo.wikipedia urllib2 urlparse user whichdb xmllib xmlrpclib - zipapp - ModuleNotFoundError - RecursionError + xxlimited StandardError - StopAsyncIteration apply basestring - breakpoint buffer cmp coerce @@ -1871,6 +1878,10 @@ _contextvars _fileio _hotshot + _lzma + _msi + _overlapped + _peg_parser _posixshmem _py_abc _queue @@ -1879,9 +1890,12 @@ _sysconfigdata__linux_x86_64-linux-gnu _sysconfigdata_m_linux_x86_64-linux-gnu _testinternalcapi + _tkinter _uuid + _winapi _xxsubinterpreters _xxtestfuzz + _zoneinfo anydbm asyncio.__main__ asyncio.base_futures @@ -1890,6 +1904,7 @@ asyncio.format_helpers asyncio.runners asyncio.staggered + asyncio.threads asyncio.trsock audiodev bsddb @@ -1969,6 +1984,7 @@ fpformat future_builtins gdbm + graphlib hotshot hotshot.log hotshot.stats @@ -2078,7 +2094,10 @@ idlelib.zoomheight idlelib.zzdummy ihooks + importlib._abc + importlib._common importlib.metadata + importlib.readers importlib.resources imputil json.tests @@ -2106,12 +2125,18 @@ mhlib mimetools mimify + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multifile multiprocessing.forking multiprocessing.resource_tracker multiprocessing.shared_memory mutex new + nt os2emxpath pip pip.__main__ @@ -2440,10 +2465,10 @@ tkFont tkMessageBox tkSimpleDialog - tkinter._fix toaiff ttk turtledemo.rosette + unittest._log unittest.async_case unittest.test.test_async_case unittest.test.testmock.testasync @@ -2452,10 +2477,17 @@ urlparse user whichdb + winreg + winsound xmllib xmlrpclib + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo ModuleNotFoundError StandardError + WindowsError apply basestring breakpoint @@ -2516,6 +2548,10 @@ _contextvars _fileio _hotshot + _lzma + _msi + _overlapped + _peg_parser _posixshmem _py_abc _queue @@ -2523,15 +2559,19 @@ _sysconfigdata _sysconfigdata__linux_x86_64-linux-gnu _testinternalcapi + _tkinter _uuid + _winapi _xxsubinterpreters _xxtestfuzz + _zoneinfo anydbm asyncio.__main__ asyncio.exceptions asyncio.format_helpers asyncio.runners asyncio.staggered + asyncio.threads asyncio.trsock audiodev bsddb @@ -2611,6 +2651,7 @@ fpformat future_builtins gdbm + graphlib hotshot hotshot.log hotshot.stats @@ -2690,7 +2731,10 @@ idlelib.testcode idlelib.textView ihooks + importlib._abc + importlib._common importlib.metadata + importlib.readers importlib.resources imputil json.tests @@ -2718,12 +2762,18 @@ mhlib mimetools mimify + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multifile multiprocessing.forking multiprocessing.resource_tracker multiprocessing.shared_memory mutex new + nt os2emxpath pip pip.__main__ @@ -3051,10 +3101,10 @@ tkFont tkMessageBox tkSimpleDialog - tkinter._fix toaiff ttk turtledemo.wikipedia + unittest._log unittest.async_case unittest.test.test_async_case unittest.test.testmock.testasync @@ -3063,9 +3113,16 @@ urlparse user whichdb + winreg + winsound xmllib xmlrpclib + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo StandardError + WindowsError apply basestring breakpoint @@ -3124,18 +3181,26 @@ _bytesio _fileio _hotshot + _lzma + _msi + _overlapped + _peg_parser _posixshmem _statistics _sysconfigdata _sysconfigdata__linux_x86_64-linux-gnu _testinternalcapi + _tkinter + _winapi _xxsubinterpreters + _zoneinfo anydbm asyncio.__main__ asyncio.compat asyncio.exceptions asyncio.staggered asyncio.test_utils + asyncio.threads asyncio.trsock audiodev bsddb @@ -3212,6 +3277,7 @@ fpformat future_builtins gdbm + graphlib hotshot hotshot.log hotshot.stats @@ -3292,7 +3358,10 @@ idlelib.testcode idlelib.textView ihooks + importlib._abc + importlib._common importlib.metadata + importlib.readers imputil json.tests json.tests.test_check_circular @@ -3320,12 +3389,18 @@ mhlib mimetools mimify + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multifile multiprocessing.forking multiprocessing.resource_tracker multiprocessing.shared_memory mutex new + nt os2emxpath pip pip.__main__ @@ -3652,10 +3727,10 @@ tkFont tkMessageBox tkSimpleDialog - tkinter._fix toaiff ttk turtledemo.wikipedia + unittest._log unittest.async_case unittest.test.test_async_case unittest.test.testmock.testasync @@ -3663,9 +3738,16 @@ urlparse user whichdb + winreg + winsound xmllib xmlrpclib + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo StandardError + WindowsError apply basestring buffer @@ -3723,11 +3805,19 @@ _bytesio _fileio _hotshot + _lzma + _msi + _overlapped + _peg_parser _sysconfigdata _sysconfigdata_m_linux_x86_64-linux-gnu + _tkinter + _winapi + _zoneinfo anydbm asyncio.compat asyncio.test_utils + asyncio.threads audiodev bsddb bsddb.db @@ -3805,6 +3895,7 @@ fpformat future_builtins gdbm + graphlib hotshot hotshot.log hotshot.stats @@ -3885,6 +3976,9 @@ idlelib.testcode idlelib.textView ihooks + importlib._abc + importlib._common + importlib.readers imputil json.tests json.tests.test_check_circular @@ -3913,11 +4007,17 @@ mhlib mimetools mimify + msilib + msilib.schema + msilib.sequence + msilib.text + msvcrt multifile multiprocessing.forking multiprocessing.semaphore_tracker mutex new + nt os2emxpath pip pip.__main__ @@ -4244,17 +4344,24 @@ tkFont tkMessageBox tkSimpleDialog - tkinter._fix toaiff ttk turtledemo.wikipedia + unittest._log urllib2 urlparse user whichdb + winreg + winsound xmllib xmlrpclib + zoneinfo + zoneinfo._common + zoneinfo._tzpath + zoneinfo._zoneinfo StandardError + WindowsError apply basestring buffer @@ -4308,11 +4415,26 @@ __main__ _abcoll _bytesio + _crypt + _ctypes_test + _curses + _curses_panel + _dbm _dummy_thread _fileio + _gdbm _hotshot + _posixshmem + _posixsubprocess _sysconfigdata + _sysconfigdata__linux_x86_64-linux-gnu _sysconfigdata_m_linux_x86_64-linux-gnu + _testbuffer + _testcapi + _testimportmultiple + _testinternalcapi + _testmultiphase + _xxtestfuzz anydbm asyncio.compat asyncio.test_utils @@ -4391,9 +4513,11 @@ encodings.string_escape encodings.unicode_internal exceptions + fcntl fpformat future_builtins gdbm + grp hotshot hotshot.log hotshot.stats @@ -4474,6 +4598,8 @@ idlelib.testcode idlelib.textView ihooks + importlib._abc + importlib.readers imputil json.tests json.tests.test_check_circular @@ -4507,7 +4633,9 @@ multiprocessing.semaphore_tracker mutex new + nis os2emxpath + ossaudiodev pip pip.__main__ pip._internal @@ -4811,21 +4939,29 @@ pip._vendor.webencodings.tests pip._vendor.webencodings.x_user_defined popen2 + posix posixfile + pwd pydoc_topics + readline repr + resource rexec rfc822 robotparser sets sgmllib sha + spwd sqlite3.test.py25tests sre statvfs stringold strop sunaudio + syslog + termios + test thread tkColorChooser tkCommonDialog @@ -4833,7 +4969,6 @@ tkFont tkMessageBox tkSimpleDialog - tkinter._fix toaiff ttk turtledemo.wikipedia @@ -4841,9 +4976,9 @@ urlparse user whichdb - xml.etree.cElementTree xmllib xmlrpclib + xxlimited StandardError apply basestring diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/CONTRIBUTING.md pycharm-2020.3/plugins/python-ce/helpers/typeshed/CONTRIBUTING.md --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/CONTRIBUTING.md 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/CONTRIBUTING.md 2020-12-01 23:26:18.000000000 +0000 @@ -15,6 +15,7 @@ but [contact us](#discussion) before starting significant work. * Create your stubs [conforming to the coding style](#stub-file-coding-style). * Make sure your tests pass cleanly on `mypy`, `pytype`, and `flake8`. + * Reformat your stubs with `black` and `isort`. 4. [Submit your changes](#submitting-changes) by opening a pull request. 5. You can expect a reply within a few days: * Diffs are merged when considered ready by the core team. @@ -222,8 +223,14 @@ * use variable annotations instead of type comments, even for stubs that target older versions of Python; * for arguments with a type and a default, use spaces around the `=`. -The code formatter [black](https://github.com/psf/black) will format -stubs according to this standard. + +Stubs should be reformatted with the formatters +[black](https://github.com/psf/black) and +[isort](https://github.com/timothycrosley/isort) before submission. +These formatters are included in typeshed's `requirements-tests-py3.txt` file. +A sample `pre-commit` file is included in the typeshed repository. Copy it +to `.git/hooks` and adjust the path to your virtual environment's `bin` +directory to automatically reformat stubs before commit. Stub files should only contain information necessary for the type checker, and leave out unnecessary detail: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.flake8 pycharm-2020.3/plugins/python-ce/helpers/typeshed/.flake8 --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.flake8 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/.flake8 2020-12-01 23:26:18.000000000 +0000 @@ -14,6 +14,7 @@ [flake8] per-file-ignores = + *.py: E203, W503 *.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822 # Since typing.pyi defines "overload" this is not recognized by flake8 as typing.overload. # Unfortunately, flake8 does not allow to "noqa" just a specific error inside the file itself. diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/mypy_primer.yml pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/mypy_primer.yml --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/mypy_primer.yml 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/mypy_primer.yml 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,57 @@ +name: Run mypy_primer + +on: + # Only run on PR, since we diff against master + # pull_request_target gives us access to a write token + pull_request_target: + +jobs: + mypy_primer: + name: Run mypy_primer + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + path: typeshed_to_test + fetch-depth: 0 + # pull_request_target checks out the PR base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install -U pip + pip install git+https://github.com/hauntsaninja/mypy_primer.git + - name: Run mypy_primer + shell: bash + run: | + cd typeshed_to_test + echo "new commit" + COMMIT=$(git rev-parse HEAD) + git rev-list --format=%s --max-count=1 $COMMIT + git checkout -b upstream_master origin/master + echo "base commit" + git rev-list --format=%s --max-count=1 upstream_master + echo '' + cd .. + ( mypy_primer --new 0.790 --old 0.790 --custom-typeshed-repo typeshed_to_test --new-typeshed $COMMIT --old-typeshed upstream_master -o concise | tee diff.txt ) || [ $? -eq 1 ] + - name: Post comment + uses: actions/github-script@v3 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const fs = require('fs').promises; + try { + data = await fs.readFile('diff.txt', 'utf-8') + if (data.trim()) { + await github.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```' + }) + } + } catch (error) { + console.log(error) + } diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/stubtest-unused-whitelist.yml pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/stubtest-unused-whitelist.yml --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/stubtest-unused-whitelist.yml 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/stubtest-unused-whitelist.yml 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,56 @@ +name: Remove unused stubtest whitelist entries + +on: + workflow_dispatch: + schedule: + - cron: '0 4 * * SAT' + +jobs: + stubtest: + if: github.repository == 'python/typeshed' + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: ["ubuntu-latest", "windows-latest"] + python-version: [3.6, 3.7, 3.8, 3.9] + fail-fast: false + + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install -U pip + pip install -U git+git://github.com/python/mypy@24fdf343 + - name: Run stubtest + shell: bash + run: ./tests/stubtest_unused.py | tee stubtest-output-${{ matrix.os }}-${{ matrix.python-version }} || true + - name: Store output + uses: actions/upload-artifact@v2 + with: + name: stubtest-output + path: stubtest-output-${{ matrix.os }}-${{ matrix.python-version }} + + collate: + if: github.repository == 'python/typeshed' + runs-on: ubuntu-latest + needs: stubtest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - name: Get stubtest outputs + uses: actions/download-artifact@v2 + with: + name: stubtest-output + - name: Collate duplicates + run: cat stubtest-output-* | sort -u | tee stubtest-output + - name: Remove entries from whitelists + run: python scripts/update-stubtest-whitelist.py stubtest-output + - name: Create pull request + uses: peter-evans/create-pull-request@v2 + with: + commit-message: Remove unused stubtest whitelist entries + title: "[gh-action] Remove unused stubtest whitelist entries" diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/tests.yml pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/tests.yml --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.github/workflows/tests.yml 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/.github/workflows/tests.yml 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,106 @@ +name: Check stubs + +on: + push: + pull_request: + +jobs: + file-consistency: + name: Check file consistency + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: ./tests/check_consistent.py + + flake8: + name: Lint with flake8 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: | + pip install $(grep flake8 requirements-tests-py3.txt) + flake8 + + black: + name: Check formatting with black + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: | + pip install $(grep black requirements-tests-py3.txt) + black --check --diff stdlib third_party + + isort: + name: Check imports with isort + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: | + pip install $(grep isort requirements-tests-py3.txt) + isort --check-only --diff stdlib third_party + + pytype: + name: Run pytype against the stubs + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.6 + - run: pip install -r requirements-tests-py3.txt + - run: ./tests/pytype_test.py + + mypy: + name: Run mypy against the stubs + runs-on: ubuntu-latest + strategy: + matrix: + platform: ["linux", "win32", "darwin"] + fail-fast: false + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: pip install -U git+git://github.com/python/mypy + - run: ./tests/mypy_test.py --platform=${{ matrix.platform }} + + mypy-self-check: + name: Check mypy source with itself + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: ./tests/mypy_self_check.py + + mypy-test-suite: + name: Run the mypy test suite + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - run: ./tests/mypy_test_suite.py + + stubtest: + name: Check stubs with stubtest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: ["ubuntu-latest", "windows-latest"] + python-version: [3.6, 3.7, 3.8, 3.9] + fail-fast: false + + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install -U pip + pip install -U git+git://github.com/python/mypy@24fdf343 + - name: Run stubtest + run: python tests/stubtest_test.py --ignore-unused-whitelist diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/pre-commit pycharm-2020.3/plugins/python-ce/helpers/typeshed/pre-commit --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/pre-commit 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/pre-commit 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh +# +# An example hook script that will run flake8, black, and isort +# prior to committing and will stop the commit if there are any +# warnings. Adjust BIN_DIR to the virtual environment where flake8, +# black, and isort are installed. +# +# To enable this hook, copy this file to ".git/hooks". + +BIN_DIR=./.venv/bin + +CHANGED_FILES=$(git diff --cached --name-only --diff-filter=AM | grep .pyi || true) + +if test -n "${CHANGED_FILES}" -a -d "${BIN_DIR}"; then + ${BIN_DIR}/flake8 ${CHANGED_FILES} + ${BIN_DIR}/black --check ${CHANGED_FILES} + ${BIN_DIR}/isort --check-only ${CHANGED_FILES} + + # Replace the last two lines with the following lines + # if you want to reformat changed files automatically + # before committing. Please note that partial commits + # (git add -p) will not work and will commit the whole + # file! + # + # ${BIN_DIR}/black ${CHANGED_FILES} || true + # ${BIN_DIR}/isort -y ${CHANGED_FILES} || true + # git add ${CHANGED_FILES} +fi diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/pyproject.toml pycharm-2020.3/plugins/python-ce/helpers/typeshed/pyproject.toml --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/pyproject.toml 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/pyproject.toml 2020-12-01 23:26:18.000000000 +0000 @@ -3,9 +3,39 @@ target_version = ["py37"] [tool.isort] -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -use_parentheses = true +profile = "black" combine_as_imports = true line_length = 130 +extra_standard_library = [ + "typing_extensions", + "_typeshed", + # Extra modules not recognized by isort + "_compression", + "_csv", + "_curses", + "_markupbase", + "_random", + "_tkinter", + "_weakrefset", + "genericpath", + "opcode", + "pyexpat", + # Python 2 modules + "__builtin__", + "cookielib", + "cStringIO", + "httplib", + "mimetools", + "rfc822", + "thread", + "urllib2", + "urlparse", + "BaseHTTPServer", + "Queue", + "SimpleHTTPServer", + "SocketServer", + "StringIO", + "UserDict", + "UserList", + "UserString", +] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/README.md pycharm-2020.3/plugins/python-ce/helpers/typeshed/README.md --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/README.md 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/README.md 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ # typeshed -[![Build Status](https://travis-ci.org/python/typeshed.svg?branch=master)](https://travis-ci.org/python/typeshed) +[![Build status](https://github.com/python/typeshed/workflows/Check%20stubs/badge.svg)](https://github.com/python/typeshed/actions?query=workflow%3A%22Check+stubs%22) [![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Pull Requests Welcome](https://img.shields.io/badge/pull%20requests-welcome-brightgreen.svg)](https://github.com/python/typeshed/blob/master/CONTRIBUTING.md) @@ -17,7 +17,7 @@ it before submitting pull requests; do not report issues with annotations to the project the stubs are for, but instead report them here to typeshed.** -Typeshed supports Python versions 2.7 and 3.5 and up. +Typeshed supports Python versions 2.7 and 3.6 and up. ## Using @@ -78,6 +78,13 @@ [the relevant section of CONTRIBUTING.md]( https://github.com/python/typeshed/blob/master/CONTRIBUTING.md#stub-versioning). +Third-party packages are generally removed from typeshed when one of the +following criteria is met: + +* The upstream package ships a py.typed file for at least 6-12 months, or +* the package does not support any of the Python versions supported by + typeshed. + ## Contributing Please read [CONTRIBUTING.md](CONTRIBUTING.md) before submitting pull @@ -85,16 +92,17 @@ ## Running the tests -The tests are automatically run by Travis CI on every PR and push to -the repo. Note that it can be useful to enable Travis CI on your own fork of -typeshed. +The tests are automatically run on every PR and push to +the repo. There are several tests: - `tests/mypy_test.py` -runs tests against [mypy](https://github.com/python/mypy/) -- `tests/pytype_test.py` runs tests against +tests typeshed with [mypy](https://github.com/python/mypy/) +- `tests/pytype_test.py` tests typeshed with [pytype](https://github.com/google/pytype/). -- `tests/mypy_selftest.py` runs mypy's test suite using this version of +- `tests/mypy_self_check.py` checks mypy's code base using this version of +typeshed. +- `tests/mypy_test_suite.py` runs a subset of mypy's test suite using this version of typeshed. - `tests/check_consistent.py` checks certain files in typeshed remain consistent with each other. @@ -107,19 +115,20 @@ ``` $ python3.6 -m venv .venv3 $ source .venv3/bin/activate -(.venv3)$ pip3 install -r requirements-tests-py3.txt +(.venv3)$ pip install -U pip +(.venv3)$ pip install -r requirements-tests-py3.txt ``` This will install mypy (you need the latest master branch from GitHub), typed-ast, flake8 (and plugins), pytype, black and isort. ### mypy_test.py -This test requires Python 3.5 or higher; Python 3.6.1 or higher is recommended. +This test requires Python 3.6 or higher; Python 3.6.1 or higher is recommended. Run using:`(.venv3)$ python3 tests/mypy_test.py` This test is shallow — it verifies that all stubs can be imported but doesn't check whether stubs match their implementation -(in the Python standard library or a third-party package). It has a blacklist of +(in the Python standard library or a third-party package). It has an exclude list of modules that are not tested at all, which also lives in the tests directory. If you are in the typeshed repo that is submodule of the @@ -128,10 +137,10 @@ ```bash $ PYTHONPATH=../.. python3 tests/mypy_test.py ``` -You can restrict mypy tests to a single version by passing `-p2` or `-p3.5`: +You can restrict mypy tests to a single version by passing `-p2` or `-p3.9`: ```bash -$ PYTHONPATH=../.. python3 tests/mypy_test.py -p3.5 -running mypy --python-version 3.5 --strict-optional # with 342 files +$ PYTHONPATH=../.. python3 tests/mypy_test.py -p3.9 +running mypy --python-version 3.9 --strict-optional # with 342 files ``` ### pytype_test.py @@ -143,10 +152,17 @@ This test works similarly to `mypy_test.py`, except it uses `pytype`. -### mypy_selftest.py +### mypy_self_check.py + +This test requires Python 3.6 or higher; Python 3.6.1 or higher is recommended. +Run using: `(.venv3)$ python3 tests/mypy_self_check.py` + +This test checks mypy's code base using mypy and typeshed code in this repo. + +### mypy_test_suite.py This test requires Python 3.5 or higher; Python 3.6.1 or higher is recommended. -Run using: `(.venv3)$ python3 tests/mypy_selftest.py` +Run using: `(.venv3)$ python3 tests/mypy_test_suite.py` This test runs mypy's own test suite using the typeshed code in your repo. This will sometimes catch issues with incorrectly typed stubs, but is much slower @@ -158,13 +174,13 @@ ### stubtest_test.py -This test requires Python 3.5 or higher. +This test requires Python 3.6 or higher. Run using `(.venv3)$ python3 tests/stubtest_test.py` This test compares the stdlib stubs against the objects at runtime. Because of this, the output depends on which version of Python and on what kind of system it is run. -Thus the easiest way to run this test is by enabling Travis CI on your fork; +Thus the easiest way to run this test is via Github Actions on your fork; if you run it locally, it'll likely complain about system-specific differences (in e.g, `socket`) that the type system cannot capture. If you need a specific version of Python to repro a CI failure, diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/requirements-tests-py3.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/requirements-tests-py3.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/requirements-tests-py3.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/requirements-tests-py3.txt 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,8 @@ git+https://github.com/python/mypy.git@master typed-ast>=1.0.4 -black==19.3b0 -flake8==3.8.2 +black==20.8b1 +flake8==3.8.4 flake8-bugbear==20.1.4 -flake8-pyi==20.5.0 -isort==4.3.21 -pytype>=2020.01.08 +flake8-pyi==20.10.0 +isort[pyproject]==5.5.3 +pytype>=2020.09.16 diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/scripts/migrate_script.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/scripts/migrate_script.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/scripts/migrate_script.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/scripts/migrate_script.py 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,337 @@ +""" +Ad-hoc script to migrate typeshed to a new directory structure proposed in +https://github.com/python/typeshed/issues/2491#issuecomment-611607557 +""" + +import ast +import os +import os.path +import shutil +from dataclasses import dataclass +from typing import List, Optional, Set, Tuple + +# These names may be still discussed so I make them constants. +STDLIB_NAMESPACE = "stdlib" +THIRD_PARTY_NAMESPACE = "stubs" +DEFAULT_VERSION = "0.1" +DEFAULT_PY3_VERSION = "3.6" +PY2_NAMESPACE = "python2" +OUTPUT_DIR = "out" + +# Third party imports (type ignored) of missing stubs. +MISSING_WHITELIST = { + "thrift", +} + +# Manually collected special cases where distribution name and +# package name are different. +package_to_distribution = { + "_pytest": "pytest", + "yaml": "PyYAML", + "typing_extensions": "typing-extensions", + "mypy_extensions": "mypy-extensions", + "pyre_extensions": "pyre-extensions", + "attr": "attrs", + "concurrent": "futures", + "Crypto": "pycrypto", + "datetimerange": "DateTimeRange", + "dateutil": "python-dateutil", + "enum": "enum34", + "flask": "Flask", + "gflags": "python-gflags", + "google": "protobuf", + "jinja2": "Jinja2", + "markupsafe": "MarkupSafe", + "OpenSSL": "openssl-python", + "pymysql": "PyMySQL", + "pyVmomi": "pyvmomi", + "routes": "Routes", + "typed_ast": "typed-ast", + "werkzeug": "Werkzeug", +} + +known_versions = { + "mypy-extensions": "0.4", + "typing-extensions": "3.7", + "typed-ast": "1.4", +} + + +# Classes with "Package" in name represent both packages and modules. +# The latter two are distinguished by is_dir flag. +class PackageBase: + """Common attributes for packages/modules""" + + path: str # full initial path like stdlib/2and3/argparse.pyi + is_dir: bool + + @property + def name(self) -> str: + _, tail = os.path.split(self.path) + if self.is_dir: + assert not tail.endswith(".pyi") + return tail + assert tail.endswith(".pyi") + name, _ = os.path.splitext(tail) + return name + + +@dataclass +class StdLibPackage(PackageBase): + """Package/module in standard library.""" + + path: str + py_version: Optional[str] # Can be omitted for Python 2 only packages. + is_dir: bool + + +@dataclass +class ThirdPartyPackage(PackageBase): + path: str + py2_compatible: bool + py3_compatible: bool + is_dir: bool + requires: List[str] # distributions this depends on + + +def add_stdlib_packages_from(subdir: str, packages: List[StdLibPackage], py_version: Optional[str]) -> None: + """Add standard library packages/modules from a given stdlib/xxx subdirectory. + + Append to packages list in-place, use py_version as the minimal supported version. + """ + for name in os.listdir(subdir): + path = os.path.join(subdir, name) + packages.append(StdLibPackage(path, py_version, is_dir=os.path.isdir(path))) + + +def collect_stdlib_packages() -> Tuple[List[StdLibPackage], List[StdLibPackage]]: + """Collect standard library packages/modules from all current stdlib/xxx sub-directories.""" + stdlib: List[StdLibPackage] = [] + py2_stdlib: List[StdLibPackage] = [] + # These will go to a separate subdirectory. + add_stdlib_packages_from("stdlib/2", py2_stdlib, None) + add_stdlib_packages_from("stdlib/2and3", stdlib, "2.7") + # Use oldest currently supported version for Python 3 packages/modules. + add_stdlib_packages_from("stdlib/3", stdlib, DEFAULT_PY3_VERSION) + for version in ("3.7", "3.8", "3.9"): + subdir = os.path.join("stdlib", version) + if os.path.isdir(subdir): + add_stdlib_packages_from(subdir, stdlib, version) + return stdlib, py2_stdlib + + +def add_third_party_packages_from( + subdir: str, packages: List[ThirdPartyPackage], py2_compatible: bool, py3_compatible: bool +) -> None: + """Add third party packages/modules from a given third_party/xxx subdirectory.""" + for name in os.listdir(subdir): + path = os.path.join(subdir, name) + packages.append(ThirdPartyPackage(path, py2_compatible, py3_compatible, requires=[], is_dir=os.path.isdir(path))) + + +def collect_third_party_packages() -> Tuple[List[ThirdPartyPackage], List[ThirdPartyPackage]]: + """Collect third party packages/modules from all current third_party/xxx sub-directories.""" + third_party: List[ThirdPartyPackage] = [] + py2_third_party: List[ThirdPartyPackage] = [] + add_third_party_packages_from("third_party/3", third_party, py2_compatible=False, py3_compatible=True) + add_third_party_packages_from("third_party/2and3", third_party, py2_compatible=True, py3_compatible=True) + # We special-case Python 2 for third party packages like six. + subdir = "third_party/2" + py3_packages = os.listdir("third_party/3") + for name in os.listdir(subdir): + path = os.path.join(subdir, name) + package = ThirdPartyPackage(path, py2_compatible=True, py3_compatible=False, requires=[], is_dir=os.path.isdir(path)) + if name in py3_packages: + # If there is a package with the same name in /2 and /3, we add the former to + # a separate list, packages from there will be put into /python2 sub-directories. + py2_third_party.append(package) + else: + third_party.append(package) + return third_party, py2_third_party + + +def get_top_imported_names(file: str) -> Set[str]: + """Collect names imported in given file. + + We only collect top-level names, i.e. `from foo.bar import baz` + will only add `foo` to the list. + """ + if not file.endswith(".pyi"): + return set() + with open(os.path.join(file), "rb") as f: + content = f.read() + parsed = ast.parse(content) + top_imported = set() + for node in ast.walk(parsed): + if isinstance(node, ast.Import): + for name in node.names: + top_imported.add(name.name.split(".")[0]) + elif isinstance(node, ast.ImportFrom): + if node.level > 0: + # Relative imports always refer to the current package. + continue + assert node.module + top_imported.add(node.module.split(".")[0]) + return top_imported + + +def populate_requirements( + package: ThirdPartyPackage, stdlib: List[str], py2_stdlib: List[str], known_distributions: Set[str] +) -> None: + """Generate requirements using imports found in a package.""" + assert not package.requires, "Populate must be called once" + if not package.is_dir: + all_top_imports = get_top_imported_names(package.path) + else: + all_top_imports = set() + for dir_path, _, file_names in os.walk(package.path): + for file_name in file_names: + all_top_imports |= get_top_imported_names(os.path.join(dir_path, file_name)) + + # Generate dependencies using collected imports. + requirements = set() + for name in all_top_imports: + # Note: dependencies are between distributions, not packages. + distribution = package_to_distribution.get(name, name) + if package.py3_compatible and name not in stdlib: + if distribution in known_distributions: + requirements.add(distribution) + else: + # Likely a conditional import. + assert distribution in py2_stdlib or distribution in MISSING_WHITELIST + if package.py2_compatible and name not in py2_stdlib: + if distribution in known_distributions: + requirements.add(distribution) + else: + # Likely a conditional import. + assert distribution in stdlib or distribution in MISSING_WHITELIST + # Remove dependency to itself generated by absolute imports. + current_distribution = package_to_distribution.get(package.name, package.name) + package.requires = sorted(requirements - {current_distribution}) + + +def generate_versions(packages: List[StdLibPackage]) -> str: + """Generate the stdlib/VERSIONS file for packages/modules.""" + lines = [] + for package in packages: + assert package.py_version is not None + lines.append(f"{package.name}: {package.py_version}") + return "\n".join(sorted(lines)) + + +def copy_stdlib(packages: List[StdLibPackage], py2_packages: List[StdLibPackage]) -> None: + """Refactor the standard library part using collected metadata.""" + stdlib_dir = os.path.join(OUTPUT_DIR, STDLIB_NAMESPACE) + os.makedirs(stdlib_dir, exist_ok=True) + + # Write version metadata. + with open(os.path.join(stdlib_dir, "VERSIONS"), "w") as f: + f.write(generate_versions(packages)) + f.write("\n") + + # Copy stdlib/2and3 and stdlib/3 packages/modules. + for package in packages: + if not package.is_dir: + shutil.copy(package.path, stdlib_dir) + else: + shutil.copytree(package.path, os.path.join(stdlib_dir, package.name)) + + # Copy stdlib/2 packages/modules to a nested /python namespace. + if py2_packages: + py2_stdlib_dir = os.path.join(stdlib_dir, PY2_NAMESPACE) + os.makedirs(py2_stdlib_dir, exist_ok=True) + for package in py2_packages: + if not package.is_dir: + shutil.copy(package.path, py2_stdlib_dir) + else: + shutil.copytree(package.path, os.path.join(py2_stdlib_dir, package.name)) + + +def generate_metadata(package: ThirdPartyPackage, py2_packages: List[str]) -> str: + """Generate METADATA.toml for a given package. + + Only add compatibility flags if they are different from default values: + python2 = false, python3 = true. + + Note: the metadata should be generated per distribution, but we just use + an arbitrary package to populate it, since it should be the same for all + packages. + """ + version = known_versions.get( + package_to_distribution.get(package.name, package.name), + DEFAULT_VERSION, + ) + lines = [f'version = "{version}"'] + if package.py2_compatible or package.name in py2_packages: + # Note: for packages like six that appear in both normal and Python 2 only + # lists we force set python2 = true. + lines.append("python2 = true") + if not package.py3_compatible: + lines.append("python3 = false") + if package.requires: + distributions = [f'"types-{package_to_distribution.get(dep, dep)}"' for dep in package.requires] + lines.append(f"requires = [{', '.join(distributions)}]") + return "\n".join(lines) + + +def copy_third_party(packages: List[ThirdPartyPackage], py2_packages: List[ThirdPartyPackage]) -> None: + """Refactor the third party part using collected metadata.""" + third_party_dir = os.path.join(OUTPUT_DIR, THIRD_PARTY_NAMESPACE) + os.makedirs(third_party_dir, exist_ok=True) + + # Note: these include Python 3 versions of packages like six. + for package in packages: + distribution = package_to_distribution.get(package.name, package.name) + distribution_dir = os.path.join(third_party_dir, distribution) + os.makedirs(distribution_dir, exist_ok=True) + metadata_file = os.path.join(distribution_dir, "METADATA.toml") + if not os.path.isfile(metadata_file): + # Write metadata once. + # TODO: check consistency between different packages in same distribution? + with open(metadata_file, "w") as f: + f.write(generate_metadata(package, [package.name for package in py2_packages])) + f.write("\n") + if not package.is_dir: + shutil.copy(package.path, distribution_dir) + else: + shutil.copytree(package.path, os.path.join(distribution_dir, package.name)) + + # Add Python 2 counterparts of packages like six (with different stubs) to nested + # namespaces like six/python2/six. + for package in py2_packages: + distribution = package_to_distribution.get(package.name, package.name) + distribution_dir = os.path.join(third_party_dir, distribution, PY2_NAMESPACE) + os.makedirs(distribution_dir, exist_ok=True) + if not package.is_dir: + shutil.copy(package.path, distribution_dir) + else: + shutil.copytree(package.path, os.path.join(distribution_dir, package.name)) + + +def main() -> None: + # Collect metadata for Python 2 and 3, and Python 2 only standard library + # packages/modules. The latter will go to a separate nested namespace. + stdlib, py2_stdlib = collect_stdlib_packages() + third_party, py2_third_party = collect_third_party_packages() + + # Collect standard library names to filter out from dependencies. + stdlib_names = [package.name for package in stdlib] + py2_stdlib_names = [package.name for package in py2_stdlib] + py2_stdlib_names += [package.name for package in stdlib if package.py_version == "2.7"] + + # Collect all known distributions (for sanity checks). + known_distributions = {package_to_distribution.get(package.name, package.name) for package in third_party + py2_third_party} + + # Compute dependencies between third party packages/modules to populate metadata. + for package in third_party + py2_third_party: + populate_requirements(package, stdlib_names, py2_stdlib_names, known_distributions) + + # Copy the files to a separate location (to not clobber the root directory). + if not os.path.isdir(OUTPUT_DIR): + os.mkdir(OUTPUT_DIR) + copy_stdlib(stdlib, py2_stdlib) + copy_third_party(third_party, py2_third_party) + + +if __name__ == "__main__": + main() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/scripts/update-stubtest-whitelist.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/scripts/update-stubtest-whitelist.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/scripts/update-stubtest-whitelist.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/scripts/update-stubtest-whitelist.py 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 + +# This script removes lines from stubtest whitelists, according to +# an input file. The input file has one entry to remove per line. +# Each line consists of a whitelist filename and an entry, separated +# by a colon. + +# This script is used by the workflow to remove unused whitelist entries. + +import sys +from collections import defaultdict +from typing import Dict, List, Set, Tuple + + +def main() -> None: + if len(sys.argv) != 2: + print(f"Usage: {sys.argv[0]} FILENAME", file=sys.stderr) + sys.exit(1) + + to_remove = parse_input_file(sys.argv[1]) + for filename, entries in to_remove.items(): + remove_entries_from_whitelist(filename, entries) + + +def parse_input_file(input_file: str) -> Dict[str, Set[str]]: + to_remove = defaultdict(set) + with open(input_file) as f: + for filename, wl_entry in [parse_input_line(li) for li in f if li.strip()]: + to_remove[filename].add(wl_entry) + return to_remove + + +# Returns a (filename, entry) tuple. +def parse_input_line(line: str) -> Tuple[str, str]: + line = line.strip() + filename, entry = line.split(":", maxsplit=1) + return filename, entry + + +def remove_entries_from_whitelist(filename: str, entries: Set[str]) -> None: + new_lines: List[str] = [] + with open(filename) as f: + for line in f: + entry = line.strip().split(" #")[0] + if entry in entries: + entries.remove(entry) + else: + new_lines.append(line) + if entries: + print(f"WARNING: The following entries were not found in '{filename}':", file=sys.stderr) + for entry in entries: + print(f" * {entry}") + with open(filename, "w") as f: + for line in new_lines: + f.write(line) + + +if __name__ == "__main__": + main() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/abc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/abc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,7 @@ -from typing import Any, Callable, Dict, Set, Tuple, Type, TypeVar import _weakrefset +from typing import Any, Callable, Dict, Set, Tuple, Type, TypeVar -_FuncT = TypeVar('_FuncT', bound=Callable[..., Any]) +_FuncT = TypeVar("_FuncT", bound=Callable[..., Any]) # NOTE: mypy has special processing for ABCMeta and abstractmethod. diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ast.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ast.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ast.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ast.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -20,7 +20,7 @@ def literal_eval(node_or_string: Union[str, unicode, AST]) -> Any: ... def walk(node: AST) -> Iterator[AST]: ... -class NodeVisitor(): +class NodeVisitor: def visit(self, node: AST) -> Any: ... def generic_visit(self, node: AST) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/__builtin__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/__builtin__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/__builtin__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/__builtin__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,51 +1,76 @@ # True and False are deliberately omitted because they are keywords in # Python 3, and stub files conform to Python 3 syntax. +from _typeshed import ReadableBuffer, SupportsKeysAndGetItem, SupportsWrite +from abc import ABCMeta +from ast import mod +from types import CodeType from typing import ( - TypeVar, Iterator, Iterable, NoReturn, overload, Container, - Sequence, MutableSequence, Mapping, MutableMapping, Tuple, List, Any, Dict, Callable, Generic, - Set, AbstractSet, FrozenSet, MutableSet, Sized, Reversible, SupportsInt, SupportsFloat, SupportsAbs, - SupportsComplex, IO, BinaryIO, Union, - ItemsView, KeysView, ValuesView, ByteString, Optional, AnyStr, Type, Text, + AbstractSet, + Any, + AnyStr, + BinaryIO, + ByteString, + Callable, + Container, + Dict, + FrozenSet, + Generic, + ItemsView, + Iterable, + Iterator, + KeysView, + List, + Mapping, + MutableMapping, + MutableSequence, + MutableSet, + NoReturn, + Optional, Protocol, + Reversible, + Sequence, + Set, + Sized, + SupportsAbs, + SupportsComplex, + SupportsFloat, + SupportsInt, + Text, + Tuple, + Type, + TypeVar, + Union, + ValuesView, + overload, + runtime_checkable, ) -from abc import ABCMeta -from ast import mod, AST -from io import ( - TextIOWrapper, FileIO, BufferedRandom, BufferedReader, BufferedWriter -) -from types import TracebackType, CodeType -from _typeshed import AnyPath, OpenBinaryMode, OpenTextMode, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenBinaryModeReading, SupportsWrite from typing_extensions import Literal -import sys - - class _SupportsIndex(Protocol): def __index__(self) -> int: ... -class _SupportsLessThan(Protocol): - def __lt__(self, other: Any) -> bool: ... +class _SupportsTrunc(Protocol): + def __trunc__(self) -> int: ... -_T = TypeVar('_T') -_T_co = TypeVar('_T_co', covariant=True) -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') -_S = TypeVar('_S') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') -_TT = TypeVar('_TT', bound='type') -_LT = TypeVar('_LT', bound=_SupportsLessThan) +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") +_S = TypeVar("_S") +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") +_TT = TypeVar("_TT", bound="type") +_TBE = TypeVar("_TBE", bound="BaseException") class object: __doc__: Optional[str] __dict__: Dict[str, Any] __slots__: Union[Text, Iterable[Text]] __module__: str - @property def __class__(self: _T) -> Type[_T]: ... @__class__.setter @@ -67,14 +92,12 @@ class staticmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... class classmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... @@ -91,7 +114,6 @@ __mro__: Tuple[type, ...] __name__: str __weakrefoffset__: int - @overload def __init__(self, o: object) -> None: ... @overload @@ -116,10 +138,9 @@ class int: @overload - def __init__(self, x: Union[Text, bytes, SupportsInt, _SupportsIndex] = ...) -> None: ... + def __init__(self, x: Union[Text, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc] = ...) -> None: ... @overload def __init__(self, x: Union[Text, bytes, bytearray], base: int) -> None: ... - @property def real(self) -> int: ... @property @@ -129,9 +150,7 @@ @property def denominator(self) -> int: ... def conjugate(self) -> int: ... - def bit_length(self) -> int: ... - def __add__(self, x: int) -> int: ... def __sub__(self, x: int) -> int: ... def __mul__(self, x: int) -> int: ... @@ -148,6 +167,9 @@ def __rtruediv__(self, x: int) -> float: ... def __rmod__(self, x: int) -> int: ... def __rdivmod__(self, x: int) -> Tuple[int, int]: ... + @overload + def __pow__(self, __x: Literal[2], __modulo: Optional[int] = ...) -> int: ... + @overload def __pow__(self, __x: int, __modulo: Optional[int] = ...) -> Any: ... # Return type can be int or float, depending on x. def __rpow__(self, x: int, mod: Optional[int] = ...) -> Any: ... def __and__(self, n: int) -> int: ... @@ -165,14 +187,12 @@ def __invert__(self) -> int: ... def __trunc__(self) -> int: ... def __getnewargs__(self) -> Tuple[int]: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: int) -> bool: ... def __le__(self, x: int) -> bool: ... def __gt__(self, x: int) -> bool: ... def __ge__(self, x: int) -> bool: ... - def __str__(self) -> str: ... def __float__(self) -> float: ... def __int__(self) -> int: ... @@ -188,13 +208,11 @@ def is_integer(self) -> bool: ... @classmethod def fromhex(cls, __s: str) -> float: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... def conjugate(self) -> float: ... - def __add__(self, x: float) -> float: ... def __sub__(self, x: float) -> float: ... def __mul__(self, x: float) -> float: ... @@ -203,7 +221,9 @@ def __truediv__(self, x: float) -> float: ... def __mod__(self, x: float) -> float: ... def __divmod__(self, x: float) -> Tuple[float, float]: ... - def __pow__(self, x: float, mod: None = ...) -> float: ... # In Python 3, returns complex if self is negative and x is not whole + def __pow__( + self, x: float, mod: None = ... + ) -> float: ... # In Python 3, returns complex if self is negative and x is not whole def __radd__(self, x: float) -> float: ... def __rsub__(self, x: float) -> float: ... def __rmul__(self, x: float) -> float: ... @@ -215,7 +235,6 @@ def __rpow__(self, x: float, mod: None = ...) -> float: ... def __getnewargs__(self) -> Tuple[float]: ... def __trunc__(self) -> int: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: float) -> bool: ... @@ -224,7 +243,6 @@ def __ge__(self, x: float) -> bool: ... def __neg__(self) -> float: ... def __pos__(self) -> float: ... - def __str__(self) -> str: ... def __int__(self) -> int: ... def __float__(self) -> float: ... @@ -237,14 +255,11 @@ def __init__(self, real: float = ..., imag: float = ...) -> None: ... @overload def __init__(self, real: Union[str, SupportsComplex, _SupportsIndex]) -> None: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... - def conjugate(self) -> complex: ... - def __add__(self, x: complex) -> complex: ... def __sub__(self, x: complex) -> complex: ... def __mul__(self, x: complex) -> complex: ... @@ -257,12 +272,10 @@ def __rpow__(self, x: complex, mod: None = ...) -> complex: ... def __rdiv__(self, x: complex) -> complex: ... def __rtruediv__(self, x: complex) -> complex: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __neg__(self) -> complex: ... def __pos__(self) -> complex: ... - def __str__(self) -> str: ... def __complex__(self) -> complex: ... def __abs__(self) -> float: ... @@ -283,8 +296,7 @@ def count(self, x: unicode) -> int: ... def decode(self, encoding: unicode = ..., errors: unicode = ...) -> unicode: ... def encode(self, encoding: unicode = ..., errors: unicode = ...) -> str: ... - def endswith(self, suffix: Union[unicode, Tuple[unicode, ...]], start: int = ..., - end: int = ...) -> bool: ... + def endswith(self, suffix: Union[unicode, Tuple[unicode, ...]], start: int = ..., end: int = ...) -> bool: ... def expandtabs(self, tabsize: int = ...) -> unicode: ... def find(self, sub: unicode, start: int = ..., end: int = ...) -> int: ... def format(self, *args: object, **kwargs: object) -> unicode: ... @@ -314,15 +326,13 @@ def rstrip(self, chars: unicode = ...) -> unicode: ... def split(self, sep: Optional[unicode] = ..., maxsplit: int = ...) -> List[unicode]: ... def splitlines(self, keepends: bool = ...) -> List[unicode]: ... - def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]], start: int = ..., - end: int = ...) -> bool: ... + def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]], start: int = ..., end: int = ...) -> bool: ... def strip(self, chars: unicode = ...) -> unicode: ... def swapcase(self) -> unicode: ... def title(self) -> unicode: ... def translate(self, table: Union[Dict[int, Any], unicode]) -> unicode: ... def upper(self) -> unicode: ... def zfill(self, width: int) -> unicode: ... - @overload def __getitem__(self, i: int) -> unicode: ... @overload @@ -338,7 +348,6 @@ def __le__(self, x: unicode) -> bool: ... def __gt__(self, x: unicode) -> bool: ... def __ge__(self, x: unicode) -> bool: ... - def __len__(self) -> int: ... # The argument type is incompatible with Sequence def __contains__(self, s: Union[unicode, bytes]) -> bool: ... # type: ignore @@ -350,14 +359,11 @@ def __hash__(self) -> int: ... def __getnewargs__(self) -> Tuple[unicode]: ... -_str_base = basestring - class _FormatMapMapping(Protocol): def __getitem__(self, __key: str) -> Any: ... -class str(Sequence[str], _str_base): +class str(Sequence[str], basestring): def __init__(self, o: object = ...) -> None: ... - def capitalize(self) -> str: ... def center(self, __width: int, __fillchar: str = ...) -> str: ... def count(self, x: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... @@ -367,6 +373,7 @@ def expandtabs(self, tabsize: int = ...) -> str: ... def find(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def format(self, *args: object, **kwargs: object) -> str: ... + def format_map(self, map: _FormatMapMapping) -> str: ... def index(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def isalnum(self) -> bool: ... def isalpha(self) -> bool: ... @@ -421,7 +428,6 @@ def translate(self, __table: Optional[AnyStr], deletechars: AnyStr = ...) -> AnyStr: ... def upper(self) -> str: ... def zfill(self, __width: int) -> str: ... - def __add__(self, s: AnyStr) -> AnyStr: ... # Incompatible with Sequence.__contains__ def __contains__(self, o: Union[str, Text]) -> bool: ... # type: ignore @@ -441,12 +447,10 @@ def __rmul__(self, n: int) -> str: ... def __str__(self) -> str: ... def __getnewargs__(self) -> Tuple[str]: ... - def __getslice__(self, start: int, stop: int) -> str: ... def __float__(self) -> float: ... def __int__(self) -> int: ... - bytes = str class bytearray(MutableSequence[int], ByteString): @@ -492,10 +496,7 @@ def split(self, sep: Optional[bytes] = ..., maxsplit: int = ...) -> List[bytearray]: ... def splitlines(self, keepends: bool = ...) -> List[bytearray]: ... def startswith( - self, - __prefix: Union[bytes, Tuple[bytes, ...]], - __start: Optional[int] = ..., - __end: Optional[int] = ..., + self, __prefix: Union[bytes, Tuple[bytes, ...]], __start: Optional[int] = ..., __end: Optional[int] = ... ) -> bool: ... def strip(self, __bytes: Optional[bytes] = ...) -> bytearray: ... def swapcase(self) -> bytearray: ... @@ -505,7 +506,6 @@ def zfill(self, __width: int) -> bytearray: ... @classmethod def fromhex(cls, __string: str) -> bytearray: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[int]: ... def __str__(self) -> str: ... @@ -536,9 +536,7 @@ def __gt__(self, x: bytes) -> bool: ... def __ge__(self, x: bytes) -> bool: ... -_mv_container_type = str - -class memoryview(Sized, Container[_mv_container_type]): +class memoryview(Sized, Container[str]): format: str itemsize: int shape: Optional[Tuple[int, ...]] @@ -546,30 +544,23 @@ suboffsets: Optional[Tuple[int, ...]] readonly: bool ndim: int - - def __init__(self, obj: Union[bytes, bytearray, buffer, memoryview]) -> None: ... - + def __init__(self, obj: ReadableBuffer) -> None: ... @overload - def __getitem__(self, i: int) -> _mv_container_type: ... + def __getitem__(self, i: int) -> str: ... @overload def __getitem__(self, s: slice) -> memoryview: ... - def __contains__(self, x: object) -> bool: ... - def __iter__(self) -> Iterator[_mv_container_type]: ... + def __iter__(self) -> Iterator[str]: ... def __len__(self) -> int: ... - @overload def __setitem__(self, s: slice, o: memoryview) -> None: ... @overload def __setitem__(self, i: int, o: bytes) -> None: ... @overload def __setitem__(self, s: slice, o: Sequence[bytes]) -> None: ... - def tobytes(self) -> bytes: ... def tolist(self) -> List[int]: ... - - class bool(int): def __init__(self, o: object = ...) -> None: ... @overload @@ -622,7 +613,10 @@ def __le__(self, x: Tuple[_T_co, ...]) -> bool: ... def __gt__(self, x: Tuple[_T_co, ...]) -> bool: ... def __ge__(self, x: Tuple[_T_co, ...]) -> bool: ... + @overload def __add__(self, x: Tuple[_T_co, ...]) -> Tuple[_T_co, ...]: ... + @overload + def __add__(self, x: Tuple[Any, ...]) -> Tuple[Any, ...]: ... def __mul__(self, n: int) -> Tuple[_T_co, ...]: ... def __rmul__(self, n: int) -> Tuple[_T_co, ...]: ... def count(self, __value: Any) -> int: ... @@ -648,7 +642,6 @@ def remove(self, __value: _T) -> None: ... def reverse(self) -> None: ... def sort(self, cmp: Callable[[_T, _T], Any] = ..., key: Callable[[_T], Any] = ..., reverse: bool = ...) -> None: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... @@ -682,12 +675,10 @@ @overload def __init__(self, **kwargs: _VT) -> None: ... @overload - def __init__(self, map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... + def __init__(self, map: SupportsKeysAndGetItem[_KT, _VT], **kwargs: _VT) -> None: ... @overload def __init__(self, iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT) -> None: ... - def __new__(cls: Type[_T1], *args: Any, **kwargs: Any) -> _T1: ... - def has_key(self, k: _KT) -> bool: ... def clear(self) -> None: ... def copy(self) -> Dict[_KT, _VT]: ... @@ -746,8 +737,8 @@ def __iand__(self, s: AbstractSet[object]) -> Set[_T]: ... def __or__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ior__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... - def __sub__(self, s: AbstractSet[object]) -> Set[_T]: ... - def __isub__(self, s: AbstractSet[object]) -> Set[_T]: ... + def __sub__(self, s: AbstractSet[_T]) -> Set[_T]: ... + def __isub__(self, s: AbstractSet[_T]) -> Set[_T]: ... def __xor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ixor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __le__(self, s: AbstractSet[object]) -> bool: ... @@ -795,10 +786,13 @@ def __reversed__(self) -> Iterator[int]: ... class property(object): - def __init__(self, fget: Optional[Callable[[Any], Any]] = ..., - fset: Optional[Callable[[Any, Any], None]] = ..., - fdel: Optional[Callable[[Any], None]] = ..., - doc: Optional[str] = ...) -> None: ... + def __init__( + self, + fget: Optional[Callable[[Any], Any]] = ..., + fset: Optional[Callable[[Any, Any], None]] = ..., + fdel: Optional[Callable[[Any], None]] = ..., + doc: Optional[str] = ..., + ) -> None: ... def getter(self, fget: Callable[[Any], Any]) -> property: ... def setter(self, fset: Callable[[Any, Any], None]) -> property: ... def deleter(self, fdel: Callable[[Any], None]) -> property: ... @@ -822,20 +816,33 @@ def all(__iterable: Iterable[object]) -> bool: ... def any(__iterable: Iterable[object]) -> bool: ... def apply(__func: Callable[..., _T], __args: Optional[Sequence[Any]] = ..., __kwds: Optional[Mapping[str, Any]] = ...) -> _T: ... - def bin(__number: Union[int, _SupportsIndex]) -> str: ... - def callable(__obj: object) -> bool: ... def chr(__i: int) -> str: ... def cmp(__x: Any, __y: Any) -> int: ... -_N1 = TypeVar('_N1', bool, int, float, complex) + +_N1 = TypeVar("_N1", bool, int, float, complex) + def coerce(__x: _N1, __y: _N1) -> Tuple[_N1, _N1]: ... + +# This class is to be exported as PathLike from os, +# but we define it here as _PathLike to avoid import cycle issues. +# See https://github.com/python/typeshed/pull/991#issuecomment-288160993 +_AnyStr_co = TypeVar("_AnyStr_co", str, bytes, covariant=True) +@runtime_checkable +class _PathLike(Protocol[_AnyStr_co]): + def __fspath__(self) -> _AnyStr_co: ... + def compile(source: Union[Text, mod], filename: Text, mode: Text, flags: int = ..., dont_inherit: int = ...) -> Any: ... def delattr(__obj: Any, __name: Text) -> None: ... def dir(__o: object = ...) -> List[str]: ... -_N2 = TypeVar('_N2', int, float) + +_N2 = TypeVar("_N2", int, float) + def divmod(__x: _N2, __y: _N2) -> Tuple[_N2, _N2]: ... -def eval(__source: Union[Text, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ...) -> Any: ... +def eval( + __source: Union[Text, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ... +) -> Any: ... def execfile(__filename: str, __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Dict[str, Any]] = ...) -> None: ... def exit(code: object = ...) -> NoReturn: ... @overload @@ -870,69 +877,69 @@ @overload def map(__func: None, __iter1: Iterable[_T1]) -> List[_T1]: ... @overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4], - __iter5: Iterable[_T5]) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def map(__func: None, - __iter1: Iterable[Any], - __iter2: Iterable[Any], - __iter3: Iterable[Any], - __iter4: Iterable[Any], - __iter5: Iterable[Any], - __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[Tuple[Any, ...]]: ... +def map(__func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... +@overload +def map(__func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... +@overload +def map( + __func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4] +) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def map( + __func: None, + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], + __iter5: Iterable[_T5], +) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def map( + __func: None, + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[Tuple[Any, ...]]: ... @overload def map(__func: Callable[[_T1], _S], __iter1: Iterable[_T1]) -> List[_S]: ... @overload -def map(__func: Callable[[_T1, _T2], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4], - __iter5: Iterable[_T5]) -> List[_S]: ... -@overload -def map(__func: Callable[..., _S], - __iter1: Iterable[Any], - __iter2: Iterable[Any], - __iter3: Iterable[Any], - __iter4: Iterable[Any], - __iter5: Iterable[Any], - __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[_S]: ... +def map(__func: Callable[[_T1, _T2], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3] +) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], +) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], + __iter5: Iterable[_T5], +) -> List[_S]: ... +@overload +def map( + __func: Callable[..., _S], + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[_S]: ... @overload def max(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ... @overload @@ -946,26 +953,23 @@ @overload def next(__i: Iterator[_T], default: _VT) -> Union[_T, _VT]: ... def oct(__number: Union[int, _SupportsIndex]) -> str: ... - - - - - - - def open(name: Union[unicode, int], mode: unicode = ..., buffering: int = ...) -> BinaryIO: ... - def ord(__c: Union[Text, bytes]) -> int: ... # This is only available after from __future__ import print_function. -def print(*values: object, sep: Optional[Text] = ..., end: Optional[Text] = ..., file: Optional[SupportsWrite[Any]] = ...) -> None: ... +def print( + *values: object, sep: Optional[Text] = ..., end: Optional[Text] = ..., file: Optional[SupportsWrite[Any]] = ... +) -> None: ... _E = TypeVar("_E", contravariant=True) _M = TypeVar("_M", contravariant=True) + class _SupportsPow2(Protocol[_E, _T_co]): def __pow__(self, __other: _E) -> _T_co: ... + class _SupportsPow3(Protocol[_E, _M, _T_co]): def __pow__(self, __other: _E, __modulo: _M) -> _T_co: ... + @overload def pow(__base: int, __exp: int, __mod: None = ...) -> Any: ... # returns int or float depending on whether exp is non-negative @overload @@ -985,9 +989,9 @@ def reduce(__function: Callable[[_T, _T], _T], __iterable: Iterable[_T]) -> _T: ... def reload(__module: Any) -> Any: ... @overload -def reversed(__object: Sequence[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Sequence[_T]) -> Iterator[_T]: ... @overload -def reversed(__object: Reversible[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Reversible[_T]) -> Iterator[_T]: ... def repr(__obj: object) -> str: ... @overload def round(number: float) -> float: ... @@ -998,47 +1002,59 @@ @overload def round(number: SupportsFloat, ndigits: int) -> float: ... def setattr(__obj: Any, __name: Text, __value: Any) -> None: ... -def sorted(__iterable: Iterable[_T], *, - cmp: Callable[[_T, _T], int] = ..., - key: Optional[Callable[[_T], Any]] = ..., - reverse: bool = ...) -> List[_T]: ... +def sorted( + __iterable: Iterable[_T], + *, + cmp: Callable[[_T, _T], int] = ..., + key: Optional[Callable[[_T], Any]] = ..., + reverse: bool = ..., +) -> List[_T]: ... @overload def sum(__iterable: Iterable[_T]) -> Union[_T, int]: ... @overload def sum(__iterable: Iterable[_T], __start: _S) -> Union[_T, _S]: ... def unichr(__i: int) -> unicode: ... def vars(__object: Any = ...) -> Dict[str, Any]: ... - @overload def zip(__iter1: Iterable[_T1]) -> List[Tuple[_T1]]: ... @overload -def zip(__iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... -@overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... +def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4], __iter5: Iterable[_T5]) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def zip(__iter1: Iterable[Any], __iter2: Iterable[Any], __iter3: Iterable[Any], - __iter4: Iterable[Any], __iter5: Iterable[Any], __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[Tuple[Any, ...]]: ... -def __import__(name: Text, globals: Optional[Mapping[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ..., - fromlist: Sequence[str] = ..., - level: int = ...) -> Any: ... +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4] +) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4], __iter5: Iterable[_T5] +) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def zip( + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[Tuple[Any, ...]]: ... +def __import__( + name: Text, + globals: Optional[Mapping[str, Any]] = ..., + locals: Optional[Mapping[str, Any]] = ..., + fromlist: Sequence[str] = ..., + level: int = ..., +) -> Any: ... # Actually the type of Ellipsis is , but since it's # not exposed anywhere under that name, we make it private here. class ellipsis: ... + Ellipsis: ellipsis # TODO: buffer support is incomplete; e.g. some_string.startswith(some_buffer) doesn't type check. -_AnyBuffer = TypeVar('_AnyBuffer', str, unicode, bytearray, buffer) +_AnyBuffer = TypeVar("_AnyBuffer", str, unicode, bytearray, buffer) class buffer(Sized): def __init__(self, object: _AnyBuffer, offset: int = ..., size: int = ...) -> None: ... @@ -1060,78 +1076,78 @@ class GeneratorExit(BaseException): ... class KeyboardInterrupt(BaseException): ... + class SystemExit(BaseException): code: int + class Exception(BaseException): ... -class StopIteration(Exception): +class StopIteration(Exception): ... class StandardError(Exception): ... + _StandardError = StandardError + class EnvironmentError(StandardError): errno: int strerror: str # TODO can this be unicode? filename: str + class OSError(EnvironmentError): ... class IOError(EnvironmentError): ... - class ArithmeticError(_StandardError): ... class AssertionError(_StandardError): ... class AttributeError(_StandardError): ... class BufferError(_StandardError): ... class EOFError(_StandardError): ... -class ImportError(_StandardError): +class ImportError(_StandardError): ... class LookupError(_StandardError): ... class MemoryError(_StandardError): ... class NameError(_StandardError): ... class ReferenceError(_StandardError): ... class RuntimeError(_StandardError): ... + class SyntaxError(_StandardError): msg: str lineno: Optional[int] offset: Optional[int] text: Optional[str] filename: Optional[str] + class SystemError(_StandardError): ... class TypeError(_StandardError): ... class ValueError(_StandardError): ... - class FloatingPointError(ArithmeticError): ... class OverflowError(ArithmeticError): ... class ZeroDivisionError(ArithmeticError): ... - - class IndexError(LookupError): ... class KeyError(LookupError): ... - class UnboundLocalError(NameError): ... class WindowsError(OSError): winerror: int class NotImplementedError(RuntimeError): ... - class IndentationError(SyntaxError): ... class TabError(IndentationError): ... - class UnicodeError(ValueError): ... + class UnicodeDecodeError(UnicodeError): encoding: str object: bytes start: int end: int reason: str - def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, - __reason: str) -> None: ... + def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, __reason: str) -> None: ... + class UnicodeEncodeError(UnicodeError): encoding: str object: Text start: int end: int reason: str - def __init__(self, __encoding: str, __object: Text, __start: int, __end: int, - __reason: str) -> None: ... -class UnicodeTranslateError(UnicodeError): ... + def __init__(self, __encoding: str, __object: Text, __start: int, __end: int, __reason: str) -> None: ... +class UnicodeTranslateError(UnicodeError): ... class Warning(Exception): ... class UserWarning(Warning): ... class DeprecationWarning(Warning): ... @@ -1154,12 +1170,13 @@ def next(self) -> str: ... def read(self, n: int = ...) -> str: ... def __enter__(self) -> BinaryIO: ... - def __exit__(self, t: Optional[type] = ..., exc: Optional[BaseException] = ..., tb: Optional[Any] = ...) -> Optional[bool]: ... + def __exit__( + self, t: Optional[type] = ..., exc: Optional[BaseException] = ..., tb: Optional[Any] = ... + ) -> Optional[bool]: ... def flush(self) -> None: ... def fileno(self) -> int: ... def isatty(self) -> bool: ... def close(self) -> None: ... - def readable(self) -> bool: ... def writable(self) -> bool: ... def seekable(self) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/builtins.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/builtins.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/builtins.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/builtins.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,51 +1,76 @@ # True and False are deliberately omitted because they are keywords in # Python 3, and stub files conform to Python 3 syntax. +from _typeshed import ReadableBuffer, SupportsKeysAndGetItem, SupportsWrite +from abc import ABCMeta +from ast import mod +from types import CodeType from typing import ( - TypeVar, Iterator, Iterable, NoReturn, overload, Container, - Sequence, MutableSequence, Mapping, MutableMapping, Tuple, List, Any, Dict, Callable, Generic, - Set, AbstractSet, FrozenSet, MutableSet, Sized, Reversible, SupportsInt, SupportsFloat, SupportsAbs, - SupportsComplex, IO, BinaryIO, Union, - ItemsView, KeysView, ValuesView, ByteString, Optional, AnyStr, Type, Text, + AbstractSet, + Any, + AnyStr, + BinaryIO, + ByteString, + Callable, + Container, + Dict, + FrozenSet, + Generic, + ItemsView, + Iterable, + Iterator, + KeysView, + List, + Mapping, + MutableMapping, + MutableSequence, + MutableSet, + NoReturn, + Optional, Protocol, + Reversible, + Sequence, + Set, + Sized, + SupportsAbs, + SupportsComplex, + SupportsFloat, + SupportsInt, + Text, + Tuple, + Type, + TypeVar, + Union, + ValuesView, + overload, + runtime_checkable, ) -from abc import ABCMeta -from ast import mod, AST -from io import ( - TextIOWrapper, FileIO, BufferedRandom, BufferedReader, BufferedWriter -) -from types import TracebackType, CodeType -from _typeshed import AnyPath, OpenBinaryMode, OpenTextMode, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenBinaryModeReading, SupportsWrite from typing_extensions import Literal -import sys - - class _SupportsIndex(Protocol): def __index__(self) -> int: ... -class _SupportsLessThan(Protocol): - def __lt__(self, other: Any) -> bool: ... +class _SupportsTrunc(Protocol): + def __trunc__(self) -> int: ... -_T = TypeVar('_T') -_T_co = TypeVar('_T_co', covariant=True) -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') -_S = TypeVar('_S') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') -_TT = TypeVar('_TT', bound='type') -_LT = TypeVar('_LT', bound=_SupportsLessThan) +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") +_S = TypeVar("_S") +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") +_TT = TypeVar("_TT", bound="type") +_TBE = TypeVar("_TBE", bound="BaseException") class object: __doc__: Optional[str] __dict__: Dict[str, Any] __slots__: Union[Text, Iterable[Text]] __module__: str - @property def __class__(self: _T) -> Type[_T]: ... @__class__.setter @@ -67,14 +92,12 @@ class staticmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... class classmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... @@ -91,7 +114,6 @@ __mro__: Tuple[type, ...] __name__: str __weakrefoffset__: int - @overload def __init__(self, o: object) -> None: ... @overload @@ -116,10 +138,9 @@ class int: @overload - def __init__(self, x: Union[Text, bytes, SupportsInt, _SupportsIndex] = ...) -> None: ... + def __init__(self, x: Union[Text, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc] = ...) -> None: ... @overload def __init__(self, x: Union[Text, bytes, bytearray], base: int) -> None: ... - @property def real(self) -> int: ... @property @@ -129,9 +150,7 @@ @property def denominator(self) -> int: ... def conjugate(self) -> int: ... - def bit_length(self) -> int: ... - def __add__(self, x: int) -> int: ... def __sub__(self, x: int) -> int: ... def __mul__(self, x: int) -> int: ... @@ -148,6 +167,9 @@ def __rtruediv__(self, x: int) -> float: ... def __rmod__(self, x: int) -> int: ... def __rdivmod__(self, x: int) -> Tuple[int, int]: ... + @overload + def __pow__(self, __x: Literal[2], __modulo: Optional[int] = ...) -> int: ... + @overload def __pow__(self, __x: int, __modulo: Optional[int] = ...) -> Any: ... # Return type can be int or float, depending on x. def __rpow__(self, x: int, mod: Optional[int] = ...) -> Any: ... def __and__(self, n: int) -> int: ... @@ -165,14 +187,12 @@ def __invert__(self) -> int: ... def __trunc__(self) -> int: ... def __getnewargs__(self) -> Tuple[int]: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: int) -> bool: ... def __le__(self, x: int) -> bool: ... def __gt__(self, x: int) -> bool: ... def __ge__(self, x: int) -> bool: ... - def __str__(self) -> str: ... def __float__(self) -> float: ... def __int__(self) -> int: ... @@ -188,13 +208,11 @@ def is_integer(self) -> bool: ... @classmethod def fromhex(cls, __s: str) -> float: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... def conjugate(self) -> float: ... - def __add__(self, x: float) -> float: ... def __sub__(self, x: float) -> float: ... def __mul__(self, x: float) -> float: ... @@ -203,7 +221,9 @@ def __truediv__(self, x: float) -> float: ... def __mod__(self, x: float) -> float: ... def __divmod__(self, x: float) -> Tuple[float, float]: ... - def __pow__(self, x: float, mod: None = ...) -> float: ... # In Python 3, returns complex if self is negative and x is not whole + def __pow__( + self, x: float, mod: None = ... + ) -> float: ... # In Python 3, returns complex if self is negative and x is not whole def __radd__(self, x: float) -> float: ... def __rsub__(self, x: float) -> float: ... def __rmul__(self, x: float) -> float: ... @@ -215,7 +235,6 @@ def __rpow__(self, x: float, mod: None = ...) -> float: ... def __getnewargs__(self) -> Tuple[float]: ... def __trunc__(self) -> int: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: float) -> bool: ... @@ -224,7 +243,6 @@ def __ge__(self, x: float) -> bool: ... def __neg__(self) -> float: ... def __pos__(self) -> float: ... - def __str__(self) -> str: ... def __int__(self) -> int: ... def __float__(self) -> float: ... @@ -237,14 +255,11 @@ def __init__(self, real: float = ..., imag: float = ...) -> None: ... @overload def __init__(self, real: Union[str, SupportsComplex, _SupportsIndex]) -> None: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... - def conjugate(self) -> complex: ... - def __add__(self, x: complex) -> complex: ... def __sub__(self, x: complex) -> complex: ... def __mul__(self, x: complex) -> complex: ... @@ -257,12 +272,10 @@ def __rpow__(self, x: complex, mod: None = ...) -> complex: ... def __rdiv__(self, x: complex) -> complex: ... def __rtruediv__(self, x: complex) -> complex: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __neg__(self) -> complex: ... def __pos__(self) -> complex: ... - def __str__(self) -> str: ... def __complex__(self) -> complex: ... def __abs__(self) -> float: ... @@ -283,8 +296,7 @@ def count(self, x: unicode) -> int: ... def decode(self, encoding: unicode = ..., errors: unicode = ...) -> unicode: ... def encode(self, encoding: unicode = ..., errors: unicode = ...) -> str: ... - def endswith(self, suffix: Union[unicode, Tuple[unicode, ...]], start: int = ..., - end: int = ...) -> bool: ... + def endswith(self, suffix: Union[unicode, Tuple[unicode, ...]], start: int = ..., end: int = ...) -> bool: ... def expandtabs(self, tabsize: int = ...) -> unicode: ... def find(self, sub: unicode, start: int = ..., end: int = ...) -> int: ... def format(self, *args: object, **kwargs: object) -> unicode: ... @@ -314,15 +326,13 @@ def rstrip(self, chars: unicode = ...) -> unicode: ... def split(self, sep: Optional[unicode] = ..., maxsplit: int = ...) -> List[unicode]: ... def splitlines(self, keepends: bool = ...) -> List[unicode]: ... - def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]], start: int = ..., - end: int = ...) -> bool: ... + def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]], start: int = ..., end: int = ...) -> bool: ... def strip(self, chars: unicode = ...) -> unicode: ... def swapcase(self) -> unicode: ... def title(self) -> unicode: ... def translate(self, table: Union[Dict[int, Any], unicode]) -> unicode: ... def upper(self) -> unicode: ... def zfill(self, width: int) -> unicode: ... - @overload def __getitem__(self, i: int) -> unicode: ... @overload @@ -338,7 +348,6 @@ def __le__(self, x: unicode) -> bool: ... def __gt__(self, x: unicode) -> bool: ... def __ge__(self, x: unicode) -> bool: ... - def __len__(self) -> int: ... # The argument type is incompatible with Sequence def __contains__(self, s: Union[unicode, bytes]) -> bool: ... # type: ignore @@ -350,14 +359,11 @@ def __hash__(self) -> int: ... def __getnewargs__(self) -> Tuple[unicode]: ... -_str_base = basestring - class _FormatMapMapping(Protocol): def __getitem__(self, __key: str) -> Any: ... -class str(Sequence[str], _str_base): +class str(Sequence[str], basestring): def __init__(self, o: object = ...) -> None: ... - def capitalize(self) -> str: ... def center(self, __width: int, __fillchar: str = ...) -> str: ... def count(self, x: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... @@ -367,6 +373,7 @@ def expandtabs(self, tabsize: int = ...) -> str: ... def find(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def format(self, *args: object, **kwargs: object) -> str: ... + def format_map(self, map: _FormatMapMapping) -> str: ... def index(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def isalnum(self) -> bool: ... def isalpha(self) -> bool: ... @@ -421,7 +428,6 @@ def translate(self, __table: Optional[AnyStr], deletechars: AnyStr = ...) -> AnyStr: ... def upper(self) -> str: ... def zfill(self, __width: int) -> str: ... - def __add__(self, s: AnyStr) -> AnyStr: ... # Incompatible with Sequence.__contains__ def __contains__(self, o: Union[str, Text]) -> bool: ... # type: ignore @@ -441,12 +447,10 @@ def __rmul__(self, n: int) -> str: ... def __str__(self) -> str: ... def __getnewargs__(self) -> Tuple[str]: ... - def __getslice__(self, start: int, stop: int) -> str: ... def __float__(self) -> float: ... def __int__(self) -> int: ... - bytes = str class bytearray(MutableSequence[int], ByteString): @@ -492,10 +496,7 @@ def split(self, sep: Optional[bytes] = ..., maxsplit: int = ...) -> List[bytearray]: ... def splitlines(self, keepends: bool = ...) -> List[bytearray]: ... def startswith( - self, - __prefix: Union[bytes, Tuple[bytes, ...]], - __start: Optional[int] = ..., - __end: Optional[int] = ..., + self, __prefix: Union[bytes, Tuple[bytes, ...]], __start: Optional[int] = ..., __end: Optional[int] = ... ) -> bool: ... def strip(self, __bytes: Optional[bytes] = ...) -> bytearray: ... def swapcase(self) -> bytearray: ... @@ -505,7 +506,6 @@ def zfill(self, __width: int) -> bytearray: ... @classmethod def fromhex(cls, __string: str) -> bytearray: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[int]: ... def __str__(self) -> str: ... @@ -536,9 +536,7 @@ def __gt__(self, x: bytes) -> bool: ... def __ge__(self, x: bytes) -> bool: ... -_mv_container_type = str - -class memoryview(Sized, Container[_mv_container_type]): +class memoryview(Sized, Container[str]): format: str itemsize: int shape: Optional[Tuple[int, ...]] @@ -546,30 +544,23 @@ suboffsets: Optional[Tuple[int, ...]] readonly: bool ndim: int - - def __init__(self, obj: Union[bytes, bytearray, buffer, memoryview]) -> None: ... - + def __init__(self, obj: ReadableBuffer) -> None: ... @overload - def __getitem__(self, i: int) -> _mv_container_type: ... + def __getitem__(self, i: int) -> str: ... @overload def __getitem__(self, s: slice) -> memoryview: ... - def __contains__(self, x: object) -> bool: ... - def __iter__(self) -> Iterator[_mv_container_type]: ... + def __iter__(self) -> Iterator[str]: ... def __len__(self) -> int: ... - @overload def __setitem__(self, s: slice, o: memoryview) -> None: ... @overload def __setitem__(self, i: int, o: bytes) -> None: ... @overload def __setitem__(self, s: slice, o: Sequence[bytes]) -> None: ... - def tobytes(self) -> bytes: ... def tolist(self) -> List[int]: ... - - class bool(int): def __init__(self, o: object = ...) -> None: ... @overload @@ -622,7 +613,10 @@ def __le__(self, x: Tuple[_T_co, ...]) -> bool: ... def __gt__(self, x: Tuple[_T_co, ...]) -> bool: ... def __ge__(self, x: Tuple[_T_co, ...]) -> bool: ... + @overload def __add__(self, x: Tuple[_T_co, ...]) -> Tuple[_T_co, ...]: ... + @overload + def __add__(self, x: Tuple[Any, ...]) -> Tuple[Any, ...]: ... def __mul__(self, n: int) -> Tuple[_T_co, ...]: ... def __rmul__(self, n: int) -> Tuple[_T_co, ...]: ... def count(self, __value: Any) -> int: ... @@ -648,7 +642,6 @@ def remove(self, __value: _T) -> None: ... def reverse(self) -> None: ... def sort(self, cmp: Callable[[_T, _T], Any] = ..., key: Callable[[_T], Any] = ..., reverse: bool = ...) -> None: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... @@ -682,12 +675,10 @@ @overload def __init__(self, **kwargs: _VT) -> None: ... @overload - def __init__(self, map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... + def __init__(self, map: SupportsKeysAndGetItem[_KT, _VT], **kwargs: _VT) -> None: ... @overload def __init__(self, iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT) -> None: ... - def __new__(cls: Type[_T1], *args: Any, **kwargs: Any) -> _T1: ... - def has_key(self, k: _KT) -> bool: ... def clear(self) -> None: ... def copy(self) -> Dict[_KT, _VT]: ... @@ -746,8 +737,8 @@ def __iand__(self, s: AbstractSet[object]) -> Set[_T]: ... def __or__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ior__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... - def __sub__(self, s: AbstractSet[object]) -> Set[_T]: ... - def __isub__(self, s: AbstractSet[object]) -> Set[_T]: ... + def __sub__(self, s: AbstractSet[_T]) -> Set[_T]: ... + def __isub__(self, s: AbstractSet[_T]) -> Set[_T]: ... def __xor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ixor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __le__(self, s: AbstractSet[object]) -> bool: ... @@ -795,10 +786,13 @@ def __reversed__(self) -> Iterator[int]: ... class property(object): - def __init__(self, fget: Optional[Callable[[Any], Any]] = ..., - fset: Optional[Callable[[Any, Any], None]] = ..., - fdel: Optional[Callable[[Any], None]] = ..., - doc: Optional[str] = ...) -> None: ... + def __init__( + self, + fget: Optional[Callable[[Any], Any]] = ..., + fset: Optional[Callable[[Any, Any], None]] = ..., + fdel: Optional[Callable[[Any], None]] = ..., + doc: Optional[str] = ..., + ) -> None: ... def getter(self, fget: Callable[[Any], Any]) -> property: ... def setter(self, fset: Callable[[Any, Any], None]) -> property: ... def deleter(self, fdel: Callable[[Any], None]) -> property: ... @@ -822,20 +816,33 @@ def all(__iterable: Iterable[object]) -> bool: ... def any(__iterable: Iterable[object]) -> bool: ... def apply(__func: Callable[..., _T], __args: Optional[Sequence[Any]] = ..., __kwds: Optional[Mapping[str, Any]] = ...) -> _T: ... - def bin(__number: Union[int, _SupportsIndex]) -> str: ... - def callable(__obj: object) -> bool: ... def chr(__i: int) -> str: ... def cmp(__x: Any, __y: Any) -> int: ... -_N1 = TypeVar('_N1', bool, int, float, complex) + +_N1 = TypeVar("_N1", bool, int, float, complex) + def coerce(__x: _N1, __y: _N1) -> Tuple[_N1, _N1]: ... + +# This class is to be exported as PathLike from os, +# but we define it here as _PathLike to avoid import cycle issues. +# See https://github.com/python/typeshed/pull/991#issuecomment-288160993 +_AnyStr_co = TypeVar("_AnyStr_co", str, bytes, covariant=True) +@runtime_checkable +class _PathLike(Protocol[_AnyStr_co]): + def __fspath__(self) -> _AnyStr_co: ... + def compile(source: Union[Text, mod], filename: Text, mode: Text, flags: int = ..., dont_inherit: int = ...) -> Any: ... def delattr(__obj: Any, __name: Text) -> None: ... def dir(__o: object = ...) -> List[str]: ... -_N2 = TypeVar('_N2', int, float) + +_N2 = TypeVar("_N2", int, float) + def divmod(__x: _N2, __y: _N2) -> Tuple[_N2, _N2]: ... -def eval(__source: Union[Text, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ...) -> Any: ... +def eval( + __source: Union[Text, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ... +) -> Any: ... def execfile(__filename: str, __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Dict[str, Any]] = ...) -> None: ... def exit(code: object = ...) -> NoReturn: ... @overload @@ -870,69 +877,69 @@ @overload def map(__func: None, __iter1: Iterable[_T1]) -> List[_T1]: ... @overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... -@overload -def map(__func: None, - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4], - __iter5: Iterable[_T5]) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def map(__func: None, - __iter1: Iterable[Any], - __iter2: Iterable[Any], - __iter3: Iterable[Any], - __iter4: Iterable[Any], - __iter5: Iterable[Any], - __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[Tuple[Any, ...]]: ... +def map(__func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... +@overload +def map(__func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... +@overload +def map( + __func: None, __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4] +) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def map( + __func: None, + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], + __iter5: Iterable[_T5], +) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def map( + __func: None, + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[Tuple[Any, ...]]: ... @overload def map(__func: Callable[[_T1], _S], __iter1: Iterable[_T1]) -> List[_S]: ... @overload -def map(__func: Callable[[_T1, _T2], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4], - __iter5: Iterable[_T5]) -> List[_S]: ... -@overload -def map(__func: Callable[..., _S], - __iter1: Iterable[Any], - __iter2: Iterable[Any], - __iter3: Iterable[Any], - __iter4: Iterable[Any], - __iter5: Iterable[Any], - __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[_S]: ... +def map(__func: Callable[[_T1, _T2], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3] +) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], +) -> List[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], + __iter5: Iterable[_T5], +) -> List[_S]: ... +@overload +def map( + __func: Callable[..., _S], + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[_S]: ... @overload def max(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ... @overload @@ -946,26 +953,23 @@ @overload def next(__i: Iterator[_T], default: _VT) -> Union[_T, _VT]: ... def oct(__number: Union[int, _SupportsIndex]) -> str: ... - - - - - - - def open(name: Union[unicode, int], mode: unicode = ..., buffering: int = ...) -> BinaryIO: ... - def ord(__c: Union[Text, bytes]) -> int: ... # This is only available after from __future__ import print_function. -def print(*values: object, sep: Optional[Text] = ..., end: Optional[Text] = ..., file: Optional[SupportsWrite[Any]] = ...) -> None: ... +def print( + *values: object, sep: Optional[Text] = ..., end: Optional[Text] = ..., file: Optional[SupportsWrite[Any]] = ... +) -> None: ... _E = TypeVar("_E", contravariant=True) _M = TypeVar("_M", contravariant=True) + class _SupportsPow2(Protocol[_E, _T_co]): def __pow__(self, __other: _E) -> _T_co: ... + class _SupportsPow3(Protocol[_E, _M, _T_co]): def __pow__(self, __other: _E, __modulo: _M) -> _T_co: ... + @overload def pow(__base: int, __exp: int, __mod: None = ...) -> Any: ... # returns int or float depending on whether exp is non-negative @overload @@ -985,9 +989,9 @@ def reduce(__function: Callable[[_T, _T], _T], __iterable: Iterable[_T]) -> _T: ... def reload(__module: Any) -> Any: ... @overload -def reversed(__object: Sequence[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Sequence[_T]) -> Iterator[_T]: ... @overload -def reversed(__object: Reversible[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Reversible[_T]) -> Iterator[_T]: ... def repr(__obj: object) -> str: ... @overload def round(number: float) -> float: ... @@ -998,47 +1002,59 @@ @overload def round(number: SupportsFloat, ndigits: int) -> float: ... def setattr(__obj: Any, __name: Text, __value: Any) -> None: ... -def sorted(__iterable: Iterable[_T], *, - cmp: Callable[[_T, _T], int] = ..., - key: Optional[Callable[[_T], Any]] = ..., - reverse: bool = ...) -> List[_T]: ... +def sorted( + __iterable: Iterable[_T], + *, + cmp: Callable[[_T, _T], int] = ..., + key: Optional[Callable[[_T], Any]] = ..., + reverse: bool = ..., +) -> List[_T]: ... @overload def sum(__iterable: Iterable[_T]) -> Union[_T, int]: ... @overload def sum(__iterable: Iterable[_T], __start: _S) -> Union[_T, _S]: ... def unichr(__i: int) -> unicode: ... def vars(__object: Any = ...) -> Dict[str, Any]: ... - @overload def zip(__iter1: Iterable[_T1]) -> List[Tuple[_T1]]: ... @overload -def zip(__iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... -@overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... +def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> List[Tuple[_T1, _T2]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> List[Tuple[_T1, _T2, _T3]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4], __iter5: Iterable[_T5]) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def zip(__iter1: Iterable[Any], __iter2: Iterable[Any], __iter3: Iterable[Any], - __iter4: Iterable[Any], __iter5: Iterable[Any], __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> List[Tuple[Any, ...]]: ... -def __import__(name: Text, globals: Optional[Mapping[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ..., - fromlist: Sequence[str] = ..., - level: int = ...) -> Any: ... +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4] +) -> List[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4], __iter5: Iterable[_T5] +) -> List[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def zip( + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> List[Tuple[Any, ...]]: ... +def __import__( + name: Text, + globals: Optional[Mapping[str, Any]] = ..., + locals: Optional[Mapping[str, Any]] = ..., + fromlist: Sequence[str] = ..., + level: int = ..., +) -> Any: ... # Actually the type of Ellipsis is , but since it's # not exposed anywhere under that name, we make it private here. class ellipsis: ... + Ellipsis: ellipsis # TODO: buffer support is incomplete; e.g. some_string.startswith(some_buffer) doesn't type check. -_AnyBuffer = TypeVar('_AnyBuffer', str, unicode, bytearray, buffer) +_AnyBuffer = TypeVar("_AnyBuffer", str, unicode, bytearray, buffer) class buffer(Sized): def __init__(self, object: _AnyBuffer, offset: int = ..., size: int = ...) -> None: ... @@ -1060,78 +1076,78 @@ class GeneratorExit(BaseException): ... class KeyboardInterrupt(BaseException): ... + class SystemExit(BaseException): code: int + class Exception(BaseException): ... -class StopIteration(Exception): +class StopIteration(Exception): ... class StandardError(Exception): ... + _StandardError = StandardError + class EnvironmentError(StandardError): errno: int strerror: str # TODO can this be unicode? filename: str + class OSError(EnvironmentError): ... class IOError(EnvironmentError): ... - class ArithmeticError(_StandardError): ... class AssertionError(_StandardError): ... class AttributeError(_StandardError): ... class BufferError(_StandardError): ... class EOFError(_StandardError): ... -class ImportError(_StandardError): +class ImportError(_StandardError): ... class LookupError(_StandardError): ... class MemoryError(_StandardError): ... class NameError(_StandardError): ... class ReferenceError(_StandardError): ... class RuntimeError(_StandardError): ... + class SyntaxError(_StandardError): msg: str lineno: Optional[int] offset: Optional[int] text: Optional[str] filename: Optional[str] + class SystemError(_StandardError): ... class TypeError(_StandardError): ... class ValueError(_StandardError): ... - class FloatingPointError(ArithmeticError): ... class OverflowError(ArithmeticError): ... class ZeroDivisionError(ArithmeticError): ... - - class IndexError(LookupError): ... class KeyError(LookupError): ... - class UnboundLocalError(NameError): ... class WindowsError(OSError): winerror: int class NotImplementedError(RuntimeError): ... - class IndentationError(SyntaxError): ... class TabError(IndentationError): ... - class UnicodeError(ValueError): ... + class UnicodeDecodeError(UnicodeError): encoding: str object: bytes start: int end: int reason: str - def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, - __reason: str) -> None: ... + def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, __reason: str) -> None: ... + class UnicodeEncodeError(UnicodeError): encoding: str object: Text start: int end: int reason: str - def __init__(self, __encoding: str, __object: Text, __start: int, __end: int, - __reason: str) -> None: ... -class UnicodeTranslateError(UnicodeError): ... + def __init__(self, __encoding: str, __object: Text, __start: int, __end: int, __reason: str) -> None: ... +class UnicodeTranslateError(UnicodeError): ... class Warning(Exception): ... class UserWarning(Warning): ... class DeprecationWarning(Warning): ... @@ -1154,12 +1170,13 @@ def next(self) -> str: ... def read(self, n: int = ...) -> str: ... def __enter__(self) -> BinaryIO: ... - def __exit__(self, t: Optional[type] = ..., exc: Optional[BaseException] = ..., tb: Optional[Any] = ...) -> Optional[bool]: ... + def __exit__( + self, t: Optional[type] = ..., exc: Optional[BaseException] = ..., tb: Optional[Any] = ... + ) -> Optional[bool]: ... def flush(self) -> None: ... def fileno(self) -> int: ... def isatty(self) -> bool: ... def close(self) -> None: ... - def readable(self) -> bool: ... def writable(self) -> bool: ... def seekable(self) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/collections.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/collections.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/collections.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/collections.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,38 +1,50 @@ -# These are not exported. -from typing import Any, Dict, Generic, TypeVar, Tuple, overload, Type, Optional, List, Union, Reversible - -# These are exported. from typing import ( + AbstractSet, + Any, Callable as Callable, Container as Container, + Dict, + Generic, Hashable as Hashable, ItemsView as ItemsView, Iterable as Iterable, Iterator as Iterator, KeysView as KeysView, + List, Mapping as Mapping, MappingView as MappingView, MutableMapping as MutableMapping, MutableSequence as MutableSequence, MutableSet as MutableSet, + Optional, + Reversible, Sequence as Sequence, - AbstractSet as Set, Sized as Sized, + Tuple, + Type, + TypeVar, + Union, ValuesView as ValuesView, + overload, ) -_S = TypeVar('_S') -_T = TypeVar('_T') -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') +Set = AbstractSet + +_S = TypeVar("_S") +_T = TypeVar("_T") +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") # namedtuple is special-cased in the type checker; the initializer is ignored. -def namedtuple(typename: Union[str, unicode], field_names: Union[str, unicode, Iterable[Union[str, unicode]]], - verbose: bool = ..., rename: bool = ...) -> Type[Tuple[Any, ...]]: ... +def namedtuple( + typename: Union[str, unicode], + field_names: Union[str, unicode, Iterable[Union[str, unicode]]], + verbose: bool = ..., + rename: bool = ..., +) -> Type[Tuple[Any, ...]]: ... class deque(Sized, Iterable[_T], Reversible[_T], Generic[_T]): - def __init__(self, iterable: Iterable[_T] = ..., - maxlen: int = ...) -> None: ... + def __init__(self, iterable: Iterable[_T] = ..., maxlen: int = ...) -> None: ... @property def maxlen(self) -> Optional[int]: ... def append(self, x: _T) -> None: ... @@ -45,7 +57,7 @@ def popleft(self) -> _T: ... def remove(self, value: _T) -> None: ... def reverse(self) -> None: ... - def rotate(self, n: int) -> None: ... + def rotate(self, n: int = ...) -> None: ... def __len__(self) -> int: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... @@ -81,7 +93,6 @@ def update(self, __m: Union[Iterable[_T], Iterable[Tuple[_T, int]]], **kwargs: int) -> None: ... @overload def update(self, **kwargs: int) -> None: ... - def __add__(self, other: Counter[_T]) -> Counter[_T]: ... def __sub__(self, other: Counter[_T]) -> Counter[_T]: ... def __and__(self, other: Counter[_T]) -> Counter[_T]: ... @@ -105,16 +116,14 @@ @overload def __init__(self, default_factory: Optional[Callable[[], _VT]], **kwargs: _VT) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - map: Mapping[_KT, _VT]) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], map: Mapping[_KT, _VT]) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - iterable: Iterable[Tuple[_KT, _VT]]) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], iterable: Iterable[Tuple[_KT, _VT]]) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT) -> None: ... + def __init__( + self, default_factory: Optional[Callable[[], _VT]], iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT + ) -> None: ... def __missing__(self, key: _KT) -> _VT: ... def copy(self: _S) -> _S: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/compileall.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/compileall.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/compileall.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/compileall.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -11,6 +11,6 @@ quiet: int = ..., ) -> int: ... def compile_file( - fullname: AnyPath, ddir: Optional[AnyPath] = ..., force: bool = ..., rx: Optional[Pattern[Any]] = ..., quiet: int = ..., + fullname: AnyPath, ddir: Optional[AnyPath] = ..., force: bool = ..., rx: Optional[Pattern[Any]] = ..., quiet: int = ... ) -> int: ... def compile_path(skip_curdir: bool = ..., maxlevels: int = ..., force: bool = ..., quiet: int = ...) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ConfigParser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ConfigParser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ConfigParser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ConfigParser.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, IO, Sequence, Tuple, Union, List, Dict, Optional -from _typeshed import SupportsReadline +from _typeshed import SupportsNoArgReadline +from typing import IO, Any, Dict, List, Optional, Sequence, Tuple, Union DEFAULTSECT: str MAX_INTERPOLATION_DEPTH: int @@ -66,7 +66,7 @@ def has_section(self, section: str) -> bool: ... def options(self, section: str) -> List[str]: ... def read(self, filenames: Union[str, Sequence[str]]) -> List[str]: ... - def readfp(self, fp: SupportsReadline[str], filename: str = ...) -> None: ... + def readfp(self, fp: SupportsNoArgReadline[str], filename: str = ...) -> None: ... def get(self, section: str, option: str) -> str: ... def items(self, section: str) -> List[Tuple[Any, Any]]: ... def _get(self, section: str, conv: type, option: str) -> Any: ... @@ -93,5 +93,5 @@ _interpvar_re: Any def _interpolate(self, section: str, option: str, rawval: Any, vars: Any) -> str: ... def _interpolate_some( - self, option: str, accum: List[Any], rest: str, section: str, map: Dict[Any, Any], depth: int, + self, option: str, accum: List[Any], rest: str, section: str, map: Dict[Any, Any], depth: int ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/cPickle.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/cPickle.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/cPickle.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/cPickle.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any, IO, List +from typing import IO, Any, List HIGHEST_PROTOCOL: int compatible_formats: List[str] @@ -6,20 +6,14 @@ class Pickler: def __init__(self, file: IO[str], protocol: int = ...) -> None: ... - def dump(self, obj: Any) -> None: ... - def clear_memo(self) -> None: ... - class Unpickler: def __init__(self, file: IO[str]) -> None: ... - def load(self) -> Any: ... - def noload(self) -> Any: ... - def dump(obj: Any, file: IO[str], protocol: int = ...) -> None: ... def dumps(obj: Any, protocol: int = ...) -> str: ... def load(file: IO[str]) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/archive_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/archive_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/archive_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/archive_util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,12 @@ +from typing import Optional + +def make_archive( + base_name: str, + format: str, + root_dir: Optional[str] = ..., + base_dir: Optional[str] = ..., + verbose: int = ..., + dry_run: int = ..., +) -> str: ... +def make_tarball(base_name: str, base_dir: str, compress: Optional[str] = ..., verbose: int = ..., dry_run: int = ...) -> str: ... +def make_zipfile(base_name: str, base_dir: str, verbose: int = ..., dry_run: int = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/bcppcompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/bcppcompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/bcppcompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/bcppcompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class BCPPCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/ccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/ccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/ccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/ccompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,150 @@ +from typing import Any, Callable, List, Optional, Tuple, Union + +_Macro = Union[Tuple[str], Tuple[str, Optional[str]]] + +def gen_lib_options( + compiler: CCompiler, library_dirs: List[str], runtime_library_dirs: List[str], libraries: List[str] +) -> List[str]: ... +def gen_preprocess_options(macros: List[_Macro], include_dirs: List[str]) -> List[str]: ... +def get_default_compiler(osname: Optional[str] = ..., platform: Optional[str] = ...) -> str: ... +def new_compiler( + plat: Optional[str] = ..., compiler: Optional[str] = ..., verbose: int = ..., dry_run: int = ..., force: int = ... +) -> CCompiler: ... +def show_compilers() -> None: ... + +class CCompiler: + dry_run: bool + force: bool + verbose: bool + output_dir: Optional[str] + macros: List[_Macro] + include_dirs: List[str] + libraries: List[str] + library_dirs: List[str] + runtime_library_dirs: List[str] + objects: List[str] + def __init__(self, verbose: int = ..., dry_run: int = ..., force: int = ...) -> None: ... + def add_include_dir(self, dir: str) -> None: ... + def set_include_dirs(self, dirs: List[str]) -> None: ... + def add_library(self, libname: str) -> None: ... + def set_libraries(self, libnames: List[str]) -> None: ... + def add_library_dir(self, dir: str) -> None: ... + def set_library_dirs(self, dirs: List[str]) -> None: ... + def add_runtime_library_dir(self, dir: str) -> None: ... + def set_runtime_library_dirs(self, dirs: List[str]) -> None: ... + def define_macro(self, name: str, value: Optional[str] = ...) -> None: ... + def undefine_macro(self, name: str) -> None: ... + def add_link_object(self, object: str) -> None: ... + def set_link_objects(self, objects: List[str]) -> None: ... + def detect_language(self, sources: Union[str, List[str]]) -> Optional[str]: ... + def find_library_file(self, dirs: List[str], lib: str, debug: bool = ...) -> Optional[str]: ... + def has_function( + self, + funcname: str, + includes: Optional[List[str]] = ..., + include_dirs: Optional[List[str]] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + ) -> bool: ... + def library_dir_option(self, dir: str) -> str: ... + def library_option(self, lib: str) -> str: ... + def runtime_library_dir_option(self, dir: str) -> str: ... + def set_executables(self, **args: str) -> None: ... + def compile( + self, + sources: List[str], + output_dir: Optional[str] = ..., + macros: Optional[_Macro] = ..., + include_dirs: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + depends: Optional[List[str]] = ..., + ) -> List[str]: ... + def create_static_lib( + self, + objects: List[str], + output_libname: str, + output_dir: Optional[str] = ..., + debug: bool = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link( + self, + target_desc: str, + objects: List[str], + output_filename: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_executable( + self, + objects: List[str], + output_progname: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_shared_lib( + self, + objects: List[str], + output_libname: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_shared_object( + self, + objects: List[str], + output_filename: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def preprocess( + self, + source: str, + output_file: Optional[str] = ..., + macros: Optional[List[_Macro]] = ..., + include_dirs: Optional[List[str]] = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + ) -> None: ... + def executable_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ... + def library_filename(self, libname: str, lib_type: str = ..., strip_dir: int = ..., output_dir: str = ...) -> str: ... + def object_filenames(self, source_filenames: List[str], strip_dir: int = ..., output_dir: str = ...) -> List[str]: ... + def shared_object_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ... + def execute(self, func: Callable[..., None], args: Tuple[Any, ...], msg: Optional[str] = ..., level: int = ...) -> None: ... + def spawn(self, cmd: List[str]) -> None: ... + def mkpath(self, name: str, mode: int = ...) -> None: ... + def move_file(self, src: str, dst: str) -> str: ... + def announce(self, msg: str, level: int = ...) -> None: ... + def warn(self, msg: str) -> None: ... + def debug_print(self, msg: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cmd.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cmd.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cmd.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cmd.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,67 @@ +from abc import abstractmethod +from distutils.dist import Distribution +from typing import Any, Callable, Iterable, List, Optional, Text, Tuple, Union + +class Command: + sub_commands: List[Tuple[str, Optional[Callable[[Command], bool]]]] + def __init__(self, dist: Distribution) -> None: ... + @abstractmethod + def initialize_options(self) -> None: ... + @abstractmethod + def finalize_options(self) -> None: ... + @abstractmethod + def run(self) -> None: ... + def announce(self, msg: Text, level: int = ...) -> None: ... + def debug_print(self, msg: Text) -> None: ... + def ensure_string(self, option: str, default: Optional[str] = ...) -> None: ... + def ensure_string_list(self, option: Union[str, List[str]]) -> None: ... + def ensure_filename(self, option: str) -> None: ... + def ensure_dirname(self, option: str) -> None: ... + def get_command_name(self) -> str: ... + def set_undefined_options(self, src_cmd: Text, *option_pairs: Tuple[str, str]) -> None: ... + def get_finalized_command(self, command: Text, create: int = ...) -> Command: ... + def reinitialize_command(self, command: Union[Command, Text], reinit_subcommands: int = ...) -> Command: ... + def run_command(self, command: Text) -> None: ... + def get_sub_commands(self) -> List[str]: ... + def warn(self, msg: Text) -> None: ... + def execute(self, func: Callable[..., Any], args: Iterable[Any], msg: Optional[Text] = ..., level: int = ...) -> None: ... + def mkpath(self, name: str, mode: int = ...) -> None: ... + def copy_file( + self, + infile: str, + outfile: str, + preserve_mode: int = ..., + preserve_times: int = ..., + link: Optional[str] = ..., + level: Any = ..., + ) -> Tuple[str, bool]: ... # level is not used + def copy_tree( + self, + infile: str, + outfile: str, + preserve_mode: int = ..., + preserve_times: int = ..., + preserve_symlinks: int = ..., + level: Any = ..., + ) -> List[str]: ... # level is not used + def move_file(self, src: str, dst: str, level: Any = ...) -> str: ... # level is not used + def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ... # level is not used + def make_archive( + self, + base_name: str, + format: str, + root_dir: Optional[str] = ..., + base_dir: Optional[str] = ..., + owner: Optional[str] = ..., + group: Optional[str] = ..., + ) -> str: ... + def make_file( + self, + infiles: Union[str, List[str], Tuple[str]], + outfile: str, + func: Callable[..., Any], + args: List[Any], + exec_msg: Optional[str] = ..., + skip_msg: Optional[str] = ..., + level: Any = ..., + ) -> None: ... # level is not used diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/bdist_msi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/bdist_msi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/bdist_msi.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/bdist_msi.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,6 @@ +from distutils.cmd import Command + +class bdist_msi(Command): + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/build_py.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/build_py.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/build_py.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/build_py.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,6 @@ +from distutils.cmd import Command + +class build_py(Command): + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/config.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/config.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,87 @@ +from distutils import log as log +from distutils.ccompiler import CCompiler +from distutils.core import Command as Command +from distutils.errors import DistutilsExecError as DistutilsExecError +from distutils.sysconfig import customize_compiler as customize_compiler +from typing import Dict, List, Optional, Pattern, Sequence, Tuple, Union + +LANG_EXT: Dict[str, str] + +class config(Command): + description: str = ... + # Tuple is full name, short name, description + user_options: Sequence[Tuple[str, Optional[str], str]] = ... + compiler: Optional[Union[str, CCompiler]] = ... + cc: Optional[str] = ... + include_dirs: Optional[Sequence[str]] = ... + libraries: Optional[Sequence[str]] = ... + library_dirs: Optional[Sequence[str]] = ... + noisy: int = ... + dump_source: int = ... + temp_files: Sequence[str] = ... + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... + def try_cpp( + self, + body: Optional[str] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def search_cpp( + self, + pattern: Union[Pattern[str], str], + body: Optional[str] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def try_compile( + self, body: str, headers: Optional[Sequence[str]] = ..., include_dirs: Optional[Sequence[str]] = ..., lang: str = ... + ) -> bool: ... + def try_link( + self, + body: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def try_run( + self, + body: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def check_func( + self, + func: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + decl: int = ..., + call: int = ..., + ) -> bool: ... + def check_lib( + self, + library: str, + library_dirs: Optional[Sequence[str]] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + other_libraries: List[str] = ..., + ) -> bool: ... + def check_header( + self, + header: str, + include_dirs: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + +def dump_file(filename: str, head: Optional[str] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install_egg_info.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install_egg_info.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install_egg_info.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install_egg_info.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,10 @@ +from distutils.cmd import Command +from typing import ClassVar, List, Optional, Tuple + +class install_egg_info(Command): + description: ClassVar[str] + user_options: ClassVar[List[Tuple[str, Optional[str], str]]] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... + def get_outputs(self) -> List[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/install.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,12 @@ +from distutils.cmd import Command +from typing import Optional, Text + +class install(Command): + user: bool + prefix: Optional[Text] + home: Optional[Text] + root: Optional[Text] + install_lib: Optional[Text] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/upload.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/upload.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/upload.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/command/upload.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,8 @@ +from distutils.config import PyPIRCCommand +from typing import ClassVar, List, Optional, Tuple + +class upload(PyPIRCCommand): + description: ClassVar[str] + boolean_options: ClassVar[List[str]] + def run(self) -> None: ... + def upload_file(self, command, pyversion, filename) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/config.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/config.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,17 @@ +from abc import abstractmethod +from distutils.cmd import Command +from typing import ClassVar, List, Optional, Tuple + +DEFAULT_PYPIRC: str + +class PyPIRCCommand(Command): + DEFAULT_REPOSITORY: ClassVar[str] + DEFAULT_REALM: ClassVar[str] + repository: None + realm: None + user_options: ClassVar[List[Tuple[str, Optional[str], str]]] + boolean_options: ClassVar[List[str]] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + @abstractmethod + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/core.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/core.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/core.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/core.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,48 @@ +from distutils.cmd import Command as Command +from distutils.dist import Distribution as Distribution +from distutils.extension import Extension as Extension +from typing import Any, List, Mapping, Optional, Tuple, Type, Union + +def setup( + *, + name: str = ..., + version: str = ..., + description: str = ..., + long_description: str = ..., + author: str = ..., + author_email: str = ..., + maintainer: str = ..., + maintainer_email: str = ..., + url: str = ..., + download_url: str = ..., + packages: List[str] = ..., + py_modules: List[str] = ..., + scripts: List[str] = ..., + ext_modules: List[Extension] = ..., + classifiers: List[str] = ..., + distclass: Type[Distribution] = ..., + script_name: str = ..., + script_args: List[str] = ..., + options: Mapping[str, Any] = ..., + license: str = ..., + keywords: Union[List[str], str] = ..., + platforms: Union[List[str], str] = ..., + cmdclass: Mapping[str, Type[Command]] = ..., + data_files: List[Tuple[str, List[str]]] = ..., + package_dir: Mapping[str, str] = ..., + obsoletes: List[str] = ..., + provides: List[str] = ..., + requires: List[str] = ..., + command_packages: List[str] = ..., + command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ..., + package_data: Mapping[str, List[str]] = ..., + include_package_data: bool = ..., + libraries: List[str] = ..., + headers: List[str] = ..., + ext_package: str = ..., + include_dirs: List[str] = ..., + password: str = ..., + fullname: str = ..., + **attrs: Any, +) -> None: ... +def run_setup(script_name: str, script_args: Optional[List[str]] = ..., stop_after: str = ...) -> Distribution: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cygwinccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cygwinccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cygwinccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/cygwinccompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,4 @@ +from distutils.unixccompiler import UnixCCompiler + +class CygwinCCompiler(UnixCCompiler): ... +class Mingw32CCompiler(CygwinCCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/debug.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/debug.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/debug.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/debug.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1 @@ +DEBUG: bool diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dep_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dep_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dep_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dep_util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,5 @@ +from typing import List, Tuple + +def newer(source: str, target: str) -> bool: ... +def newer_pairwise(sources: List[str], targets: List[str]) -> List[Tuple[str, str]]: ... +def newer_group(sources: List[str], target: str, missing: str = ...) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dir_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dir_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dir_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dir_util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,15 @@ +from typing import List + +def mkpath(name: str, mode: int = ..., verbose: int = ..., dry_run: int = ...) -> List[str]: ... +def create_tree(base_dir: str, files: List[str], mode: int = ..., verbose: int = ..., dry_run: int = ...) -> None: ... +def copy_tree( + src: str, + dst: str, + preserve_mode: int = ..., + preserve_times: int = ..., + preserve_symlinks: int = ..., + update: int = ..., + verbose: int = ..., + dry_run: int = ..., +) -> List[str]: ... +def remove_tree(directory: str, verbose: int = ..., dry_run: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dist.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/dist.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,9 @@ +from distutils.cmd import Command +from typing import Any, Dict, Iterable, Mapping, Optional, Text, Tuple, Type + +class Distribution: + cmdclass: Dict[str, Type[Command]] + def __init__(self, attrs: Optional[Mapping[str, Any]] = ...) -> None: ... + def get_option_dict(self, command: str) -> Dict[str, Tuple[str, Text]]: ... + def parse_config_files(self, filenames: Optional[Iterable[Text]] = ...) -> None: ... + def get_command_obj(self, command: str, create: bool = ...) -> Optional[Command]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/emxccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/emxccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/emxccompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/emxccompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for emxccompiler - from distutils.unixccompiler import UnixCCompiler class EMXCCompiler(UnixCCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/errors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/errors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/errors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/errors.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,19 @@ +class DistutilsError(Exception): ... +class DistutilsModuleError(DistutilsError): ... +class DistutilsClassError(DistutilsError): ... +class DistutilsGetoptError(DistutilsError): ... +class DistutilsArgError(DistutilsError): ... +class DistutilsFileError(DistutilsError): ... +class DistutilsOptionError(DistutilsError): ... +class DistutilsSetupError(DistutilsError): ... +class DistutilsPlatformError(DistutilsError): ... +class DistutilsExecError(DistutilsError): ... +class DistutilsInternalError(DistutilsError): ... +class DistutilsTemplateError(DistutilsError): ... +class DistutilsByteCompileError(DistutilsError): ... +class CCompilerError(Exception): ... +class PreprocessError(CCompilerError): ... +class CompileError(CCompilerError): ... +class LibError(CCompilerError): ... +class LinkError(CCompilerError): ... +class UnknownFileError(CCompilerError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/extension.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/extension.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/extension.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/extension.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import List, Optional, Tuple + +class Extension: + def __init__( + self, + name: str, + sources: List[str], + include_dirs: List[str] = ..., + define_macros: List[Tuple[str, Optional[str]]] = ..., + undef_macros: List[str] = ..., + library_dirs: List[str] = ..., + libraries: List[str] = ..., + runtime_library_dirs: List[str] = ..., + extra_objects: List[str] = ..., + extra_compile_args: List[str] = ..., + extra_link_args: List[str] = ..., + export_symbols: List[str] = ..., + swig_opts: Optional[str] = ..., # undocumented + depends: List[str] = ..., + language: str = ..., + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/fancy_getopt.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/fancy_getopt.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/fancy_getopt.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/fancy_getopt.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import Any, List, Mapping, Optional, Tuple, Union, overload + +_Option = Tuple[str, Optional[str], str] +_GR = Tuple[List[str], OptionDummy] + +def fancy_getopt( + options: List[_Option], negative_opt: Mapping[_Option, _Option], object: Any, args: Optional[List[str]] +) -> Union[List[str], _GR]: ... +def wrap_text(text: str, width: int) -> List[str]: ... + +class FancyGetopt: + def __init__(self, option_table: Optional[List[_Option]] = ...) -> None: ... + # TODO kinda wrong, `getopt(object=object())` is invalid + @overload + def getopt(self, args: Optional[List[str]] = ...) -> _GR: ... + @overload + def getopt(self, args: Optional[List[str]], object: Any) -> List[str]: ... + def get_option_order(self) -> List[Tuple[str, str]]: ... + def generate_help(self, header: Optional[str] = ...) -> List[str]: ... + +class OptionDummy: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/filelist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/filelist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/filelist.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/filelist.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1 @@ +class FileList: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/file_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/file_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/file_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/file_util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,14 @@ +from typing import Optional, Sequence, Tuple + +def copy_file( + src: str, + dst: str, + preserve_mode: bool = ..., + preserve_times: bool = ..., + update: bool = ..., + link: Optional[str] = ..., + verbose: bool = ..., + dry_run: bool = ..., +) -> Tuple[str, str]: ... +def move_file(src: str, dst: str, verbose: bool = ..., dry_run: bool = ...) -> str: ... +def write_file(filename: str, contents: Sequence[str]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/log.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/log.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/log.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/log.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,25 @@ +from typing import Any, Text + +DEBUG: int +INFO: int +WARN: int +ERROR: int +FATAL: int + +class Log: + def __init__(self, threshold: int = ...) -> None: ... + def log(self, level: int, msg: Text, *args: Any) -> None: ... + def debug(self, msg: Text, *args: Any) -> None: ... + def info(self, msg: Text, *args: Any) -> None: ... + def warn(self, msg: Text, *args: Any) -> None: ... + def error(self, msg: Text, *args: Any) -> None: ... + def fatal(self, msg: Text, *args: Any) -> None: ... + +def log(level: int, msg: Text, *args: Any) -> None: ... +def debug(msg: Text, *args: Any) -> None: ... +def info(msg: Text, *args: Any) -> None: ... +def warn(msg: Text, *args: Any) -> None: ... +def error(msg: Text, *args: Any) -> None: ... +def fatal(msg: Text, *args: Any) -> None: ... +def set_threshold(level: int) -> int: ... +def set_verbosity(v: int) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/msvccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/msvccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/msvccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/msvccompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class MSVCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/spawn.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/spawn.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/spawn.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/spawn.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,4 @@ +from typing import List, Optional + +def spawn(cmd: List[str], search_path: bool = ..., verbose: bool = ..., dry_run: bool = ...) -> None: ... +def find_executable(executable: str, path: Optional[str] = ...) -> Optional[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/sysconfig.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/sysconfig.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/sysconfig.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/sysconfig.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,14 @@ +from distutils.ccompiler import CCompiler +from typing import Mapping, Optional, Union + +PREFIX: str +EXEC_PREFIX: str + +def get_config_var(name: str) -> Union[int, str, None]: ... +def get_config_vars(*args: str) -> Mapping[str, Union[int, str]]: ... +def get_config_h_filename() -> str: ... +def get_makefile_filename() -> str: ... +def get_python_inc(plat_specific: bool = ..., prefix: Optional[str] = ...) -> str: ... +def get_python_lib(plat_specific: bool = ..., standard_lib: bool = ..., prefix: Optional[str] = ...) -> str: ... +def customize_compiler(compiler: CCompiler) -> None: ... +def set_python_build() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/text_file.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/text_file.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/text_file.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/text_file.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import IO, List, Optional, Tuple, Union + +class TextFile: + def __init__( + self, + filename: Optional[str] = ..., + file: Optional[IO[str]] = ..., + *, + strip_comments: bool = ..., + lstrip_ws: bool = ..., + rstrip_ws: bool = ..., + skip_blanks: bool = ..., + join_lines: bool = ..., + collapse_join: bool = ..., + ) -> None: ... + def open(self, filename: str) -> None: ... + def close(self) -> None: ... + def warn(self, msg: str, line: Union[List[int], Tuple[int, int], int] = ...) -> None: ... + def readline(self) -> Optional[str]: ... + def readlines(self) -> List[str]: ... + def unreadline(self, line: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/unixccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/unixccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/unixccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/unixccompiler.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class UnixCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,23 @@ +from typing import Any, Callable, List, Mapping, Optional, Tuple + +def get_platform() -> str: ... +def convert_path(pathname: str) -> str: ... +def change_root(new_root: str, pathname: str) -> str: ... +def check_environ() -> None: ... +def subst_vars(s: str, local_vars: Mapping[str, str]) -> None: ... +def split_quoted(s: str) -> List[str]: ... +def execute( + func: Callable[..., None], args: Tuple[Any, ...], msg: Optional[str] = ..., verbose: bool = ..., dry_run: bool = ... +) -> None: ... +def strtobool(val: str) -> bool: ... +def byte_compile( + py_files: List[str], + optimize: int = ..., + force: bool = ..., + prefix: Optional[str] = ..., + base_dir: Optional[str] = ..., + verbose: bool = ..., + dry_run: bool = ..., + direct: Optional[bool] = ..., +) -> None: ... +def rfc822_escape(header: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/version.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/version.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/version.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/distutils/version.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,33 @@ +from abc import abstractmethod +from typing import Optional, Pattern, Text, Tuple, TypeVar, Union + +_T = TypeVar("_T", bound=Version) + +class Version: + def __repr__(self) -> str: ... + @abstractmethod + def __init__(self, vstring: Optional[Text] = ...) -> None: ... + @abstractmethod + def parse(self: _T, vstring: Text) -> _T: ... + @abstractmethod + def __str__(self) -> str: ... + @abstractmethod + def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... + +class StrictVersion(Version): + version_re: Pattern[str] + version: Tuple[int, int, int] + prerelease: Optional[Tuple[Text, int]] + def __init__(self, vstring: Optional[Text] = ...) -> None: ... + def parse(self: _T, vstring: Text) -> _T: ... + def __str__(self) -> str: ... + def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... + +class LooseVersion(Version): + component_re: Pattern[str] + vstring: Text + version: Tuple[Union[Text, int], ...] + def __init__(self, vstring: Optional[Text] = ...) -> None: ... + def parse(self: _T, vstring: Text) -> _T: ... + def __str__(self) -> str: ... + def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/base64mime.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/base64mime.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/base64mime.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/base64mime.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,11 @@ def base64_len(s: bytes) -> int: ... def header_encode(header, charset=..., keep_eols=..., maxlinelen=..., eol=...): ... def encode(s, binary=..., maxlinelen=..., eol=...): ... + body_encode = encode encodestring = encode + def decode(s, convert_eols=...): ... + body_decode = decode decodestring = decode diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/feedparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/feedparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/feedparser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/feedparser.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -11,7 +11,6 @@ def __iter__(self): ... def next(self): ... - class FeedParser: def __init__(self, _factory=...) -> None: ... def feed(self, data) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/generator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/generator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/generator.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/generator.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -4,6 +4,5 @@ def flatten(self, msg, unixfrom: bool = ...) -> None: ... def clone(self, fp): ... - class DecodedGenerator(Generator): def __init__(self, outfp, mangle_from_: bool = ..., maxheaderlen: int = ..., fmt=...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/header.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/header.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/header.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/header.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -2,8 +2,7 @@ def make_header(decoded_seq, maxlinelen=..., header_name=..., continuation_ws=...): ... class Header: - def __init__(self, s=..., charset=..., maxlinelen=..., header_name=..., continuation_ws=..., - errors=...) -> None: ... + def __init__(self, s=..., charset=..., maxlinelen=..., header_name=..., continuation_ws=..., errors=...) -> None: ... def __unicode__(self): ... def __eq__(self, other): ... def __ne__(self, other): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/application.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/application.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/application.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/application.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,9 @@ -# Stubs for email.mime.application - -from typing import Callable, Optional, Tuple, Union from email.mime.nonmultipart import MIMENonMultipart +from typing import Callable, Optional, Tuple, Union _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEApplication(MIMENonMultipart): - def __init__(self, _data: bytes, _subtype: str = ..., - _encoder: Callable[[MIMEApplication], None] = ..., - **_params: _ParamsType) -> None: ... + def __init__( + self, _data: bytes, _subtype: str = ..., _encoder: Callable[[MIMEApplication], None] = ..., **_params: _ParamsType + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/audio.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/audio.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/audio.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/audio.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,4 @@ from email.mime.nonmultipart import MIMENonMultipart - class MIMEAudio(MIMENonMultipart): def __init__(self, _audiodata, _subtype=..., _encoder=..., **_params) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/image.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/image.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/image.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/image.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,4 @@ from email.mime.nonmultipart import MIMENonMultipart - class MIMEImage(MIMENonMultipart): def __init__(self, _imagedata, _subtype=..., _encoder=..., **_params) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/message.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/message.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/message.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/mime/message.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,4 @@ from email.mime.nonmultipart import MIMENonMultipart - class MIMEMessage(MIMENonMultipart): def __init__(self, _msg, _subtype=...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/email/utils.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/email/utils.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,11 @@ -from email._parseaddr import AddressList as _AddressList -from email._parseaddr import mktime_tz as mktime_tz -from email._parseaddr import parsedate as _parsedate -from email._parseaddr import parsedate_tz as _parsedate_tz +from email._parseaddr import ( + AddressList as _AddressList, + mktime_tz as mktime_tz, + parsedate as _parsedate, + parsedate_tz as _parsedate_tz, +) from quopri import decodestring as _qdecode -from typing import Optional, Any +from typing import Any, Optional def formataddr(pair): ... def getaddresses(fieldvalues): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/exceptions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/exceptions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/exceptions.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/exceptions.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,48 +1,50 @@ -from __builtin__ import ArithmeticError as ArithmeticError -from __builtin__ import AssertionError as AssertionError -from __builtin__ import AttributeError as AttributeError -from __builtin__ import BaseException as BaseException -from __builtin__ import BufferError as BufferError -from __builtin__ import BytesWarning as BytesWarning -from __builtin__ import DeprecationWarning as DeprecationWarning -from __builtin__ import EOFError as EOFError -from __builtin__ import EnvironmentError as EnvironmentError -from __builtin__ import Exception as Exception -from __builtin__ import FloatingPointError as FloatingPointError -from __builtin__ import FutureWarning as FutureWarning -from __builtin__ import GeneratorExit as GeneratorExit -from __builtin__ import IOError as IOError -from __builtin__ import ImportError as ImportError -from __builtin__ import ImportWarning as ImportWarning -from __builtin__ import IndentationError as IndentationError -from __builtin__ import IndexError as IndexError -from __builtin__ import KeyError as KeyError -from __builtin__ import KeyboardInterrupt as KeyboardInterrupt -from __builtin__ import LookupError as LookupError -from __builtin__ import MemoryError as MemoryError -from __builtin__ import NameError as NameError -from __builtin__ import NotImplementedError as NotImplementedError -from __builtin__ import OSError as OSError -from __builtin__ import OverflowError as OverflowError -from __builtin__ import PendingDeprecationWarning as PendingDeprecationWarning -from __builtin__ import ReferenceError as ReferenceError -from __builtin__ import RuntimeError as RuntimeError -from __builtin__ import RuntimeWarning as RuntimeWarning -from __builtin__ import StandardError as StandardError -from __builtin__ import StopIteration as StopIteration -from __builtin__ import SyntaxError as SyntaxError -from __builtin__ import SyntaxWarning as SyntaxWarning -from __builtin__ import SystemError as SystemError -from __builtin__ import SystemExit as SystemExit -from __builtin__ import TabError as TabError -from __builtin__ import TypeError as TypeError -from __builtin__ import UnboundLocalError as UnboundLocalError -from __builtin__ import UnicodeError as UnicodeError -from __builtin__ import UnicodeDecodeError as UnicodeDecodeError -from __builtin__ import UnicodeEncodeError as UnicodeEncodeError -from __builtin__ import UnicodeTranslateError as UnicodeTranslateError -from __builtin__ import UnicodeWarning as UnicodeWarning -from __builtin__ import UserWarning as UserWarning -from __builtin__ import ValueError as ValueError -from __builtin__ import Warning as Warning -from __builtin__ import ZeroDivisionError as ZeroDivisionError +from __builtin__ import ( + ArithmeticError as ArithmeticError, + AssertionError as AssertionError, + AttributeError as AttributeError, + BaseException as BaseException, + BufferError as BufferError, + BytesWarning as BytesWarning, + DeprecationWarning as DeprecationWarning, + EnvironmentError as EnvironmentError, + EOFError as EOFError, + Exception as Exception, + FloatingPointError as FloatingPointError, + FutureWarning as FutureWarning, + GeneratorExit as GeneratorExit, + ImportError as ImportError, + ImportWarning as ImportWarning, + IndentationError as IndentationError, + IndexError as IndexError, + IOError as IOError, + KeyboardInterrupt as KeyboardInterrupt, + KeyError as KeyError, + LookupError as LookupError, + MemoryError as MemoryError, + NameError as NameError, + NotImplementedError as NotImplementedError, + OSError as OSError, + OverflowError as OverflowError, + PendingDeprecationWarning as PendingDeprecationWarning, + ReferenceError as ReferenceError, + RuntimeError as RuntimeError, + RuntimeWarning as RuntimeWarning, + StandardError as StandardError, + StopIteration as StopIteration, + SyntaxError as SyntaxError, + SyntaxWarning as SyntaxWarning, + SystemError as SystemError, + SystemExit as SystemExit, + TabError as TabError, + TypeError as TypeError, + UnboundLocalError as UnboundLocalError, + UnicodeDecodeError as UnicodeDecodeError, + UnicodeEncodeError as UnicodeEncodeError, + UnicodeError as UnicodeError, + UnicodeTranslateError as UnicodeTranslateError, + UnicodeWarning as UnicodeWarning, + UserWarning as UserWarning, + ValueError as ValueError, + Warning as Warning, + ZeroDivisionError as ZeroDivisionError, +) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/fcntl.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/fcntl.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/fcntl.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/fcntl.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Union from _typeshed import FileDescriptorLike +from typing import Any, Union FASYNC: int FD_CLOEXEC: int @@ -77,9 +77,6 @@ def fcntl(fd: FileDescriptorLike, op: int, arg: Union[int, bytes] = ...) -> Any: ... # TODO: arg: int or read-only buffer interface or read-write buffer interface -def ioctl(fd: FileDescriptorLike, op: int, arg: Union[int, bytes] = ..., - mutate_flag: bool = ...) -> Any: ... - +def ioctl(fd: FileDescriptorLike, op: int, arg: Union[int, bytes] = ..., mutate_flag: bool = ...) -> Any: ... def flock(fd: FileDescriptorLike, op: int) -> None: ... -def lockf(fd: FileDescriptorLike, op: int, length: int = ..., start: int = ..., - whence: int = ...) -> Any: ... +def lockf(fd: FileDescriptorLike, op: int, length: int = ..., start: int = ..., whence: int = ...) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/functools.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/functools.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/functools.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/functools.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,27 +1,24 @@ -# Stubs for functools (Python 2.7) - -# NOTE: These are incomplete! - from abc import ABCMeta, abstractmethod -from typing import Any, Callable, Generic, Dict, Iterable, Optional, Sequence, Tuple, Type, TypeVar, overload +from typing import Any, Callable, Dict, Generic, Iterable, Optional, Sequence, Tuple, Type, TypeVar, overload _AnyCallable = Callable[..., Any] _T = TypeVar("_T") _S = TypeVar("_S") @overload -def reduce(function: Callable[[_T, _T], _T], - sequence: Iterable[_T]) -> _T: ... +def reduce(function: Callable[[_T, _T], _T], sequence: Iterable[_T]) -> _T: ... @overload -def reduce(function: Callable[[_T, _S], _T], - sequence: Iterable[_S], initial: _T) -> _T: ... +def reduce(function: Callable[[_T, _S], _T], sequence: Iterable[_S], initial: _T) -> _T: ... WRAPPER_ASSIGNMENTS: Sequence[str] WRAPPER_UPDATES: Sequence[str] -def update_wrapper(wrapper: _AnyCallable, wrapped: _AnyCallable, assigned: Sequence[str] = ..., - updated: Sequence[str] = ...) -> _AnyCallable: ... -def wraps(wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ...) -> Callable[[_AnyCallable], _AnyCallable]: ... +def update_wrapper( + wrapper: _AnyCallable, wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ... +) -> _AnyCallable: ... +def wraps( + wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ... +) -> Callable[[_AnyCallable], _AnyCallable]: ... def total_ordering(cls: Type[_T]) -> Type[_T]: ... def cmp_to_key(mycmp: Callable[[_T, _T], int]) -> Callable[[_T], Any]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/gc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/gc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/gc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/gc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,5 @@ -# Stubs for gc - from typing import Any, List, Tuple - def enable() -> None: ... def disable() -> None: ... def isenabled() -> bool: ... @@ -10,8 +7,7 @@ def set_debug(flags: int) -> None: ... def get_debug() -> int: ... def get_objects() -> List[Any]: ... -def set_threshold(threshold0: int, threshold1: int = ..., - threshold2: int = ...) -> None: ... +def set_threshold(threshold0: int, threshold1: int = ..., threshold2: int = ...) -> None: ... def get_count() -> Tuple[int, int, int]: ... def get_threshold() -> Tuple[int, int, int]: ... def get_referrers(*objs: Any) -> List[Any]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/gettext.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/gettext.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/gettext.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/gettext.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any, Container, Dict, IO, List, Optional, Sequence, Type, Union +from typing import IO, Any, Container, Dict, List, Optional, Sequence, Type, Union def bindtextdomain(domain: str, localedir: str = ...) -> str: ... def bind_textdomain_codeset(domain: str, codeset: str = ...) -> str: ... @@ -32,10 +32,17 @@ LE_MAGIC: int BE_MAGIC: int -def find(domain: str, localedir: Optional[str] = ..., languages: Optional[Sequence[str]] = ..., - all: Any = ...) -> Optional[Union[str, List[str]]]: ... - -def translation(domain: str, localedir: Optional[str] = ..., languages: Optional[Sequence[str]] = ..., - class_: Optional[Type[NullTranslations]] = ..., fallback: bool = ..., codeset: Optional[str] = ...) -> NullTranslations: ... -def install(domain: str, localedir: Optional[str] = ..., unicode: bool = ..., codeset: Optional[str] = ..., - names: Container[str] = ...) -> None: ... +def find( + domain: str, localedir: Optional[str] = ..., languages: Optional[Sequence[str]] = ..., all: Any = ... +) -> Optional[Union[str, List[str]]]: ... +def translation( + domain: str, + localedir: Optional[str] = ..., + languages: Optional[Sequence[str]] = ..., + class_: Optional[Type[NullTranslations]] = ..., + fallback: bool = ..., + codeset: Optional[str] = ..., +) -> NullTranslations: ... +def install( + domain: str, localedir: Optional[str] = ..., unicode: bool = ..., codeset: Optional[str] = ..., names: Container[str] = ... +) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/hashlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/hashlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/hashlib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/hashlib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for hashlib (Python 2) - from typing import Tuple, Union _DataType = Union[str, unicode, bytearray, buffer, memoryview] @@ -16,7 +14,6 @@ def copy(self) -> _hash: ... def new(name: str, data: str = ...) -> _hash: ... - def md5(s: _DataType = ...) -> _hash: ... def sha1(s: _DataType = ...) -> _hash: ... def sha224(s: _DataType = ...) -> _hash: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/heapq.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/heapq.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/heapq.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/heapq.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,7 @@ -from typing import TypeVar, List, Iterable, Any, Callable, Optional, Protocol +from _typeshed import SupportsLessThan +from typing import Any, Callable, Iterable, List, Optional, Protocol, TypeVar -_T = TypeVar('_T') - -class _Sortable(Protocol): - def __lt__(self: _T, other: _T) -> bool: ... +_T = TypeVar("_T") def cmp_lt(x, y) -> bool: ... def heappush(heap: List[_T], item: _T) -> None: ... @@ -12,7 +10,6 @@ def heapify(x: List[_T]) -> None: ... def heapreplace(heap: List[_T], item: _T) -> _T: ... def merge(*iterables: Iterable[_T]) -> Iterable[_T]: ... -def nlargest(n: int, iterable: Iterable[_T], - key: Optional[Callable[[_T], _Sortable]] = ...) -> List[_T]: ... -def nsmallest(n: int, iterable: Iterable[_T], - key: Optional[Callable[[_T], _Sortable]] = ...) -> List[_T]: ... +def nlargest(n: int, iterable: Iterable[_T], key: Optional[Callable[[_T], SupportsLessThan]] = ...) -> List[_T]: ... +def nsmallest(n: int, iterable: Iterable[_T], key: Optional[Callable[[_T], SupportsLessThan]] = ...) -> List[_T]: ... +def _heapify_max(__x: List[_T]) -> None: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/inspect.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/inspect.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/inspect.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/inspect.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from types import CodeType, TracebackType, FrameType, FunctionType, MethodType, ModuleType -from typing import Any, Dict, Callable, List, NamedTuple, Optional, Sequence, Tuple, Type, Union, AnyStr +from types import CodeType, FrameType, FunctionType, MethodType, ModuleType, TracebackType +from typing import Any, AnyStr, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Type, Union # Types and members class EndOfBlock(Exception): ... @@ -10,8 +10,9 @@ started: bool passline: bool last: int - def tokeneater(self, type: int, token: AnyStr, srow_scol: Tuple[int, int], - erow_ecol: Tuple[int, int], line: AnyStr) -> None: ... + def tokeneater( + self, type: int, token: AnyStr, srow_scol: Tuple[int, int], erow_ecol: Tuple[int, int], line: AnyStr + ) -> None: ... CO_GENERATOR: int CO_NESTED: int @@ -28,13 +29,9 @@ mode: str module_type: int -def getmembers( - object: object, - predicate: Optional[Callable[[Any], bool]] = ... -) -> List[Tuple[str, Any]]: ... +def getmembers(object: object, predicate: Optional[Callable[[Any], bool]] = ...) -> List[Tuple[str, Any]]: ... def getmoduleinfo(path: Union[str, unicode]) -> Optional[ModuleInfo]: ... def getmodulename(path: AnyStr) -> Optional[AnyStr]: ... - def ismodule(object: object) -> bool: ... def isclass(object: object) -> bool: ... def ismethod(object: object) -> bool: ... @@ -91,12 +88,12 @@ def getargs(co: CodeType) -> Arguments: ... def getargspec(func: object) -> ArgSpec: ... def getargvalues(frame: FrameType) -> ArgInfo: ... -def formatargspec(args, varargs=..., varkw=..., defaults=..., - formatarg=..., formatvarargs=..., formatvarkw=..., formatvalue=..., - join=...) -> str: ... -def formatargvalues(args, varargs=..., varkw=..., defaults=..., - formatarg=..., formatvarargs=..., formatvarkw=..., formatvalue=..., - join=...) -> str: ... +def formatargspec( + args, varargs=..., varkw=..., defaults=..., formatarg=..., formatvarargs=..., formatvarkw=..., formatvalue=..., join=... +) -> str: ... +def formatargvalues( + args, varargs=..., varkw=..., defaults=..., formatarg=..., formatvarargs=..., formatvarkw=..., formatvalue=..., join=... +) -> str: ... def getmro(cls: type) -> Tuple[type, ...]: ... def getcallargs(func, *args, **kwds) -> Dict[str, Any]: ... @@ -115,7 +112,6 @@ def getframeinfo(frame: Union[FrameType, TracebackType], context: int = ...) -> Traceback: ... def getinnerframes(traceback: TracebackType, context: int = ...) -> List[_FrameInfo]: ... def getlineno(frame: FrameType) -> int: ... - def currentframe(depth: int = ...) -> FrameType: ... def stack(context: int = ...) -> List[_FrameInfo]: ... def trace(context: int = ...) -> List[_FrameInfo]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/_io.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/_io.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/_io.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/_io.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ -from typing import Any, AnyStr, BinaryIO, IO, Text, TextIO, Iterable, Iterator, List, Optional, Type, Tuple, TypeVar, Union from mmap import mmap from types import TracebackType +from typing import IO, Any, AnyStr, BinaryIO, Iterable, Iterator, List, Optional, Text, TextIO, Tuple, Type, TypeVar, Union _bytearray_like = Union[bytearray, mmap] @@ -32,7 +32,9 @@ def truncate(self, size: Optional[int] = ...) -> int: ... def writable(self) -> bool: ... def __enter__(self: _T) -> _T: ... - def __exit__(self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[Any]) -> Optional[bool]: ... + def __exit__( + self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[Any] + ) -> Optional[bool]: ... def __iter__(self: _T) -> _T: ... # The parameter type of writelines[s]() is determined by that of write(): def writelines(self, lines: Iterable[bytes]) -> None: ... @@ -53,8 +55,7 @@ def detach(self) -> _IOBase: ... class BufferedRWPair(_BufferedIOBase): - def __init__(self, reader: _RawIOBase, writer: _RawIOBase, - buffer_size: int = ..., max_buffer_size: int = ...) -> None: ... + def __init__(self, reader: _RawIOBase, writer: _RawIOBase, buffer_size: int = ..., max_buffer_size: int = ...) -> None: ... def peek(self, n: int = ...) -> bytes: ... def __enter__(self) -> BufferedRWPair: ... @@ -62,9 +63,7 @@ mode: str name: str raw: _IOBase - def __init__(self, raw: _IOBase, - buffer_size: int = ..., - max_buffer_size: int = ...) -> None: ... + def __init__(self, raw: _IOBase, buffer_size: int = ..., max_buffer_size: int = ...) -> None: ... def peek(self, n: int = ...) -> bytes: ... class BufferedReader(_BufferedIOBase): @@ -78,9 +77,7 @@ name: str raw: _IOBase mode: str - def __init__(self, raw: _IOBase, - buffer_size: int = ..., - max_buffer_size: int = ...) -> None: ... + def __init__(self, raw: _IOBase, buffer_size: int = ..., max_buffer_size: int = ...) -> None: ... class BytesIO(_BufferedIOBase): def __init__(self, initial_bytes: bytes = ...) -> None: ... @@ -115,7 +112,6 @@ def setstate(self, state: Tuple[Any, int]) -> None: ... def reset(self) -> None: ... - # Note: In the actual _io.py, _TextIOBase inherits from _IOBase. class _TextIOBase(TextIO): errors: Optional[str] @@ -146,14 +142,14 @@ def write(self, pbuf: unicode) -> int: ... def writelines(self, lines: Iterable[unicode]) -> None: ... def __enter__(self: _T) -> _T: ... - def __exit__(self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[Any]) -> Optional[bool]: ... + def __exit__( + self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[Any] + ) -> Optional[bool]: ... def __iter__(self: _T) -> _T: ... class StringIO(_TextIOBase): line_buffering: bool - def __init__(self, - initial_value: Optional[unicode] = ..., - newline: Optional[unicode] = ...) -> None: ... + def __init__(self, initial_value: Optional[unicode] = ..., newline: Optional[unicode] = ...) -> None: ... def __setstate__(self, state: Tuple[Any, ...]) -> None: ... def __getstate__(self) -> Tuple[Any, ...]: ... # StringIO does not contain a "name" field. This workaround is necessary @@ -177,10 +173,12 @@ write_through: bool = ..., ) -> None: ... -def open(file: Union[str, unicode, int], - mode: Text = ..., - buffering: int = ..., - encoding: Optional[Text] = ..., - errors: Optional[Text] = ..., - newline: Optional[Text] = ..., - closefd: bool = ...) -> IO[Any]: ... +def open( + file: Union[str, unicode, int], + mode: Text = ..., + buffering: int = ..., + encoding: Optional[Text] = ..., + errors: Optional[Text] = ..., + newline: Optional[Text] = ..., + closefd: bool = ..., +) -> IO[Any]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/io.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/io.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/io.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/io.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,40 +1,38 @@ -# Stubs for io - -# Based on https://docs.python.org/2/library/io.html - -# Only a subset of functionality is included. - from typing import IO, Any, Union -import _io - -from _io import BlockingIOError as BlockingIOError -from _io import BufferedRWPair as BufferedRWPair -from _io import BufferedRandom as BufferedRandom -from _io import BufferedReader as BufferedReader -from _io import BufferedWriter as BufferedWriter -from _io import BytesIO as BytesIO -from _io import DEFAULT_BUFFER_SIZE as DEFAULT_BUFFER_SIZE -from _io import FileIO as FileIO -from _io import IncrementalNewlineDecoder as IncrementalNewlineDecoder -from _io import StringIO as StringIO -from _io import TextIOWrapper as TextIOWrapper -from _io import UnsupportedOperation as UnsupportedOperation -from _io import open as open -def _OpenWrapper(file: Union[str, unicode, int], - mode: unicode = ..., buffering: int = ..., encoding: unicode = ..., - errors: unicode = ..., newline: unicode = ..., - closefd: bool = ...) -> IO[Any]: ... +import _io +from _io import ( + DEFAULT_BUFFER_SIZE as DEFAULT_BUFFER_SIZE, + BlockingIOError as BlockingIOError, + BufferedRandom as BufferedRandom, + BufferedReader as BufferedReader, + BufferedRWPair as BufferedRWPair, + BufferedWriter as BufferedWriter, + BytesIO as BytesIO, + FileIO as FileIO, + IncrementalNewlineDecoder as IncrementalNewlineDecoder, + StringIO as StringIO, + TextIOWrapper as TextIOWrapper, + UnsupportedOperation as UnsupportedOperation, + open as open, +) + +def _OpenWrapper( + file: Union[str, unicode, int], + mode: unicode = ..., + buffering: int = ..., + encoding: unicode = ..., + errors: unicode = ..., + newline: unicode = ..., + closefd: bool = ..., +) -> IO[Any]: ... SEEK_SET: int SEEK_CUR: int SEEK_END: int - class IOBase(_io._IOBase): ... - class RawIOBase(_io._RawIOBase, IOBase): ... - class BufferedIOBase(_io._BufferedIOBase, IOBase): ... # Note: In the actual io.py, TextIOBase subclasses IOBase. diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/itertools.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/itertools.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/itertools.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/itertools.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,15 +1,9 @@ -# Stubs for itertools +from typing import Any, Callable, Generic, Iterable, Iterator, Optional, Sequence, Tuple, TypeVar, Union, overload -# Based on https://docs.python.org/2/library/itertools.html +_T = TypeVar("_T") +_S = TypeVar("_S") -from typing import (Iterator, TypeVar, Iterable, overload, Any, Callable, Tuple, - Union, Sequence, Generic, Optional) - -_T = TypeVar('_T') -_S = TypeVar('_S') - -def count(start: int = ..., - step: int = ...) -> Iterator[int]: ... # more general types? +def count(start: int = ..., step: int = ...) -> Iterator[int]: ... # more general types? class cycle(Iterator[_T], Generic[_T]): def __init__(self, iterable: Iterable[_T]) -> None: ... @@ -26,142 +20,145 @@ def from_iterable(iterable: Iterable[Iterable[_S]]) -> Iterator[_S]: ... def compress(data: Iterable[_T], selectors: Iterable[Any]) -> Iterator[_T]: ... -def dropwhile(predicate: Callable[[_T], Any], - iterable: Iterable[_T]) -> Iterator[_T]: ... -def ifilter(predicate: Optional[Callable[[_T], Any]], - iterable: Iterable[_T]) -> Iterator[_T]: ... -def ifilterfalse(predicate: Optional[Callable[[_T], Any]], - iterable: Iterable[_T]) -> Iterator[_T]: ... - +def dropwhile(predicate: Callable[[_T], Any], iterable: Iterable[_T]) -> Iterator[_T]: ... +def ifilter(predicate: Optional[Callable[[_T], Any]], iterable: Iterable[_T]) -> Iterator[_T]: ... +def ifilterfalse(predicate: Optional[Callable[[_T], Any]], iterable: Iterable[_T]) -> Iterator[_T]: ... @overload def groupby(iterable: Iterable[_T], key: None = ...) -> Iterator[Tuple[_T, Iterator[_T]]]: ... @overload def groupby(iterable: Iterable[_T], key: Callable[[_T], _S]) -> Iterator[Tuple[_S, Iterator[_T]]]: ... - @overload def islice(iterable: Iterable[_T], stop: Optional[int]) -> Iterator[_T]: ... @overload -def islice(iterable: Iterable[_T], start: Optional[int], stop: Optional[int], - step: Optional[int] = ...) -> Iterator[_T]: ... - -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') -_T6 = TypeVar('_T6') +def islice(iterable: Iterable[_T], start: Optional[int], stop: Optional[int], step: Optional[int] = ...) -> Iterator[_T]: ... +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") +_T6 = TypeVar("_T6") @overload def imap(func: Callable[[_T1], _S], iter1: Iterable[_T1]) -> Iterator[_S]: ... @overload -def imap(func: Callable[[_T1, _T2], _S], - iter1: Iterable[_T1], - iter2: Iterable[_T2]) -> Iterator[_S]: ... +def imap(func: Callable[[_T1, _T2], _S], iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[_S]: ... @overload -def imap(func: Callable[[_T1, _T2, _T3], _S], - iter1: Iterable[_T1], iter2: Iterable[_T2], - iter3: Iterable[_T3]) -> Iterator[_S]: ... - -@overload -def imap(func: Callable[[_T1, _T2, _T3, _T4], _S], - iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], - iter4: Iterable[_T4]) -> Iterator[_S]: ... - -@overload -def imap(func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], - iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], - iter4: Iterable[_T4], iter5: Iterable[_T5]) -> Iterator[_S]: ... - -@overload -def imap(func: Callable[[_T1, _T2, _T3, _T4, _T5, _T6], _S], - iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], - iter4: Iterable[_T4], iter5: Iterable[_T5], - iter6: Iterable[_T6]) -> Iterator[_S]: ... - -@overload -def imap(func: Callable[..., _S], - iter1: Iterable[Any], iter2: Iterable[Any], iter3: Iterable[Any], - iter4: Iterable[Any], iter5: Iterable[Any], iter6: Iterable[Any], - iter7: Iterable[Any], *iterables: Iterable[Any]) -> Iterator[_S]: ... - +def imap( + func: Callable[[_T1, _T2, _T3], _S], iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3] +) -> Iterator[_S]: ... +@overload +def imap( + func: Callable[[_T1, _T2, _T3, _T4], _S], + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], +) -> Iterator[_S]: ... +@overload +def imap( + func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], + iter5: Iterable[_T5], +) -> Iterator[_S]: ... +@overload +def imap( + func: Callable[[_T1, _T2, _T3, _T4, _T5, _T6], _S], + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], + iter5: Iterable[_T5], + iter6: Iterable[_T6], +) -> Iterator[_S]: ... +@overload +def imap( + func: Callable[..., _S], + iter1: Iterable[Any], + iter2: Iterable[Any], + iter3: Iterable[Any], + iter4: Iterable[Any], + iter5: Iterable[Any], + iter6: Iterable[Any], + iter7: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[_S]: ... def starmap(func: Any, iterable: Iterable[Any]) -> Iterator[Any]: ... -def takewhile(predicate: Callable[[_T], Any], - iterable: Iterable[_T]) -> Iterator[_T]: ... +def takewhile(predicate: Callable[[_T], Any], iterable: Iterable[_T]) -> Iterator[_T]: ... def tee(iterable: Iterable[_T], n: int = ...) -> Tuple[Iterator[_T], ...]: ... - @overload def izip(iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ... @overload -def izip(iter1: Iterable[_T1], - iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... +def izip(iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... @overload -def izip(iter1: Iterable[_T1], iter2: Iterable[_T2], - iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... +def izip(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... @overload -def izip(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], - iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2, - _T3, _T4]]: ... -@overload -def izip(iter1: Iterable[_T1], iter2: Iterable[_T2], - iter3: Iterable[_T3], iter4: Iterable[_T4], - iter5: Iterable[_T5]) -> Iterator[Tuple[_T1, _T2, - _T3, _T4, _T5]]: ... -@overload -def izip(iter1: Iterable[_T1], iter2: Iterable[_T2], - iter3: Iterable[_T3], iter4: Iterable[_T4], - iter5: Iterable[_T5], iter6: Iterable[_T6]) -> Iterator[Tuple[_T1, _T2, _T3, - _T4, _T5, _T6]]: ... -@overload -def izip(iter1: Iterable[Any], iter2: Iterable[Any], - iter3: Iterable[Any], iter4: Iterable[Any], - iter5: Iterable[Any], iter6: Iterable[Any], - iter7: Iterable[Any], *iterables: Iterable[Any]) -> Iterator[Tuple[Any, ...]]: ... - -def izip_longest(*p: Iterable[Any], - fillvalue: Any = ...) -> Iterator[Any]: ... - +def izip( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def izip( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4], iter5: Iterable[_T5] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def izip( + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], + iter5: Iterable[_T5], + iter6: Iterable[_T6], +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ... +@overload +def izip( + iter1: Iterable[Any], + iter2: Iterable[Any], + iter3: Iterable[Any], + iter4: Iterable[Any], + iter5: Iterable[Any], + iter6: Iterable[Any], + iter7: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[Tuple[Any, ...]]: ... +def izip_longest(*p: Iterable[Any], fillvalue: Any = ...) -> Iterator[Any]: ... @overload def product(iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ... @overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... +def product(iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... @overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4], - iter5: Iterable[_T5]) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4], - iter5: Iterable[_T5], - iter6: Iterable[_T6]) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ... -@overload -def product(iter1: Iterable[Any], - iter2: Iterable[Any], - iter3: Iterable[Any], - iter4: Iterable[Any], - iter5: Iterable[Any], - iter6: Iterable[Any], - iter7: Iterable[Any], - *iterables: Iterable[Any]) -> Iterator[Tuple[Any, ...]]: ... +def product(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... +@overload +def product( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def product( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4], iter5: Iterable[_T5] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def product( + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], + iter5: Iterable[_T5], + iter6: Iterable[_T6], +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ... +@overload +def product( + iter1: Iterable[Any], + iter2: Iterable[Any], + iter3: Iterable[Any], + iter4: Iterable[Any], + iter5: Iterable[Any], + iter6: Iterable[Any], + iter7: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[Tuple[Any, ...]]: ... @overload def product(*iterables: Iterable[Any], repeat: int) -> Iterator[Tuple[Any, ...]]: ... - -def permutations(iterable: Iterable[_T], - r: int = ...) -> Iterator[Sequence[_T]]: ... -def combinations(iterable: Iterable[_T], - r: int) -> Iterator[Sequence[_T]]: ... -def combinations_with_replacement(iterable: Iterable[_T], - r: int) -> Iterator[Sequence[_T]]: ... +def permutations(iterable: Iterable[_T], r: int = ...) -> Iterator[Sequence[_T]]: ... +def combinations(iterable: Iterable[_T], r: int) -> Iterator[Sequence[_T]]: ... +def combinations_with_replacement(iterable: Iterable[_T], r: int) -> Iterator[Sequence[_T]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/json.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/json.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/json.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/json.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union, Text, Type from _typeshed import SupportsRead +from typing import IO, Any, Callable, Dict, List, Optional, Text, Tuple, Type, Union class JSONDecodeError(ValueError): def dumps(self, obj: Any) -> str: ... @@ -7,62 +7,69 @@ def loads(self, s: str) -> Any: ... def load(self, fp: IO[str]) -> Any: ... -def dumps(obj: Any, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - cls: Optional[Type[JSONEncoder]] = ..., - indent: Optional[int] = ..., - separators: Optional[Tuple[str, str]] = ..., - encoding: str = ..., - default: Optional[Callable[[Any], Any]] = ..., - sort_keys: bool = ..., - **kwds: Any) -> str: ... - -def dump(obj: Any, - fp: Union[IO[str], IO[Text]], - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - cls: Optional[Type[JSONEncoder]] = ..., - indent: Optional[int] = ..., - separators: Optional[Tuple[str, str]] = ..., - encoding: str = ..., - default: Optional[Callable[[Any], Any]] = ..., - sort_keys: bool = ..., - **kwds: Any) -> None: ... - -def loads(s: Union[Text, bytes], - encoding: Any = ..., - cls: Optional[Type[JSONDecoder]] = ..., - object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., - **kwds: Any) -> Any: ... - -def load(fp: SupportsRead[Union[Text, bytes]], - encoding: Optional[str] = ..., - cls: Optional[Type[JSONDecoder]] = ..., - object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., - **kwds: Any) -> Any: ... +def dumps( + obj: Any, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Optional[Type[JSONEncoder]] = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + encoding: str = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any, +) -> str: ... +def dump( + obj: Any, + fp: Union[IO[str], IO[Text]], + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Optional[Type[JSONEncoder]] = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + encoding: str = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any, +) -> None: ... +def loads( + s: Union[Text, bytes], + encoding: Any = ..., + cls: Optional[Type[JSONDecoder]] = ..., + object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., + parse_float: Optional[Callable[[str], Any]] = ..., + parse_int: Optional[Callable[[str], Any]] = ..., + parse_constant: Optional[Callable[[str], Any]] = ..., + object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., + **kwds: Any, +) -> Any: ... +def load( + fp: SupportsRead[Union[Text, bytes]], + encoding: Optional[str] = ..., + cls: Optional[Type[JSONDecoder]] = ..., + object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., + parse_float: Optional[Callable[[str], Any]] = ..., + parse_int: Optional[Callable[[str], Any]] = ..., + parse_constant: Optional[Callable[[str], Any]] = ..., + object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., + **kwds: Any, +) -> Any: ... class JSONDecoder(object): - def __init__(self, - encoding: Union[Text, bytes] = ..., - object_hook: Callable[..., Any] = ..., - parse_float: Callable[[str], float] = ..., - parse_int: Callable[[str], int] = ..., - parse_constant: Callable[[str], Any] = ..., - strict: bool = ..., - object_pairs_hook: Callable[..., Any] = ...) -> None: ... + def __init__( + self, + encoding: Union[Text, bytes] = ..., + object_hook: Callable[..., Any] = ..., + parse_float: Callable[[str], float] = ..., + parse_int: Callable[[str], int] = ..., + parse_constant: Callable[[str], Any] = ..., + strict: bool = ..., + object_pairs_hook: Callable[..., Any] = ..., + ) -> None: ... def decode(self, s: Union[Text, bytes], _w: Any = ...) -> Any: ... def raw_decode(self, s: Union[Text, bytes], idx: int = ...) -> Tuple[Any, Any]: ... @@ -75,20 +82,18 @@ allow_nan: bool sort_keys: bool indent: Optional[int] - - def __init__(self, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - sort_keys: bool = ..., - indent: Optional[int] = ..., - separators: Tuple[Union[Text, bytes], Union[Text, bytes]] = ..., - encoding: Union[Text, bytes] = ..., - default: Callable[..., Any] = ...) -> None: ... - + def __init__( + self, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + sort_keys: bool = ..., + indent: Optional[int] = ..., + separators: Tuple[Union[Text, bytes], Union[Text, bytes]] = ..., + encoding: Union[Text, bytes] = ..., + default: Callable[..., Any] = ..., + ) -> None: ... def default(self, o: Any) -> Any: ... - def encode(self, o: Any) -> str: ... - def iterencode(self, o: Any, _one_shot: bool = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/connection.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/connection.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/connection.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/connection.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -21,6 +21,5 @@ def accept(self) -> Connection: ... def close(self) -> None: ... - def Client(address) -> Connection: ... def Pipe(duplex=...) -> Tuple[Connection, Connection]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/dummy/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,17 +1,13 @@ -from typing import Any, Optional, List, Type - -import threading -import sys -import weakref import array import itertools - +import sys +import threading +import weakref from multiprocessing import TimeoutError, cpu_count from multiprocessing.dummy.connection import Pipe -from threading import Lock, RLock, Semaphore, BoundedSemaphore -from threading import Event from Queue import Queue - +from threading import BoundedSemaphore, Event, Lock, RLock, Semaphore +from typing import Any, List, Optional, Type class DummyProcess(threading.Thread): _children: weakref.WeakKeyDictionary[Any, Any] @@ -22,7 +18,6 @@ @property def exitcode(self) -> Optional[int]: ... - Process = DummyProcess # This should be threading._Condition but threading.pyi exports it as Condition diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,15 @@ -from typing import Any, Callable, Optional, TypeVar, Iterable - from multiprocessing import pool -from multiprocessing.process import Process as Process, current_process as current_process, active_children as active_children +from multiprocessing.process import Process as Process, active_children as active_children, current_process as current_process from multiprocessing.util import SUBDEBUG as SUBDEBUG, SUBWARNING as SUBWARNING from Queue import Queue as _BaseQueue +from typing import Any, Callable, Iterable, Optional, TypeVar class ProcessError(Exception): ... class BufferTooShort(ProcessError): ... class TimeoutError(ProcessError): ... class AuthenticationError(ProcessError): ... -_T = TypeVar('_T') +_T = TypeVar("_T") class Queue(_BaseQueue[_T]): def __init__(self, maxsize: int = ...) -> None: ... @@ -43,8 +42,9 @@ def RawArray(typecode_or_type, size_or_initializer): ... def Value(typecode_or_type, *args, **kwds): ... def Array(typecode_or_type, size_or_initializer, **kwds): ... - -def Pool(processes: Optional[int] = ..., - initializer: Optional[Callable[..., Any]] = ..., - initargs: Iterable[Any] = ..., - maxtasksperchild: Optional[int] = ...) -> pool.Pool: ... +def Pool( + processes: Optional[int] = ..., + initializer: Optional[Callable[..., Any]] = ..., + initargs: Iterable[Any] = ..., + maxtasksperchild: Optional[int] = ..., +) -> pool.Pool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/pool.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/pool.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/pool.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/pool.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,8 @@ from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, TypeVar -_T = TypeVar('_T', bound=Pool) +_T = TypeVar("_T", bound=Pool) -class AsyncResult(): +class AsyncResult: def get(self, timeout: Optional[float] = ...) -> Any: ... def wait(self, timeout: Optional[float] = ...) -> None: ... def ready(self) -> bool: ... @@ -15,40 +15,38 @@ class IMapUnorderedIterator(IMapIterator): ... class Pool(object): - def __init__(self, processes: Optional[int] = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Iterable[Any] = ..., - maxtasksperchild: Optional[int] = ...) -> None: ... - def apply(self, - func: Callable[..., Any], - args: Iterable[Any] = ..., - kwds: Dict[str, Any] = ...) -> Any: ... - def apply_async(self, - func: Callable[..., Any], - args: Iterable[Any] = ..., - kwds: Dict[str, Any] = ..., - callback: Optional[Callable[..., None]] = ...) -> AsyncResult: ... - def map(self, - func: Callable[..., Any], - iterable: Iterable[Any] = ..., - chunksize: Optional[int] = ...) -> List[Any]: ... - def map_async(self, func: Callable[..., Any], - iterable: Iterable[Any] = ..., - chunksize: Optional[int] = ..., - callback: Optional[Callable[..., None]] = ...) -> AsyncResult: ... - def imap(self, - func: Callable[..., Any], - iterable: Iterable[Any] = ..., - chunksize: Optional[int] = ...) -> IMapIterator: ... - def imap_unordered(self, - func: Callable[..., Any], - iterable: Iterable[Any] = ..., - chunksize: Optional[int] = ...) -> IMapIterator: ... + def __init__( + self, + processes: Optional[int] = ..., + initializer: Optional[Callable[..., None]] = ..., + initargs: Iterable[Any] = ..., + maxtasksperchild: Optional[int] = ..., + ) -> None: ... + def apply(self, func: Callable[..., Any], args: Iterable[Any] = ..., kwds: Dict[str, Any] = ...) -> Any: ... + def apply_async( + self, + func: Callable[..., Any], + args: Iterable[Any] = ..., + kwds: Dict[str, Any] = ..., + callback: Optional[Callable[..., None]] = ..., + ) -> AsyncResult: ... + def map(self, func: Callable[..., Any], iterable: Iterable[Any] = ..., chunksize: Optional[int] = ...) -> List[Any]: ... + def map_async( + self, + func: Callable[..., Any], + iterable: Iterable[Any] = ..., + chunksize: Optional[int] = ..., + callback: Optional[Callable[..., None]] = ..., + ) -> AsyncResult: ... + def imap(self, func: Callable[..., Any], iterable: Iterable[Any] = ..., chunksize: Optional[int] = ...) -> IMapIterator: ... + def imap_unordered( + self, func: Callable[..., Any], iterable: Iterable[Any] = ..., chunksize: Optional[int] = ... + ) -> IMapIterator: ... def close(self) -> None: ... def terminate(self) -> None: ... def join(self) -> None: ... class ThreadPool(Pool): - def __init__(self, processes: Optional[int] = ..., - initializer: Optional[Callable[..., Any]] = ..., - initargs: Iterable[Any] = ...) -> None: ... + def __init__( + self, processes: Optional[int] = ..., initializer: Optional[Callable[..., Any]] = ..., initargs: Iterable[Any] = ... + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/process.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/process.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/process.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/process.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -4,8 +4,9 @@ def active_children(): ... class Process: - def __init__(self, group: Optional[Any] = ..., target: Optional[Any] = ..., name: Optional[Any] = ..., args=..., - kwargs=...): ... + def __init__( + self, group: Optional[Any] = ..., target: Optional[Any] = ..., name: Optional[Any] = ..., args=..., kwargs=... + ): ... def run(self): ... def start(self): ... def terminate(self): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/multiprocessing/util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Optional import threading +from typing import Any, Optional SUBDEBUG: Any SUBWARNING: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ntpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ntpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/ntpath.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/ntpath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,85 @@ +import os +import sys +from _typeshed import AnyPath, BytesPath, StrPath +from genericpath import exists as exists +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Text, Tuple, TypeVar, overload + +_T = TypeVar("_T") + +# ----- os.path variables ----- +supports_unicode_filenames: bool +# aliases (also in os) +curdir: str +pardir: str +sep: str +if sys.platform == "win32": + altsep: str +else: + altsep: Optional[str] +extsep: str +pathsep: str +defpath: str +devnull: str + +# ----- os.path function stubs ----- +def abspath(path: AnyStr) -> AnyStr: ... +def basename(p: AnyStr) -> AnyStr: ... +def dirname(p: AnyStr) -> AnyStr: ... +def expanduser(path: AnyStr) -> AnyStr: ... +def expandvars(path: AnyStr) -> AnyStr: ... +def normcase(s: AnyStr) -> AnyStr: ... +def normpath(path: AnyStr) -> AnyStr: ... + +if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... + +else: + def realpath(filename: AnyStr) -> AnyStr: ... + +# NOTE: Empty lists results in '' (str) regardless of contained type. +# Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes +# So, fall back to Any +def commonprefix(m: Sequence[AnyPath]) -> Any: ... +def lexists(path: AnyPath) -> bool: ... + +# These return float if os.stat_float_times() == True, +# but int is a subclass of float. +def getatime(filename: AnyPath) -> float: ... +def getmtime(filename: AnyPath) -> float: ... +def getctime(filename: AnyPath) -> float: ... +def getsize(filename: AnyPath) -> int: ... +def isabs(s: AnyPath) -> bool: ... +def isfile(path: AnyPath) -> bool: ... +def isdir(s: AnyPath) -> bool: ... +def islink(path: AnyPath) -> bool: ... +def ismount(path: AnyPath) -> bool: ... + +# Make sure signatures are disjunct, and allow combinations of bytes and unicode. +# (Since Python 2 allows that, too) +# Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in +# a type error. +@overload +def join(__p1: bytes, *p: bytes) -> bytes: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: Text, *p: AnyPath) -> Text: ... +@overload +def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... +@overload +def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... +def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... +def sameopenfile(fp1: int, fp2: int) -> bool: ... +def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... +def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +if sys.platform == "win32": + def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated + +def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,31 @@ -from builtins import OSError as error +import sys +from _typeshed import AnyPath, FileDescriptorLike +from builtins import OSError from io import TextIOWrapper as _TextIOWrapper from posix import listdir as listdir, stat_result as stat_result # TODO: use this, see https://github.com/python/mypy/issues/3078 -import sys from typing import ( - Mapping, MutableMapping, Dict, List, Any, Tuple, Iterator, overload, Union, AnyStr, - Optional, Generic, Set, Callable, Text, Sequence, IO, NamedTuple, NoReturn, TypeVar + IO, + Any, + AnyStr, + Callable, + Dict, + Generic, + Iterator, + List, + Mapping, + MutableMapping, + NamedTuple, + NoReturn, + Optional, + Sequence, + Set, + Text, + Tuple, + TypeVar, + Union, + overload, ) -from _typeshed import AnyPath + from . import path as path # We need to use something from path, or flake8 and pytype get unhappy @@ -16,6 +35,8 @@ # ----- os variables ----- +error = OSError + if sys.version_info >= (3, 2): supports_bytes_environ: bool @@ -39,32 +60,32 @@ # We don't use sys.platform for O_* flags to denote platform-dependent APIs because some codes, # including tests for mypy, use a more finer way than sys.platform before using these APIs # See https://github.com/python/typeshed/pull/2286 for discussions -O_DSYNC: int # Unix only -O_RSYNC: int # Unix only -O_SYNC: int # Unix only -O_NDELAY: int # Unix only +O_DSYNC: int # Unix only +O_RSYNC: int # Unix only +O_SYNC: int # Unix only +O_NDELAY: int # Unix only O_NONBLOCK: int # Unix only -O_NOCTTY: int # Unix only -O_SHLOCK: int # Unix only -O_EXLOCK: int # Unix only -O_BINARY: int # Windows only +O_NOCTTY: int # Unix only +O_SHLOCK: int # Unix only +O_EXLOCK: int # Unix only +O_BINARY: int # Windows only O_NOINHERIT: int # Windows only O_SHORT_LIVED: int # Windows only O_TEMPORARY: int # Windows only -O_RANDOM: int # Windows only +O_RANDOM: int # Windows only O_SEQUENTIAL: int # Windows only -O_TEXT: int # Windows only -O_ASYNC: int # Gnu extension if in C library -O_DIRECT: int # Gnu extension if in C library +O_TEXT: int # Windows only +O_ASYNC: int # Gnu extension if in C library +O_DIRECT: int # Gnu extension if in C library O_DIRECTORY: int # Gnu extension if in C library -O_NOFOLLOW: int # Gnu extension if in C library -O_NOATIME: int # Gnu extension if in C library +O_NOFOLLOW: int # Gnu extension if in C library +O_NOATIME: int # Gnu extension if in C library O_LARGEFILE: int # Gnu extension if in C library curdir: str pardir: str sep: str -if sys.platform == 'win32': +if sys.platform == "win32": altsep: str else: altsep: Optional[str] @@ -92,7 +113,7 @@ if sys.version_info >= (3, 2): environb: _Environ[bytes] -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only confstr_names: Dict[str, int] pathconf_names: Dict[str, int] @@ -119,12 +140,12 @@ P_NOWAIT: int P_NOWAITO: int P_WAIT: int -if sys.platform == 'win32': +if sys.platform == "win32": P_DETACH: int P_OVERLAY: int # wait()/waitpid() options -if sys.platform != 'win32': +if sys.platform != "win32": WNOHANG: int # Unix only WCONTINUED: int # some Unix systems WUNTRACED: int # Unix only @@ -133,7 +154,9 @@ # ----- os classes (structures) ----- if sys.version_info >= (3, 6): - from builtins import _PathLike as PathLike # See comment in builtins + from builtins import _PathLike + + PathLike = _PathLike # See comment in builtins class _StatVFS(NamedTuple): f_bsize: int @@ -153,7 +176,7 @@ def strerror(code: int) -> str: ... def umask(mask: int) -> int: ... -if sys.platform != 'win32': +if sys.platform != "win32": def ctermid() -> str: ... def getegid() -> int: ... def geteuid() -> int: ... @@ -186,14 +209,13 @@ def getenv(key: Text, default: _T) -> Union[str, _T]: ... def putenv(key: Union[bytes, Text], value: Union[bytes, Text]) -> None: ... def unsetenv(key: Union[bytes, Text]) -> None: ... - def fdopen(fd: int, *args, **kwargs) -> IO[Any]: ... def close(fd: int) -> None: ... def closerange(fd_low: int, fd_high: int) -> None: ... def dup(fd: int) -> int: ... def dup2(fd: int, fd2: int) -> None: ... def fstat(fd: int) -> Any: ... -def fsync(fd: int) -> None: ... +def fsync(fd: FileDescriptorLike) -> None: ... def lseek(fd: int, pos: int, how: int) -> int: ... def open(file: AnyPath, flags: int, mode: int = ...) -> int: ... def pipe() -> Tuple[int, int]: ... @@ -201,7 +223,7 @@ def write(fd: int, string: Union[bytes, buffer]) -> int: ... def access(path: AnyPath, mode: int) -> bool: ... def chdir(path: AnyPath) -> None: ... -def fchdir(fd: int) -> None: ... +def fchdir(fd: FileDescriptorLike) -> None: ... def getcwd() -> str: ... def getcwdu() -> unicode: ... def chmod(path: AnyPath, mode: int) -> None: ... @@ -226,18 +248,20 @@ def stat_float_times(newvalue: bool) -> None: ... def symlink(source: AnyPath, link_name: AnyPath) -> None: ... def unlink(path: AnyPath) -> None: ... + # TODO: add ns, dir_fd, follow_symlinks argument if sys.version_info >= (3, 0): def utime(path: AnyPath, times: Optional[Tuple[float, float]] = ...) -> None: ... + else: def utime(path: AnyPath, times: Optional[Tuple[float, float]]) -> None: ... -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only def fchmod(fd: int, mode: int) -> None: ... def fchown(fd: int, uid: int, gid: int) -> None: ... - if sys.platform != 'darwin': - def fdatasync(fd: int) -> None: ... # Unix only, not Mac + if sys.platform != "darwin": + def fdatasync(fd: FileDescriptorLike) -> None: ... # Unix only, not Mac def fpathconf(fd: int, name: Union[str, int]) -> int: ... def fstatvfs(fd: int) -> _StatVFS: ... def ftruncate(fd: int, length: int) -> None: ... @@ -257,16 +281,20 @@ def statvfs(path: AnyPath) -> _StatVFS: ... if sys.version_info >= (3, 6): - def walk(top: Union[AnyStr, PathLike[AnyStr]], topdown: bool = ..., - onerror: Optional[Callable[[OSError], Any]] = ..., - followlinks: bool = ...) -> Iterator[Tuple[AnyStr, List[AnyStr], - List[AnyStr]]]: ... + def walk( + top: Union[AnyStr, PathLike[AnyStr]], + topdown: bool = ..., + onerror: Optional[Callable[[OSError], Any]] = ..., + followlinks: bool = ..., + ) -> Iterator[Tuple[AnyStr, List[AnyStr], List[AnyStr]]]: ... + else: - def walk(top: AnyStr, topdown: bool = ..., onerror: Optional[Callable[[OSError], Any]] = ..., - followlinks: bool = ...) -> Iterator[Tuple[AnyStr, List[AnyStr], - List[AnyStr]]]: ... + def walk( + top: AnyStr, topdown: bool = ..., onerror: Optional[Callable[[OSError], Any]] = ..., followlinks: bool = ... + ) -> Iterator[Tuple[AnyStr, List[AnyStr], List[AnyStr]]]: ... def abort() -> NoReturn: ... + # These are defined as execl(file, *args) but the first *arg is mandatory. def execl(file: AnyPath, __arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> NoReturn: ... def execlp(file: AnyPath, __arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> NoReturn: ... @@ -278,15 +306,15 @@ # The docs say `args: tuple or list of strings` # The implementation enforces tuple or list so we can't use Sequence. _ExecVArgs = Union[Tuple[Union[bytes, Text], ...], List[bytes], List[Text], List[Union[bytes, Text]]] + def execv(path: AnyPath, args: _ExecVArgs) -> NoReturn: ... def execve(path: AnyPath, args: _ExecVArgs, env: Mapping[str, str]) -> NoReturn: ... def execvp(file: AnyPath, args: _ExecVArgs) -> NoReturn: ... def execvpe(file: AnyPath, args: _ExecVArgs, env: Mapping[str, str]) -> NoReturn: ... - def _exit(n: int) -> NoReturn: ... def kill(pid: int, sig: int) -> None: ... -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only def fork() -> int: ... def forkpty() -> Tuple[int, int]: ... # some flavors of Unix @@ -297,9 +325,9 @@ if sys.version_info >= (3, 0): class popen(_TextIOWrapper): # TODO 'b' modes or bytes command not accepted? - def __init__(self, command: str, mode: str = ..., - bufsize: int = ...) -> None: ... + def __init__(self, command: str, mode: str = ..., bufsize: int = ...) -> None: ... def close(self) -> Any: ... # may return int + else: def popen(command: str, *args, **kwargs) -> IO[Any]: ... def popen2(cmd: str, *args, **kwargs) -> Tuple[IO[Any], IO[Any]]: ... @@ -307,18 +335,17 @@ def popen4(cmd: str, *args, **kwargs) -> Tuple[IO[Any], IO[Any]]: ... def spawnl(mode: int, path: AnyPath, arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> int: ... -def spawnle(mode: int, path: AnyPath, arg0: Union[bytes, Text], - *args: Any) -> int: ... # Imprecise sig +def spawnle(mode: int, path: AnyPath, arg0: Union[bytes, Text], *args: Any) -> int: ... # Imprecise sig def spawnv(mode: int, path: AnyPath, args: List[Union[bytes, Text]]) -> int: ... -def spawnve(mode: int, path: AnyPath, args: List[Union[bytes, Text]], - env: Mapping[str, str]) -> int: ... +def spawnve(mode: int, path: AnyPath, args: List[Union[bytes, Text]], env: Mapping[str, str]) -> int: ... def system(command: AnyPath) -> int: ... def times() -> Tuple[float, float, float, float, float]: ... def waitpid(pid: int, options: int) -> Tuple[int, int]: ... def urandom(n: int) -> bytes: ... -if sys.platform == 'win32': +if sys.platform == "win32": def startfile(path: AnyPath, operation: Optional[str] = ...) -> None: ... + else: # Unix only def spawnlp(mode: int, file: AnyPath, arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> int: ... @@ -342,6 +369,7 @@ if sys.version_info >= (3, 0): def sched_getaffinity(id: int) -> Set[int]: ... + if sys.version_info >= (3, 3): class waitresult: si_pid: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os/path.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os/path.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os/path.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os/path.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,14 +1,10 @@ -# NB: path.pyi and stdlib/2 and stdlib/3 must remain consistent! import os import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Text, Callable, Optional +from _typeshed import AnyPath, BytesPath, StrPath from genericpath import exists as exists -from _typeshed import StrPath, BytesPath, AnyPath +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Text, Tuple, TypeVar, overload -_T = TypeVar('_T') - -if sys.version_info >= (3, 6): - from builtins import _PathLike +_T = TypeVar("_T") # ----- os.path variables ----- supports_unicode_filenames: bool @@ -16,7 +12,7 @@ curdir: str pardir: str sep: str -if sys.platform == 'win32': +if sys.platform == "win32": altsep: str else: altsep: Optional[str] @@ -26,72 +22,24 @@ devnull: str # ----- os.path function stubs ----- -if sys.version_info >= (3, 6): - # Overloads are necessary to work around python/mypy#3644. - @overload - def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def abspath(path: AnyStr) -> AnyStr: ... - @overload - def basename(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def basename(p: AnyStr) -> AnyStr: ... - @overload - def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def dirname(p: AnyStr) -> AnyStr: ... - @overload - def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expanduser(path: AnyStr) -> AnyStr: ... - @overload - def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expandvars(path: AnyStr) -> AnyStr: ... - @overload - def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normcase(s: AnyStr) -> AnyStr: ... - @overload - def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - @overload - def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(path: AnyStr) -> AnyStr: ... - else: - @overload - def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(filename: AnyStr) -> AnyStr: ... +def abspath(path: AnyStr) -> AnyStr: ... +def basename(p: AnyStr) -> AnyStr: ... +def dirname(p: AnyStr) -> AnyStr: ... +def expanduser(path: AnyStr) -> AnyStr: ... +def expandvars(path: AnyStr) -> AnyStr: ... +def normcase(s: AnyStr) -> AnyStr: ... +def normpath(path: AnyStr) -> AnyStr: ... + +if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... else: - def abspath(path: AnyStr) -> AnyStr: ... - def basename(p: AnyStr) -> AnyStr: ... - def dirname(p: AnyStr) -> AnyStr: ... - def expanduser(path: AnyStr) -> AnyStr: ... - def expandvars(path: AnyStr) -> AnyStr: ... - def normcase(s: AnyStr) -> AnyStr: ... - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - def realpath(path: AnyStr) -> AnyStr: ... - else: - def realpath(filename: AnyStr) -> AnyStr: ... - -if sys.version_info >= (3, 6): - # In reality it returns str for sequences of StrPath and bytes for sequences - # of BytesPath, but mypy does not accept such a signature. - def commonpath(paths: Sequence[AnyPath]) -> Any: ... -elif sys.version_info >= (3, 5): - def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... + def realpath(filename: AnyStr) -> AnyStr: ... # NOTE: Empty lists results in '' (str) regardless of contained type. # Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes # So, fall back to Any def commonprefix(m: Sequence[AnyPath]) -> Any: ... - def lexists(path: AnyPath) -> bool: ... # These return float if os.stat_float_times() == True, @@ -99,7 +47,6 @@ def getatime(filename: AnyPath) -> float: ... def getmtime(filename: AnyPath) -> float: ... def getctime(filename: AnyPath) -> float: ... - def getsize(filename: AnyPath) -> int: ... def isabs(s: AnyPath) -> bool: ... def isfile(path: AnyPath) -> bool: ... @@ -107,58 +54,32 @@ def islink(path: AnyPath) -> bool: ... def ismount(path: AnyPath) -> bool: ... -if sys.version_info < (3, 0): - # Make sure signatures are disjunct, and allow combinations of bytes and unicode. - # (Since Python 2 allows that, too) - # Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in - # a type error. - @overload - def join(__p1: bytes, *p: bytes) -> bytes: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: Text, *p: AnyPath) -> Text: ... -elif sys.version_info >= (3, 6): - @overload - def join(a: StrPath, *paths: StrPath) -> Text: ... - @overload - def join(a: BytesPath, *paths: BytesPath) -> bytes: ... -else: - def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... - +# Make sure signatures are disjunct, and allow combinations of bytes and unicode. +# (Since Python 2 allows that, too) +# Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in +# a type error. +@overload +def join(__p1: bytes, *p: bytes) -> bytes: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: Text, *p: AnyPath) -> Text: ... @overload def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... @overload def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... - def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... def sameopenfile(fp1: int, fp2: int) -> bool: ... def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... +def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -if sys.version_info >= (3, 6): - @overload - def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -else: - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - -if sys.version_info < (3, 7) and sys.platform == 'win32': +if sys.platform == "win32": def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated -if sys.version_info < (3,): - def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... +def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os2emxpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os2emxpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/os2emxpath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/os2emxpath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,14 +1,10 @@ -# NB: path.pyi and stdlib/2 and stdlib/3 must remain consistent! import os import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Text, Callable, Optional +from _typeshed import AnyPath, BytesPath, StrPath from genericpath import exists as exists -from _typeshed import StrPath, BytesPath, AnyPath +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Text, Tuple, TypeVar, overload -_T = TypeVar('_T') - -if sys.version_info >= (3, 6): - from builtins import _PathLike +_T = TypeVar("_T") # ----- os.path variables ----- supports_unicode_filenames: bool @@ -16,7 +12,7 @@ curdir: str pardir: str sep: str -if sys.platform == 'win32': +if sys.platform == "win32": altsep: str else: altsep: Optional[str] @@ -26,72 +22,24 @@ devnull: str # ----- os.path function stubs ----- -if sys.version_info >= (3, 6): - # Overloads are necessary to work around python/mypy#3644. - @overload - def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def abspath(path: AnyStr) -> AnyStr: ... - @overload - def basename(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def basename(p: AnyStr) -> AnyStr: ... - @overload - def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def dirname(p: AnyStr) -> AnyStr: ... - @overload - def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expanduser(path: AnyStr) -> AnyStr: ... - @overload - def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expandvars(path: AnyStr) -> AnyStr: ... - @overload - def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normcase(s: AnyStr) -> AnyStr: ... - @overload - def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - @overload - def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(path: AnyStr) -> AnyStr: ... - else: - @overload - def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(filename: AnyStr) -> AnyStr: ... +def abspath(path: AnyStr) -> AnyStr: ... +def basename(p: AnyStr) -> AnyStr: ... +def dirname(p: AnyStr) -> AnyStr: ... +def expanduser(path: AnyStr) -> AnyStr: ... +def expandvars(path: AnyStr) -> AnyStr: ... +def normcase(s: AnyStr) -> AnyStr: ... +def normpath(path: AnyStr) -> AnyStr: ... + +if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... else: - def abspath(path: AnyStr) -> AnyStr: ... - def basename(p: AnyStr) -> AnyStr: ... - def dirname(p: AnyStr) -> AnyStr: ... - def expanduser(path: AnyStr) -> AnyStr: ... - def expandvars(path: AnyStr) -> AnyStr: ... - def normcase(s: AnyStr) -> AnyStr: ... - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - def realpath(path: AnyStr) -> AnyStr: ... - else: - def realpath(filename: AnyStr) -> AnyStr: ... - -if sys.version_info >= (3, 6): - # In reality it returns str for sequences of StrPath and bytes for sequences - # of BytesPath, but mypy does not accept such a signature. - def commonpath(paths: Sequence[AnyPath]) -> Any: ... -elif sys.version_info >= (3, 5): - def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... + def realpath(filename: AnyStr) -> AnyStr: ... # NOTE: Empty lists results in '' (str) regardless of contained type. # Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes # So, fall back to Any def commonprefix(m: Sequence[AnyPath]) -> Any: ... - def lexists(path: AnyPath) -> bool: ... # These return float if os.stat_float_times() == True, @@ -99,7 +47,6 @@ def getatime(filename: AnyPath) -> float: ... def getmtime(filename: AnyPath) -> float: ... def getctime(filename: AnyPath) -> float: ... - def getsize(filename: AnyPath) -> int: ... def isabs(s: AnyPath) -> bool: ... def isfile(path: AnyPath) -> bool: ... @@ -107,58 +54,32 @@ def islink(path: AnyPath) -> bool: ... def ismount(path: AnyPath) -> bool: ... -if sys.version_info < (3, 0): - # Make sure signatures are disjunct, and allow combinations of bytes and unicode. - # (Since Python 2 allows that, too) - # Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in - # a type error. - @overload - def join(__p1: bytes, *p: bytes) -> bytes: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: Text, *p: AnyPath) -> Text: ... -elif sys.version_info >= (3, 6): - @overload - def join(a: StrPath, *paths: StrPath) -> Text: ... - @overload - def join(a: BytesPath, *paths: BytesPath) -> bytes: ... -else: - def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... - +# Make sure signatures are disjunct, and allow combinations of bytes and unicode. +# (Since Python 2 allows that, too) +# Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in +# a type error. +@overload +def join(__p1: bytes, *p: bytes) -> bytes: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: Text, *p: AnyPath) -> Text: ... @overload def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... @overload def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... - def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... def sameopenfile(fp1: int, fp2: int) -> bool: ... def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... +def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -if sys.version_info >= (3, 6): - @overload - def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -else: - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - -if sys.version_info < (3, 7) and sys.platform == 'win32': +if sys.platform == "win32": def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated -if sys.version_info < (3,): - def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... +def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/pipes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/pipes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/pipes.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/pipes.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,13 @@ +from typing import IO, Any, AnyStr + +class Template: + def __init__(self) -> None: ... + def reset(self) -> None: ... + def clone(self) -> Template: ... + def debug(self, flag: bool) -> None: ... + def append(self, cmd: str, kind: str) -> None: ... + def prepend(self, cmd: str, kind: str) -> None: ... + def open(self, file: str, mode: str) -> IO[Any]: ... + def copy(self, infile: str, outfile: str) -> None: ... + +def quote(s: AnyStr) -> AnyStr: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/posixpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/posixpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/posixpath.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/posixpath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,85 @@ +import os +import sys +from _typeshed import AnyPath, BytesPath, StrPath +from genericpath import exists as exists +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Text, Tuple, TypeVar, overload + +_T = TypeVar("_T") + +# ----- os.path variables ----- +supports_unicode_filenames: bool +# aliases (also in os) +curdir: str +pardir: str +sep: str +if sys.platform == "win32": + altsep: str +else: + altsep: Optional[str] +extsep: str +pathsep: str +defpath: str +devnull: str + +# ----- os.path function stubs ----- +def abspath(path: AnyStr) -> AnyStr: ... +def basename(p: AnyStr) -> AnyStr: ... +def dirname(p: AnyStr) -> AnyStr: ... +def expanduser(path: AnyStr) -> AnyStr: ... +def expandvars(path: AnyStr) -> AnyStr: ... +def normcase(s: AnyStr) -> AnyStr: ... +def normpath(path: AnyStr) -> AnyStr: ... + +if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... + +else: + def realpath(filename: AnyStr) -> AnyStr: ... + +# NOTE: Empty lists results in '' (str) regardless of contained type. +# Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes +# So, fall back to Any +def commonprefix(m: Sequence[AnyPath]) -> Any: ... +def lexists(path: AnyPath) -> bool: ... + +# These return float if os.stat_float_times() == True, +# but int is a subclass of float. +def getatime(filename: AnyPath) -> float: ... +def getmtime(filename: AnyPath) -> float: ... +def getctime(filename: AnyPath) -> float: ... +def getsize(filename: AnyPath) -> int: ... +def isabs(s: AnyPath) -> bool: ... +def isfile(path: AnyPath) -> bool: ... +def isdir(s: AnyPath) -> bool: ... +def islink(path: AnyPath) -> bool: ... +def ismount(path: AnyPath) -> bool: ... + +# Make sure signatures are disjunct, and allow combinations of bytes and unicode. +# (Since Python 2 allows that, too) +# Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in +# a type error. +@overload +def join(__p1: bytes, *p: bytes) -> bytes: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... +@overload +def join(__p1: Text, *p: AnyPath) -> Text: ... +@overload +def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... +@overload +def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... +def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... +def sameopenfile(fp1: int, fp2: int) -> bool: ... +def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... +def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... +def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +if sys.platform == "win32": + def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated + +def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/posix.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/posix.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/posix.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/posix.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,5 @@ -from typing import AnyStr, Dict, IO, List, Mapping, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union +from _typeshed import FileDescriptorLike +from typing import IO, AnyStr, Dict, List, Mapping, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union error = OSError @@ -105,17 +106,17 @@ def dup2(fd: int, fd2: int) -> None: ... def execv(path: str, args: Sequence[str], env: Mapping[str, str]) -> None: ... def execve(path: str, args: Sequence[str], env: Mapping[str, str]) -> None: ... -def fchdir(fd: int) -> None: ... +def fchdir(fd: FileDescriptorLike) -> None: ... def fchmod(fd: int, mode: int) -> None: ... def fchown(fd: int, uid: int, gid: int) -> None: ... -def fdatasync(fd: int) -> None: ... +def fdatasync(fd: FileDescriptorLike) -> None: ... def fdopen(fd: int, mode: str = ..., bufsize: int = ...) -> IO[str]: ... def fork() -> int: ... def forkpty() -> Tuple[int, int]: ... def fpathconf(fd: int, name: str) -> None: ... def fstat(fd: int) -> stat_result: ... def fstatvfs(fd: int) -> statvfs_result: ... -def fsync(fd: int) -> None: ... +def fsync(fd: FileDescriptorLike) -> None: ... def ftruncate(fd: int, length: int) -> None: ... def getcwd() -> str: ... def getcwdu() -> unicode: ... @@ -191,7 +192,9 @@ def urandom(n: int) -> str: ... def utime(path: unicode, times: Optional[Tuple[int, int]]) -> None: ... def wait() -> int: ... + _r = Tuple[float, float, int, int, int, int, int, int, int, int, int, int, int, int, int, int] + def wait3(options: int) -> Tuple[int, int, _r]: ... def wait4(pid: int, options: int) -> Tuple[int, int, _r]: ... def waitpid(pid: int, options: int) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/Queue.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/Queue.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/Queue.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/Queue.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,7 @@ -# Stubs for Queue (Python 2) - from collections import deque -from typing import Any, Deque, TypeVar, Generic, Optional +from typing import Any, Deque, Generic, Optional, TypeVar -_T = TypeVar('_T') +_T = TypeVar("_T") class Empty(Exception): ... class Full(Exception): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/random.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/random.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/random.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/random.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,8 @@ -# Stubs for random -# Ron Murawski -# Updated by Jukka Lehtosalo - -# based on https://docs.python.org/2/library/random.html - -# ----- random classes ----- - import _random -from typing import AbstractSet, Any, Callable, Iterator, List, Protocol, Sequence, TypeVar, Union, overload +from typing import AbstractSet, Any, Callable, Iterator, List, MutableSequence, Protocol, Sequence, TypeVar, Union, overload _T = TypeVar("_T") -_T_co = TypeVar('_T_co', covariant=True) +_T_co = TypeVar("_T_co", covariant=True) class _Sampleable(Protocol[_T_co]): def __iter__(self) -> Iterator[_T_co]: ... @@ -29,7 +21,7 @@ def randrange(self, start: int, stop: int, step: int = ...) -> int: ... def randint(self, a: int, b: int) -> int: ... def choice(self, seq: Sequence[_T]) -> _T: ... - def shuffle(self, x: List[Any], random: Callable[[], None] = ...) -> None: ... + def shuffle(self, x: MutableSequence[Any], random: Callable[[], None] = ...) -> None: ... def sample(self, population: _Sampleable[_T], k: int) -> List[_T]: ... def random(self) -> float: ... def uniform(self, a: float, b: float) -> float: ... @@ -45,8 +37,7 @@ def weibullvariate(self, alpha: float, beta: float) -> float: ... # SystemRandom is not implemented for all OS's; good on Windows & Linux -class SystemRandom(Random): - ... +class SystemRandom(Random): ... # ----- random function stubs ----- def seed(x: object = ...) -> None: ... @@ -60,12 +51,11 @@ def randrange(start: int, stop: int, step: int = ...) -> int: ... def randint(a: int, b: int) -> int: ... def choice(seq: Sequence[_T]) -> _T: ... -def shuffle(x: List[Any], random: Callable[[], float] = ...) -> None: ... +def shuffle(x: MutableSequence[Any], random: Callable[[], float] = ...) -> None: ... def sample(population: _Sampleable[_T], k: int) -> List[_T]: ... def random() -> float: ... def uniform(a: float, b: float) -> float: ... -def triangular(low: float = ..., high: float = ..., - mode: float = ...) -> float: ... +def triangular(low: float = ..., high: float = ..., mode: float = ...) -> float: ... def betavariate(alpha: float, beta: float) -> float: ... def expovariate(lambd: float) -> float: ... def gammavariate(alpha: float, beta: float) -> float: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/re.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/re.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/re.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/re.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,18 @@ -# Stubs for re -# Ron Murawski -# 'bytes' support added by Jukka Lehtosalo - -# based on: http: //docs.python.org/2.7/library/re.html - from typing import ( - List, Iterator, overload, Callable, Tuple, Sequence, Dict, - Generic, AnyStr, Match, Pattern, Any, Optional, Union + Any, + AnyStr, + Callable, + Dict, + Generic, + Iterator, + List, + Match, + Optional, + Pattern, + Sequence, + Tuple, + Union, + overload, ) # ----- re variables and constants ----- @@ -32,24 +38,20 @@ def compile(pattern: AnyStr, flags: int = ...) -> Pattern[AnyStr]: ... @overload def compile(pattern: Pattern[AnyStr], flags: int = ...) -> Pattern[AnyStr]: ... - @overload def search(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> Optional[Match[AnyStr]]: ... @overload def search(pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, flags: int = ...) -> Optional[Match[AnyStr]]: ... - @overload def match(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> Optional[Match[AnyStr]]: ... @overload def match(pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, flags: int = ...) -> Optional[Match[AnyStr]]: ... - @overload -def split(pattern: Union[str, unicode], string: AnyStr, - maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ... +def split(pattern: Union[str, unicode], string: AnyStr, maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ... @overload -def split(pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, - maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ... - +def split( + pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, maxsplit: int = ..., flags: int = ... +) -> List[AnyStr]: ... @overload def findall(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> List[Any]: ... @overload @@ -60,41 +62,47 @@ # matches are returned in the order found. Empty matches are included in the # result unless they touch the beginning of another match. @overload -def finditer(pattern: Union[str, unicode], string: AnyStr, - flags: int = ...) -> Iterator[Match[AnyStr]]: ... -@overload -def finditer(pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, - flags: int = ...) -> Iterator[Match[AnyStr]]: ... - -@overload -def sub(pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ..., - flags: int = ...) -> AnyStr: ... +def finditer(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> Iterator[Match[AnyStr]]: ... @overload -def sub(pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., flags: int = ...) -> AnyStr: ... +def finditer(pattern: Union[Pattern[str], Pattern[unicode]], string: AnyStr, flags: int = ...) -> Iterator[Match[AnyStr]]: ... @overload -def sub(pattern: Union[Pattern[str], Pattern[unicode]], repl: AnyStr, string: AnyStr, count: int = ..., - flags: int = ...) -> AnyStr: ... -@overload -def sub(pattern: Union[Pattern[str], Pattern[unicode]], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., flags: int = ...) -> AnyStr: ... - +def sub(pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ..., flags: int = ...) -> AnyStr: ... @overload -def subn(pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ..., - flags: int = ...) -> Tuple[AnyStr, int]: ... -@overload -def subn(pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., - flags: int = ...) -> Tuple[AnyStr, int]: ... -@overload -def subn(pattern: Union[Pattern[str], Pattern[unicode]], repl: AnyStr, string: AnyStr, count: int = ..., - flags: int = ...) -> Tuple[AnyStr, int]: ... -@overload -def subn(pattern: Union[Pattern[str], Pattern[unicode]], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., - flags: int = ...) -> Tuple[AnyStr, int]: ... - +def sub( + pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: int = ... +) -> AnyStr: ... +@overload +def sub( + pattern: Union[Pattern[str], Pattern[unicode]], repl: AnyStr, string: AnyStr, count: int = ..., flags: int = ... +) -> AnyStr: ... +@overload +def sub( + pattern: Union[Pattern[str], Pattern[unicode]], + repl: Callable[[Match[AnyStr]], AnyStr], + string: AnyStr, + count: int = ..., + flags: int = ..., +) -> AnyStr: ... +@overload +def subn( + pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ..., flags: int = ... +) -> Tuple[AnyStr, int]: ... +@overload +def subn( + pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: int = ... +) -> Tuple[AnyStr, int]: ... +@overload +def subn( + pattern: Union[Pattern[str], Pattern[unicode]], repl: AnyStr, string: AnyStr, count: int = ..., flags: int = ... +) -> Tuple[AnyStr, int]: ... +@overload +def subn( + pattern: Union[Pattern[str], Pattern[unicode]], + repl: Callable[[Match[AnyStr]], AnyStr], + string: AnyStr, + count: int = ..., + flags: int = ..., +) -> Tuple[AnyStr, int]: ... def escape(string: AnyStr) -> AnyStr: ... - def purge() -> None: ... def template(pattern: Union[AnyStr, Pattern[AnyStr]], flags: int = ...) -> Pattern[AnyStr]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/resource.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/resource.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/resource.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/resource.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,9 @@ -from typing import Tuple, NamedTuple +from typing import NamedTuple, Tuple class error(Exception): ... RLIM_INFINITY: int + def getrlimit(resource: int) -> Tuple[int, int]: ... def setrlimit(resource: int, limits: Tuple[int, int]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/signal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/signal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/signal.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/signal.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Callable, Any, Tuple, Union from types import FrameType +from typing import Any, Callable, Tuple, Union SIG_DFL: int = ... SIG_IGN: int = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/SocketServer.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/SocketServer.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/SocketServer.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/SocketServer.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,10 +1,7 @@ -# NB: SocketServer.pyi and socketserver.pyi must remain consistent! -# Stubs for socketserver - -from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Tuple, Type, Text, Union -from socket import SocketType import sys import types +from socket import SocketType +from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Text, Tuple, Type, Union class BaseServer: address_family: int @@ -15,94 +12,78 @@ request_queue_size: int socket_type: int timeout: Optional[float] - def __init__(self, server_address: Any, - RequestHandlerClass: Callable[..., BaseRequestHandler]) -> None: ... + def __init__(self, server_address: Any, RequestHandlerClass: Callable[..., BaseRequestHandler]) -> None: ... def fileno(self) -> int: ... def handle_request(self) -> None: ... def serve_forever(self, poll_interval: float = ...) -> None: ... def shutdown(self) -> None: ... def server_close(self) -> None: ... - def finish_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... - def get_request(self) -> None: ... - def handle_error(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def finish_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... + def get_request(self) -> Tuple[SocketType, Tuple[str, int]]: ... + def handle_error(self, request: bytes, client_address: Tuple[str, int]) -> None: ... def handle_timeout(self) -> None: ... - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... def server_activate(self) -> None: ... def server_bind(self) -> None: ... - def verify_request(self, request: bytes, - client_address: Tuple[str, int]) -> bool: ... - if sys.version_info >= (3, 6): - def __enter__(self) -> BaseServer: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[types.TracebackType]) -> None: ... - if sys.version_info >= (3, 3): - def service_actions(self) -> None: ... + def verify_request(self, request: bytes, client_address: Tuple[str, int]) -> bool: ... class TCPServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Tuple[str, int], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... class UDPServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Tuple[str, int], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... -if sys.platform != 'win32': +if sys.platform != "win32": class UnixStreamServer(BaseServer): - def __init__(self, server_address: Union[Text, bytes], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... - + def __init__( + self, + server_address: Union[Text, bytes], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... class UnixDatagramServer(BaseServer): - def __init__(self, server_address: Union[Text, bytes], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Union[Text, bytes], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... if sys.platform != "win32": class ForkingMixIn: timeout: Optional[float] # undocumented active_children: Optional[List[int]] # undocumented max_children: int # undocumented - if sys.version_info >= (3, 7): - block_on_close: bool - if sys.version_info >= (3, 6): - def collect_children(self, *, blocking: bool = ...) -> None: ... # undocumented - else: - def collect_children(self) -> None: ... # undocumented + def collect_children(self) -> None: ... # undocumented def handle_timeout(self) -> None: ... # undocumented - if sys.version_info >= (3, 3): - def service_actions(self) -> None: ... # undocumented - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... - if sys.version_info >= (3, 6): - def server_close(self) -> None: ... + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... class ThreadingMixIn: daemon_threads: bool - if sys.version_info >= (3, 7): - block_on_close: bool - def process_request_thread(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... # undocumented - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... - if sys.version_info >= (3, 6): - def server_close(self) -> None: ... + def process_request_thread(self, request: bytes, client_address: Tuple[str, int]) -> None: ... # undocumented + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... if sys.platform != "win32": class ForkingTCPServer(ForkingMixIn, TCPServer): ... class ForkingUDPServer(ForkingMixIn, UDPServer): ... + class ThreadingTCPServer(ThreadingMixIn, TCPServer): ... class ThreadingUDPServer(ThreadingMixIn, UDPServer): ... -if sys.platform != 'win32': + +if sys.platform != "win32": class ThreadingUnixStreamServer(ThreadingMixIn, UnixStreamServer): ... class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): ... - class BaseRequestHandler: # Those are technically of types, respectively: # * Union[SocketType, Tuple[bytes, SocketType]] @@ -113,7 +94,6 @@ request: Any client_address: Any server: BaseServer - def __init__(self, request: Any, client_address: Any, server: BaseServer) -> None: ... def setup(self) -> None: ... def handle(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sre_constants.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sre_constants.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sre_constants.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sre_constants.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Source: https://hg.python.org/cpython/file/2.7/Lib/sre_constants.py - from typing import Dict, List, TypeVar MAGIC: int @@ -72,7 +70,8 @@ CATEGORY_UNI_LINEBREAK: str CATEGORY_UNI_NOT_LINEBREAK: str -_T = TypeVar('_T') +_T = TypeVar("_T") + def makedict(list: List[_T]) -> Dict[_T, int]: ... OP_IGNORE: Dict[str, str] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sre_parse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sre_parse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sre_parse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sre_parse.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Source: https://hg.python.org/cpython/file/2.7/Lib/sre_parse.py - from typing import Any, Dict, Iterable, List, Match, Optional, Pattern as _Pattern, Set, Tuple, Union SPECIAL_CHARS: str @@ -23,7 +21,6 @@ def closegroup(self, gid: int) -> None: ... def checkgroup(self, gid: int) -> bool: ... - _OpSubpatternType = Tuple[Optional[int], int, int, SubPattern] _OpGroupRefExistsType = Tuple[int, SubPattern, SubPattern] _OpInType = List[Tuple[str, int]] @@ -58,6 +55,8 @@ def isdigit(char: str) -> bool: ... def isname(name: str) -> bool: ... def parse(str: str, flags: int = ..., pattern: Pattern = ...) -> SubPattern: ... + _Template = Tuple[List[Tuple[int, int]], List[Optional[int]]] + def parse_template(source: str, pattern: _Pattern[Any]) -> _Template: ... def expand_template(template: _Template, match: Match[Any]) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/subprocess.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/subprocess.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/subprocess.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/subprocess.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,10 +1,4 @@ -# Stubs for subprocess - -# Based on http://docs.python.org/2/library/subprocess.html and Python 3 stub - -from typing import ( - Sequence, Any, Mapping, Callable, Tuple, IO, Union, Optional, List, Text, TypeVar, Generic, -) +from typing import IO, Any, Callable, Generic, List, Mapping, Optional, Sequence, Text, Tuple, TypeVar, Union _FILE = Union[None, int, IO[Any]] _TXT = Union[bytes, Text] @@ -12,50 +6,55 @@ _ENV = Union[Mapping[bytes, _TXT], Mapping[Text, _TXT]] # Same args as Popen.__init__ -def call(args: _CMD, - bufsize: int = ..., - executable: _TXT = ..., - stdin: _FILE = ..., - stdout: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[_TXT] = ..., - env: _ENV = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ...) -> int: ... - -def check_call(args: _CMD, - bufsize: int = ..., - executable: _TXT = ..., - stdin: _FILE = ..., - stdout: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[_TXT] = ..., - env: _ENV = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ...) -> int: ... +def call( + args: _CMD, + bufsize: int = ..., + executable: _TXT = ..., + stdin: _FILE = ..., + stdout: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[_TXT] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., +) -> int: ... +def check_call( + args: _CMD, + bufsize: int = ..., + executable: _TXT = ..., + stdin: _FILE = ..., + stdout: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[_TXT] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., +) -> int: ... # Same args as Popen.__init__ except for stdout -def check_output(args: _CMD, - bufsize: int = ..., - executable: _TXT = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[_TXT] = ..., - env: _ENV = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ...) -> bytes: ... +def check_output( + args: _CMD, + bufsize: int = ..., + executable: _TXT = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[_TXT] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., +) -> bytes: ... PIPE: int STDOUT: int @@ -66,14 +65,10 @@ cmd: Any # morally: Optional[bytes] output: bytes - - def __init__(self, - returncode: int, - cmd: _CMD, - output: Optional[bytes] = ...) -> None: ... + def __init__(self, returncode: int, cmd: _CMD, output: Optional[bytes] = ...) -> None: ... # We use a dummy type variable used to make Popen generic like it is in python 3 -_T = TypeVar('_T', bound=bytes) +_T = TypeVar("_T", bound=bytes) class Popen(Generic[_T]): stdin: Optional[IO[bytes]] @@ -81,23 +76,23 @@ stderr: Optional[IO[bytes]] pid: int returncode: int - - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[_TXT] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[_TXT] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ...) -> Popen[bytes]: ... - + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[_TXT] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[_TXT] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + ) -> Popen[bytes]: ... def poll(self) -> Optional[int]: ... def wait(self) -> int: ... # morally: -> Tuple[Optional[bytes], Optional[bytes]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sys.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sys.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/sys.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/sys.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,10 +1,5 @@ -"""Stubs for the 'sys' module.""" - -from typing import ( - IO, NoReturn, Union, List, Sequence, Any, Dict, Tuple, BinaryIO, Optional, - Callable, overload, Text, Type, -) -from types import FrameType, ModuleType, TracebackType, ClassType +from types import ClassType, FrameType, ModuleType, TracebackType +from typing import IO, Any, BinaryIO, Callable, Dict, List, NoReturn, Optional, Sequence, Text, Tuple, Type, Union, overload # The following type alias are stub-only and do not exist during runtime _ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType] @@ -107,7 +102,6 @@ product_type: Any def getwindowsversion() -> _WindowsVersionType: ... - def _clear_type_cache() -> None: ... def _current_frames() -> Dict[int, FrameType]: ... def _getframe(depth: int = ...) -> FrameType: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/tempfile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/tempfile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/tempfile.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/tempfile.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ -from typing import Any, AnyStr, IO, Iterable, Iterator, List, Optional, overload, Text, Tuple, Union -from thread import LockType from random import Random +from thread import LockType +from typing import IO, Any, AnyStr, Iterable, Iterator, List, Optional, Text, Tuple, Union, overload TMP_MAX: int tempdir: str @@ -48,7 +48,6 @@ def write(self, s: Text) -> int: ... def writelines(self, lines: Iterable[str]) -> None: ... - # TODO text files def TemporaryFile( @@ -56,36 +55,30 @@ bufsize: int = ..., suffix: Union[bytes, unicode] = ..., prefix: Union[bytes, unicode] = ..., - dir: Union[bytes, unicode] = ... -) -> _TemporaryFileWrapper: - ... - + dir: Union[bytes, unicode] = ..., +) -> _TemporaryFileWrapper: ... def NamedTemporaryFile( mode: Union[bytes, unicode] = ..., bufsize: int = ..., suffix: Union[bytes, unicode] = ..., prefix: Union[bytes, unicode] = ..., dir: Union[bytes, unicode] = ..., - delete: bool = ... -) -> _TemporaryFileWrapper: - ... - + delete: bool = ..., +) -> _TemporaryFileWrapper: ... def SpooledTemporaryFile( max_size: int = ..., mode: Union[bytes, unicode] = ..., buffering: int = ..., suffix: Union[bytes, unicode] = ..., prefix: Union[bytes, unicode] = ..., - dir: Union[bytes, unicode] = ... -) -> _TemporaryFileWrapper: - ... + dir: Union[bytes, unicode] = ..., +) -> _TemporaryFileWrapper: ... class TemporaryDirectory: name: Any - def __init__(self, - suffix: Union[bytes, unicode] = ..., - prefix: Union[bytes, unicode] = ..., - dir: Union[bytes, unicode] = ...) -> None: ... + def __init__( + self, suffix: Union[bytes, unicode] = ..., prefix: Union[bytes, unicode] = ..., dir: Union[bytes, unicode] = ... + ) -> None: ... def cleanup(self) -> None: ... def __enter__(self) -> Any: ... # Can be str or unicode def __exit__(self, type, value, traceback) -> None: ... @@ -93,8 +86,7 @@ @overload def mkstemp() -> Tuple[int, str]: ... @overload -def mkstemp(suffix: AnyStr = ..., prefix: AnyStr = ..., dir: Optional[AnyStr] = ..., - text: bool = ...) -> Tuple[int, AnyStr]: ... +def mkstemp(suffix: AnyStr = ..., prefix: AnyStr = ..., dir: Optional[AnyStr] = ..., text: bool = ...) -> Tuple[int, AnyStr]: ... @overload def mkdtemp() -> str: ... @overload @@ -105,7 +97,6 @@ def mktemp(suffix: AnyStr = ..., prefix: AnyStr = ..., dir: Optional[AnyStr] = ...) -> AnyStr: ... def gettempdir() -> str: ... def gettempprefix() -> str: ... - def _candidate_tempdir_list() -> List[str]: ... def _get_candidate_names() -> Optional[_RandomNameSequence]: ... def _get_default_tempdir() -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/textwrap.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/textwrap.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/textwrap.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/textwrap.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import AnyStr, List, Dict, Pattern +from typing import AnyStr, Dict, List, Pattern class TextWrapper(object): width: int = ... @@ -19,43 +19,43 @@ unicode_whitespace_trans: Dict[int, int] = ... uspace: int = ... x: int = ... - def __init__( - self, - width: int = ..., - initial_indent: str = ..., - subsequent_indent: str = ..., - expand_tabs: bool = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - drop_whitespace: bool = ..., - break_on_hyphens: bool = ...) -> None: - ... - + self, + width: int = ..., + initial_indent: str = ..., + subsequent_indent: str = ..., + expand_tabs: bool = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + drop_whitespace: bool = ..., + break_on_hyphens: bool = ..., + ) -> None: ... def wrap(self, text: AnyStr) -> List[AnyStr]: ... def fill(self, text: AnyStr) -> AnyStr: ... -def wrap(text: AnyStr, - width: int = ..., - initial_indent: AnyStr = ..., - subsequent_indent: AnyStr = ..., - expand_tabs: bool = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - drop_whitespace: bool = ..., - break_on_hyphens: bool = ...) -> List[AnyStr]: ... - -def fill(text: AnyStr, - width: int = ..., - initial_indent: AnyStr = ..., - subsequent_indent: AnyStr = ..., - expand_tabs: bool = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - drop_whitespace: bool = ..., - break_on_hyphens: bool = ...) -> AnyStr: ... - +def wrap( + text: AnyStr, + width: int = ..., + initial_indent: AnyStr = ..., + subsequent_indent: AnyStr = ..., + expand_tabs: bool = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + drop_whitespace: bool = ..., + break_on_hyphens: bool = ..., +) -> List[AnyStr]: ... +def fill( + text: AnyStr, + width: int = ..., + initial_indent: AnyStr = ..., + subsequent_indent: AnyStr = ..., + expand_tabs: bool = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + drop_whitespace: bool = ..., + break_on_hyphens: bool = ..., +) -> AnyStr: ... def dedent(text: AnyStr) -> AnyStr: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/tokenize.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/tokenize.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/tokenize.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/tokenize.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ -# Automatically generated by pytype, manually fixed up. May still contain errors. - -from typing import Any, Callable, Dict, Generator, Iterator, List, Tuple, Union, Iterable +from typing import Any, Callable, Dict, Generator, Iterable, Iterator, List, Tuple, Union __author__: str __credits__: str @@ -123,7 +121,6 @@ def untokenize(iterable: Iterable[_TokenType]) -> str: ... class StopTokenizing(Exception): ... - class TokenError(Exception): ... class Untokenizer: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/types.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/types.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/types.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/types.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,14 +1,11 @@ -# Stubs for types -# Note, all classes "defined" here require special handling. +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Type, TypeVar, Union, overload -from typing import ( - Any, Callable, Dict, Iterable, Iterator, List, Optional, - Tuple, Type, TypeVar, Union, overload, -) +_T = TypeVar("_T") -_T = TypeVar('_T') +# Note, all classes "defined" here require special handling. class NoneType: ... + TypeType = type ObjectType = object @@ -43,7 +40,14 @@ __dict__ = func_dict __globals__ = func_globals __name__ = func_name - def __init__(self, code: CodeType, globals: Dict[str, Any], name: Optional[str] = ..., argdefs: Optional[Tuple[object, ...]] = ..., closure: Optional[Tuple[_Cell, ...]] = ...) -> None: ... + def __init__( + self, + code: CodeType, + globals: Dict[str, Any], + name: Optional[str] = ..., + argdefs: Optional[Tuple[object, ...]] = ..., + closure: Optional[Tuple[_Cell, ...]] = ..., + ) -> None: ... def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __get__(self, obj: Optional[object], type: Optional[type]) -> UnboundMethodType: ... @@ -89,13 +93,16 @@ def __iter__(self) -> GeneratorType: ... def close(self) -> None: ... def next(self) -> Any: ... - def send(self, arg: Any) -> Any: ... + def send(self, __arg: Any) -> Any: ... @overload - def throw(self, val: BaseException) -> Any: ... + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> Any: ... @overload - def throw(self, typ: type, val: BaseException = ..., tb: TracebackType = ...) -> Any: ... + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> Any: ... class ClassType: ... + class UnboundMethodType: im_class: type = ... im_func: FunctionType = ... @@ -113,6 +120,7 @@ class BuiltinFunctionType: __self__: Optional[object] def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + BuiltinMethodType = BuiltinFunctionType class ModuleType: @@ -123,6 +131,7 @@ __path__: Optional[Iterable[str]] __dict__: Dict[str, Any] def __init__(self, name: str, doc: Optional[str] = ...) -> None: ... + FileType = file XRangeType = xrange @@ -145,10 +154,10 @@ f_locals: Dict[str, Any] f_restricted: bool f_trace: Callable[[], None] - def clear(self) -> None: ... SliceType = slice + class EllipsisType: ... class DictProxyType: @@ -176,6 +185,7 @@ def __get__(self, obj: Any, type: type = ...) -> Any: ... def __set__(self, obj: Any) -> None: ... def __delete__(self, obj: Any) -> None: ... + # Same type on Jython, different on CPython and PyPy, unknown on IronPython. class MemberDescriptorType: __name__: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/typing.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/typing.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/typing.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/typing.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,6 @@ -# Stubs for typing (Python 2.7) - -from abc import abstractmethod, ABCMeta -from types import CodeType, FrameType, TracebackType import collections # Needed by aliases like DefaultDict, see mypy issue 2986 +from abc import ABCMeta, abstractmethod +from types import CodeType, FrameType, TracebackType # Definitions of special type checking related constructs. Their definitions # are not used, so their value does not matter. @@ -16,7 +14,14 @@ __constraints__: Tuple[Type[Any], ...] __covariant__: bool __contravariant__: bool - def __init__(self, name: str, *constraints: Type[Any], bound: Optional[Type[Any]] = ..., covariant: bool = ..., contravariant: bool = ...) -> None: ... + def __init__( + self, + name: str, + *constraints: Type[Any], + bound: Optional[Type[Any]] = ..., + covariant: bool = ..., + contravariant: bool = ..., + ) -> None: ... _promote = object() @@ -32,8 +37,10 @@ Type: _SpecialForm = ... ClassVar: _SpecialForm = ... Final: _SpecialForm = ... -_F = TypeVar('_F', bound=Callable[..., Any]) +_F = TypeVar("_F", bound=Callable[..., Any]) + def final(f: _F) -> _F: ... + Literal: _SpecialForm = ... # TypedDict is a (non-subscriptable) special form. TypedDict: object = ... @@ -46,19 +53,20 @@ NoReturn = Union[None] # These type variables are used by the container types. -_T = TypeVar('_T') -_S = TypeVar('_S') -_KT = TypeVar('_KT') # Key type. -_VT = TypeVar('_VT') # Value type. -_T_co = TypeVar('_T_co', covariant=True) # Any type covariant containers. -_V_co = TypeVar('_V_co', covariant=True) # Any type covariant containers. -_KT_co = TypeVar('_KT_co', covariant=True) # Key type covariant containers. -_VT_co = TypeVar('_VT_co', covariant=True) # Value type covariant containers. -_T_contra = TypeVar('_T_contra', contravariant=True) # Ditto contravariant. -_TC = TypeVar('_TC', bound=Type[object]) +_T = TypeVar("_T") +_S = TypeVar("_S") +_KT = TypeVar("_KT") # Key type. +_VT = TypeVar("_VT") # Value type. +_T_co = TypeVar("_T_co", covariant=True) # Any type covariant containers. +_V_co = TypeVar("_V_co", covariant=True) # Any type covariant containers. +_KT_co = TypeVar("_KT_co", covariant=True) # Key type covariant containers. +_VT_co = TypeVar("_VT_co", covariant=True) # Value type covariant containers. +_T_contra = TypeVar("_T_contra", contravariant=True) # Ditto contravariant. +_TC = TypeVar("_TC", bound=Type[object]) _C = TypeVar("_C", bound=Callable[..., Any]) no_type_check = object() + def no_type_check_decorator(decorator: _C) -> _C: ... # Type aliases and type constructors @@ -76,12 +84,11 @@ Deque = _Alias() # Predefined type variables. -AnyStr = TypeVar('AnyStr', str, unicode) +AnyStr = TypeVar("AnyStr", str, unicode) # Abstract base classes. def runtime_checkable(cls: _TC) -> _TC: ... - @runtime_checkable class SupportsInt(Protocol, metaclass=ABCMeta): @abstractmethod @@ -134,13 +141,16 @@ class Generator(Iterator[_T_co], Generic[_T_co, _T_contra, _V_co]): @abstractmethod def next(self) -> _T_co: ... - @abstractmethod - def send(self, value: _T_contra) -> _T_co: ... - + def send(self, __value: _T_contra) -> _T_co: ... + @overload @abstractmethod - def throw(self, typ: Type[BaseException], val: Optional[BaseException] = ..., - tb: TracebackType = ...) -> _T_co: ... + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> _T_co: ... + @overload + @abstractmethod + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> _T_co: ... @abstractmethod def close(self) -> None: ... @property @@ -219,7 +229,6 @@ @abstractmethod def __len__(self) -> int: ... - class MutableSet(AbstractSet[_T], Generic[_T]): @abstractmethod def add(self, x: _T) -> None: ... @@ -255,16 +264,18 @@ @runtime_checkable class ContextManager(Protocol[_T_co]): def __enter__(self) -> _T_co: ... - def __exit__(self, __exc_type: Optional[Type[BaseException]], - __exc_value: Optional[BaseException], - __traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, + __exc_type: Optional[Type[BaseException]], + __exc_value: Optional[BaseException], + __traceback: Optional[TracebackType], + ) -> Optional[bool]: ... class Mapping(Iterable[_KT], Container[_KT], Generic[_KT, _VT_co]): # TODO: We wish the key type could also be covariant, but that doesn't work, # see discussion in https: //github.com/python/typing/pull/273. @abstractmethod - def __getitem__(self, k: _KT) -> _VT_co: - ... + def __getitem__(self, k: _KT) -> _VT_co: ... # Mixin methods @overload def get(self, k: _KT) -> Optional[_VT_co]: ... @@ -286,7 +297,6 @@ def __setitem__(self, k: _KT, v: _VT) -> None: ... @abstractmethod def __delitem__(self, v: _KT) -> None: ... - def clear(self) -> None: ... @overload def pop(self, k: _KT) -> _VT: ... @@ -346,7 +356,6 @@ def write(self, s: AnyStr) -> int: ... @abstractmethod def writelines(self, lines: Iterable[AnyStr]) -> None: ... - @abstractmethod def next(self) -> AnyStr: ... @abstractmethod @@ -354,8 +363,9 @@ @abstractmethod def __enter__(self) -> IO[AnyStr]: ... @abstractmethod - def __exit__(self, t: Optional[Type[BaseException]], value: Optional[BaseException], - traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> Optional[bool]: ... class BinaryIO(IO[str]): # TODO readinto @@ -397,20 +407,15 @@ # Can be None if there are no groups or if the last group was unnamed; # otherwise matches the type of the pattern. lastgroup: Optional[Any] - def expand(self, template: Union[str, Text]) -> Any: ... - @overload def group(self, group1: int = ...) -> AnyStr: ... @overload def group(self, group1: str) -> AnyStr: ... @overload - def group(self, group1: int, group2: int, - *groups: int) -> Tuple[AnyStr, ...]: ... + def group(self, group1: int, group2: int, *groups: int) -> Tuple[AnyStr, ...]: ... @overload - def group(self, group1: str, group2: str, - *groups: str) -> Tuple[AnyStr, ...]: ... - + def group(self, group1: str, group2: str, *groups: str) -> Tuple[AnyStr, ...]: ... def groups(self, default: AnyStr = ...) -> Tuple[AnyStr, ...]: ... def groupdict(self, default: AnyStr = ...) -> Dict[str, AnyStr]: ... def start(self, __group: Union[int, str] = ...) -> int: ... @@ -423,46 +428,34 @@ # Pattern is generic over AnyStr (determining the type of its .pattern # attribute), but at the same time its methods take either bytes or # Text and return the same type, regardless of the type of the pattern. -_AnyStr2 = TypeVar('_AnyStr2', bytes, Text) +_AnyStr2 = TypeVar("_AnyStr2", bytes, Text) class Pattern(Generic[AnyStr]): flags: int groupindex: Dict[AnyStr, int] groups: int pattern: AnyStr - - def search(self, string: _AnyStr2, pos: int = ..., - endpos: int = ...) -> Optional[Match[_AnyStr2]]: ... - def match(self, string: _AnyStr2, pos: int = ..., - endpos: int = ...) -> Optional[Match[_AnyStr2]]: ... + def search(self, string: _AnyStr2, pos: int = ..., endpos: int = ...) -> Optional[Match[_AnyStr2]]: ... + def match(self, string: _AnyStr2, pos: int = ..., endpos: int = ...) -> Optional[Match[_AnyStr2]]: ... def split(self, string: _AnyStr2, maxsplit: int = ...) -> List[_AnyStr2]: ... # Returns either a list of _AnyStr2 or a list of tuples, depending on # whether there are groups in the pattern. - def findall(self, string: Union[bytes, Text], pos: int = ..., - endpos: int = ...) -> List[Any]: ... - def finditer(self, string: _AnyStr2, pos: int = ..., - endpos: int = ...) -> Iterator[Match[_AnyStr2]]: ... - + def findall(self, string: Union[bytes, Text], pos: int = ..., endpos: int = ...) -> List[Any]: ... + def finditer(self, string: _AnyStr2, pos: int = ..., endpos: int = ...) -> Iterator[Match[_AnyStr2]]: ... @overload - def sub(self, repl: _AnyStr2, string: _AnyStr2, - count: int = ...) -> _AnyStr2: ... + def sub(self, repl: _AnyStr2, string: _AnyStr2, count: int = ...) -> _AnyStr2: ... @overload - def sub(self, repl: Callable[[Match[_AnyStr2]], _AnyStr2], string: _AnyStr2, - count: int = ...) -> _AnyStr2: ... - + def sub(self, repl: Callable[[Match[_AnyStr2]], _AnyStr2], string: _AnyStr2, count: int = ...) -> _AnyStr2: ... @overload - def subn(self, repl: _AnyStr2, string: _AnyStr2, - count: int = ...) -> Tuple[_AnyStr2, int]: ... + def subn(self, repl: _AnyStr2, string: _AnyStr2, count: int = ...) -> Tuple[_AnyStr2, int]: ... @overload - def subn(self, repl: Callable[[Match[_AnyStr2]], _AnyStr2], string: _AnyStr2, - count: int = ...) -> Tuple[_AnyStr2, int]: ... + def subn(self, repl: Callable[[Match[_AnyStr2]], _AnyStr2], string: _AnyStr2, count: int = ...) -> Tuple[_AnyStr2, int]: ... # Functions def get_type_hints( - obj: Callable[..., Any], globalns: Optional[Dict[Text, Any]] = ..., localns: Optional[Dict[Text, Any]] = ..., + obj: Callable[..., Any], globalns: Optional[Dict[Text, Any]] = ..., localns: Optional[Dict[Text, Any]] = ... ) -> None: ... - @overload def cast(tp: Type[_T], obj: Any) -> _T: ... @overload @@ -473,13 +466,9 @@ # NamedTuple is special-cased in the type checker class NamedTuple(Tuple[Any, ...]): _fields: Tuple[str, ...] - - def __init__(self, typename: Text, fields: Iterable[Tuple[Text, Any]] = ..., - **kwargs: Any) -> None: ... - + def __init__(self, typename: Text, fields: Iterable[Tuple[Text, Any]] = ..., **kwargs: Any) -> None: ... @classmethod def _make(cls: Type[_T], iterable: Iterable[Any]) -> _T: ... - def _asdict(self) -> Dict[str, Any]: ... def _replace(self: _T, **kwargs: Any) -> _T: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/unittest.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/unittest.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/unittest.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/unittest.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,24 +1,36 @@ -# Stubs for unittest - -# Based on http://docs.python.org/2.7/library/unittest.html - -from typing import (Any, Callable, Dict, FrozenSet, Iterable, Iterator, - List, Mapping, NoReturn, Optional, overload, Pattern, - Sequence, Set, Text, TextIO, Tuple, Type, TypeVar, Union) -from abc import abstractmethod, ABCMeta import datetime import types +from abc import ABCMeta, abstractmethod +from typing import ( + Any, + Callable, + Dict, + FrozenSet, + Iterable, + Iterator, + List, + Mapping, + NoReturn, + Optional, + Pattern, + Sequence, + Set, + Text, + TextIO, + Tuple, + Type, + TypeVar, + Union, + overload, +) -_T = TypeVar('_T') -_FT = TypeVar('_FT') +_T = TypeVar("_T") +_FT = TypeVar("_FT") _ExceptionType = Union[Type[BaseException], Tuple[Type[BaseException], ...]] _Regexp = Union[Text, Pattern[Text]] -_SysExcInfoType = Union[ - Tuple[Type[BaseException], BaseException, types.TracebackType], - Tuple[None, None, None], -] +_SysExcInfoType = Union[Tuple[Type[BaseException], BaseException, types.TracebackType], Tuple[None, None, None]] class Testable(metaclass=ABCMeta): @abstractmethod @@ -40,7 +52,6 @@ testsRun: int buffer: bool failfast: bool - def wasSuccessful(self) -> bool: ... def stop(self) -> None: ... def startTest(self, test: TestCase) -> None: ... @@ -83,98 +94,76 @@ def assert_(self, expr: Any, msg: object = ...) -> None: ... def failUnless(self, expr: Any, msg: object = ...) -> None: ... def assertTrue(self, expr: Any, msg: object = ...) -> None: ... - def assertEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertEquals(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def failUnlessEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertNotEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertNotEquals(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def failIfEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... - @overload - def assertAlmostEqual(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - @overload - def assertAlmostEqual(self, first: float, second: float, *, - msg: Any = ..., delta: float = ...) -> None: ... - @overload - def assertAlmostEqual(self, first: datetime.datetime, - second: datetime.datetime, *, - msg: Any = ..., delta: datetime.timedelta = ...) -> None: ... - @overload - def assertAlmostEquals(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - @overload - def assertAlmostEquals(self, first: float, second: float, *, - msg: Any = ..., delta: float = ...) -> None: ... - @overload - def assertAlmostEquals(self, first: datetime.datetime, - second: datetime.datetime, *, - msg: Any = ..., delta: datetime.timedelta = ...) -> None: ... - def failUnlessAlmostEqual(self, first: float, second: float, places: int = ..., - msg: object = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: float, second: float, *, - msg: Any = ..., delta: float = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: datetime.datetime, - second: datetime.datetime, *, - msg: Any = ..., delta: datetime.timedelta = ...) -> None: ... - @overload - def assertNotAlmostEquals(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - @overload - def assertNotAlmostEquals(self, first: float, second: float, *, - msg: Any = ..., delta: float = ...) -> None: ... - @overload - def assertNotAlmostEquals(self, first: datetime.datetime, - second: datetime.datetime, *, - msg: Any = ..., delta: datetime.timedelta = ...) -> None: ... - def failIfAlmostEqual(self, first: float, second: float, places: int = ..., - msg: object = ..., - delta: float = ...) -> None: ... - def assertGreater(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertGreaterEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertMultiLineEqual(self, first: str, second: str, - msg: object = ...) -> None: ... - def assertSequenceEqual(self, first: Sequence[Any], second: Sequence[Any], - msg: object = ..., seq_type: type = ...) -> None: ... - def assertListEqual(self, first: List[Any], second: List[Any], - msg: object = ...) -> None: ... - def assertTupleEqual(self, first: Tuple[Any, ...], second: Tuple[Any, ...], - msg: object = ...) -> None: ... - def assertSetEqual(self, first: Union[Set[Any], FrozenSet[Any]], - second: Union[Set[Any], FrozenSet[Any]], msg: object = ...) -> None: ... - def assertDictEqual(self, first: Dict[Any, Any], second: Dict[Any, Any], - msg: object = ...) -> None: ... - def assertLess(self, first: Any, second: Any, - msg: object = ...) -> None: ... - def assertLessEqual(self, first: Any, second: Any, - msg: object = ...) -> None: ... + def assertEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertEquals(self, first: Any, second: Any, msg: object = ...) -> None: ... + def failUnlessEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertNotEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertNotEquals(self, first: Any, second: Any, msg: object = ...) -> None: ... + def failIfEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... + @overload + def assertAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + @overload + def assertAlmostEqual(self, first: float, second: float, *, msg: Any = ..., delta: float = ...) -> None: ... + @overload + def assertAlmostEqual( + self, first: datetime.datetime, second: datetime.datetime, *, msg: Any = ..., delta: datetime.timedelta = ... + ) -> None: ... + @overload + def assertAlmostEquals(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + @overload + def assertAlmostEquals(self, first: float, second: float, *, msg: Any = ..., delta: float = ...) -> None: ... + @overload + def assertAlmostEquals( + self, first: datetime.datetime, second: datetime.datetime, *, msg: Any = ..., delta: datetime.timedelta = ... + ) -> None: ... + def failUnlessAlmostEqual(self, first: float, second: float, places: int = ..., msg: object = ...) -> None: ... + @overload + def assertNotAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + @overload + def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ..., delta: float = ...) -> None: ... + @overload + def assertNotAlmostEqual( + self, first: datetime.datetime, second: datetime.datetime, *, msg: Any = ..., delta: datetime.timedelta = ... + ) -> None: ... + @overload + def assertNotAlmostEquals(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + @overload + def assertNotAlmostEquals(self, first: float, second: float, *, msg: Any = ..., delta: float = ...) -> None: ... + @overload + def assertNotAlmostEquals( + self, first: datetime.datetime, second: datetime.datetime, *, msg: Any = ..., delta: datetime.timedelta = ... + ) -> None: ... + def failIfAlmostEqual( + self, first: float, second: float, places: int = ..., msg: object = ..., delta: float = ... + ) -> None: ... + def assertGreater(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertGreaterEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertMultiLineEqual(self, first: str, second: str, msg: object = ...) -> None: ... + def assertSequenceEqual( + self, first: Sequence[Any], second: Sequence[Any], msg: object = ..., seq_type: type = ... + ) -> None: ... + def assertListEqual(self, first: List[Any], second: List[Any], msg: object = ...) -> None: ... + def assertTupleEqual(self, first: Tuple[Any, ...], second: Tuple[Any, ...], msg: object = ...) -> None: ... + def assertSetEqual( + self, first: Union[Set[Any], FrozenSet[Any]], second: Union[Set[Any], FrozenSet[Any]], msg: object = ... + ) -> None: ... + def assertDictEqual(self, first: Dict[Any, Any], second: Dict[Any, Any], msg: object = ...) -> None: ... + def assertLess(self, first: Any, second: Any, msg: object = ...) -> None: ... + def assertLessEqual(self, first: Any, second: Any, msg: object = ...) -> None: ... @overload def assertRaises(self, exception: _ExceptionType, callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... @overload def assertRaises(self, exception: _ExceptionType) -> _AssertRaisesContext: ... @overload - def assertRaisesRegexp(self, exception: _ExceptionType, regexp: _Regexp, callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... + def assertRaisesRegexp( + self, exception: _ExceptionType, regexp: _Regexp, callable: Callable[..., Any], *args: Any, **kwargs: Any + ) -> None: ... @overload def assertRaisesRegexp(self, exception: _ExceptionType, regexp: _Regexp) -> _AssertRaisesContext: ... def assertRegexpMatches(self, text: Text, regexp: _Regexp, msg: object = ...) -> None: ... def assertNotRegexpMatches(self, text: Text, regexp: _Regexp, msg: object = ...) -> None: ... def assertItemsEqual(self, first: Iterable[Any], second: Iterable[Any], msg: object = ...) -> None: ... - def assertDictContainsSubset(self, - expected: Mapping[Any, Any], - actual: Mapping[Any, Any], - msg: object = ...) -> None: ... + def assertDictContainsSubset(self, expected: Mapping[Any, Any], actual: Mapping[Any, Any], msg: object = ...) -> None: ... def addTypeEqualityFunc(self, typeobj: type, function: Callable[..., None]) -> None: ... @overload def failUnlessRaises(self, exception: _ExceptionType, callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... @@ -182,20 +171,14 @@ def failUnlessRaises(self, exception: _ExceptionType) -> _AssertRaisesContext: ... def failIf(self, expr: Any, msg: object = ...) -> None: ... def assertFalse(self, expr: Any, msg: object = ...) -> None: ... - def assertIs(self, first: object, second: object, - msg: object = ...) -> None: ... - def assertIsNot(self, first: object, second: object, - msg: object = ...) -> None: ... + def assertIs(self, first: object, second: object, msg: object = ...) -> None: ... + def assertIsNot(self, first: object, second: object, msg: object = ...) -> None: ... def assertIsNone(self, expr: Any, msg: object = ...) -> None: ... def assertIsNotNone(self, expr: Any, msg: object = ...) -> None: ... - def assertIn(self, first: _T, second: Iterable[_T], - msg: object = ...) -> None: ... - def assertNotIn(self, first: _T, second: Iterable[_T], - msg: object = ...) -> None: ... - def assertIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], - msg: object = ...) -> None: ... - def assertNotIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], - msg: object = ...) -> None: ... + def assertIn(self, first: _T, second: Iterable[_T], msg: object = ...) -> None: ... + def assertNotIn(self, first: _T, second: Iterable[_T], msg: object = ...) -> None: ... + def assertIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: object = ...) -> None: ... + def assertNotIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: object = ...) -> None: ... def fail(self, msg: object = ...) -> NoReturn: ... def countTestCases(self) -> int: ... def defaultTestResult(self) -> TestResult: ... @@ -208,10 +191,13 @@ def _getAssertEqualityFunc(self, first: Any, second: Any) -> Callable[..., None]: ... # undocumented class FunctionTestCase(TestCase): - def __init__(self, testFunc: Callable[[], None], - setUp: Optional[Callable[[], None]] = ..., - tearDown: Optional[Callable[[], None]] = ..., - description: Optional[str] = ...) -> None: ... + def __init__( + self, + testFunc: Callable[[], None], + setUp: Optional[Callable[[], None]] = ..., + tearDown: Optional[Callable[[], None]] = ..., + description: Optional[str] = ..., + ) -> None: ... def debug(self) -> None: ... def countTestCases(self) -> int: ... @@ -228,16 +214,11 @@ testMethodPrefix: str sortTestMethodsUsing: Optional[Callable[[str, str], int]] suiteClass: Callable[[List[TestCase]], TestSuite] - def loadTestsFromTestCase(self, - testCaseClass: Type[TestCase]) -> TestSuite: ... - def loadTestsFromModule(self, module: types.ModuleType = ..., - use_load_tests: bool = ...) -> TestSuite: ... - def loadTestsFromName(self, name: str = ..., - module: Optional[types.ModuleType] = ...) -> TestSuite: ... - def loadTestsFromNames(self, names: List[str] = ..., - module: Optional[types.ModuleType] = ...) -> TestSuite: ... - def discover(self, start_dir: str, pattern: str = ..., - top_level_dir: Optional[str] = ...) -> TestSuite: ... + def loadTestsFromTestCase(self, testCaseClass: Type[TestCase]) -> TestSuite: ... + def loadTestsFromModule(self, module: types.ModuleType = ..., use_load_tests: bool = ...) -> TestSuite: ... + def loadTestsFromName(self, name: str = ..., module: Optional[types.ModuleType] = ...) -> TestSuite: ... + def loadTestsFromNames(self, names: List[str] = ..., module: Optional[types.ModuleType] = ...) -> TestSuite: ... + def discover(self, start_dir: str, pattern: str = ..., top_level_dir: Optional[str] = ...) -> TestSuite: ... def getTestCaseNames(self, testCaseClass: Type[TestCase] = ...) -> List[str]: ... defaultTestLoader: TestLoader @@ -249,14 +230,19 @@ def printErrorList(self, flavour: str, errors: List[Tuple[TestCase, str]]) -> None: ... # undocumented class TextTestRunner: - def __init__(self, stream: Optional[TextIO] = ..., descriptions: bool = ..., - verbosity: int = ..., failfast: bool = ..., buffer: bool = ..., - resultclass: Optional[Type[TestResult]] = ...) -> None: ... + def __init__( + self, + stream: Optional[TextIO] = ..., + descriptions: bool = ..., + verbosity: int = ..., + failfast: bool = ..., + buffer: bool = ..., + resultclass: Optional[Type[TestResult]] = ..., + ) -> None: ... def _makeResult(self) -> TestResult: ... def run(self, test: Testable) -> TestResult: ... # undocumented -class SkipTest(Exception): - ... +class SkipTest(Exception): ... # TODO precise types def skipUnless(condition: Any, reason: Union[str, unicode]) -> Any: ... @@ -269,15 +255,19 @@ result: TestResult def runTests(self) -> None: ... # undocumented -def main(module: Union[None, Text, types.ModuleType] = ..., defaultTest: Optional[str] = ..., - argv: Optional[Sequence[str]] = ..., - testRunner: Union[Type[TextTestRunner], TextTestRunner, None] = ..., - testLoader: TestLoader = ..., exit: bool = ..., verbosity: int = ..., - failfast: Optional[bool] = ..., catchbreak: Optional[bool] = ..., - buffer: Optional[bool] = ...) -> TestProgram: ... - +def main( + module: Union[None, Text, types.ModuleType] = ..., + defaultTest: Optional[str] = ..., + argv: Optional[Sequence[str]] = ..., + testRunner: Union[Type[TextTestRunner], TextTestRunner, None] = ..., + testLoader: TestLoader = ..., + exit: bool = ..., + verbosity: int = ..., + failfast: Optional[bool] = ..., + catchbreak: Optional[bool] = ..., + buffer: Optional[bool] = ..., +) -> TestProgram: ... def load_tests(loader: TestLoader, tests: TestSuite, pattern: Optional[Text]) -> TestSuite: ... - def installHandler() -> None: ... def registerResult(result: TestResult) -> None: ... def removeResult(result: TestResult) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/urllib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/urllib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/urllib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/urllib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any, AnyStr, IO, List, Mapping, Sequence, Text, Tuple, TypeVar, Union +from typing import IO, Any, AnyStr, List, Mapping, Sequence, Text, Tuple, TypeVar, Union def url2pathname(pathname: AnyStr) -> AnyStr: ... def pathname2url(pathname: AnyStr) -> AnyStr: ... @@ -126,7 +126,6 @@ def quote(s: AnyStr, safe: Text = ...) -> AnyStr: ... def quote_plus(s: AnyStr, safe: Text = ...) -> AnyStr: ... def urlencode(query: Union[Sequence[Tuple[Any, Any]], Mapping[Any, Any]], doseq=...) -> str: ... - def getproxies() -> Mapping[str, str]: ... def proxy_bypass(host: str) -> Any: ... # Undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/urlparse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/urlparse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/urlparse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/urlparse.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ -# Stubs for urlparse (Python 2) - -from typing import AnyStr, Dict, List, NamedTuple, Tuple, Sequence, Union, overload, Optional +from typing import AnyStr, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union, overload _String = Union[str, unicode] @@ -17,50 +15,47 @@ class ResultMixin(object): @property - def username(self) -> Optional[_String]: ... + def username(self) -> Optional[str]: ... @property - def password(self) -> Optional[_String]: ... + def password(self) -> Optional[str]: ... @property - def hostname(self) -> Optional[_String]: ... + def hostname(self) -> Optional[str]: ... @property def port(self) -> Optional[int]: ... class _SplitResult(NamedTuple): - scheme: _String - netloc: _String - path: _String - query: _String - fragment: _String + scheme: str + netloc: str + path: str + query: str + fragment: str + class SplitResult(_SplitResult, ResultMixin): - def geturl(self) -> _String: ... + def geturl(self) -> str: ... class _ParseResult(NamedTuple): - scheme: _String - netloc: _String - path: _String - params: _String - query: _String - fragment: _String + scheme: str + netloc: str + path: str + params: str + query: str + fragment: str + class ParseResult(_ParseResult, ResultMixin): def geturl(self) -> _String: ... -def urlparse(url: _String, scheme: _String = ..., - allow_fragments: bool = ...) -> ParseResult: ... -def urlsplit(url: _String, scheme: _String = ..., - allow_fragments: bool = ...) -> SplitResult: ... +def urlparse(url: _String, scheme: _String = ..., allow_fragments: bool = ...) -> ParseResult: ... +def urlsplit(url: _String, scheme: _String = ..., allow_fragments: bool = ...) -> SplitResult: ... @overload -def urlunparse(data: Tuple[_String, _String, _String, _String, _String, _String]) -> _String: ... +def urlunparse(data: Tuple[AnyStr, AnyStr, AnyStr, AnyStr, AnyStr, AnyStr]) -> AnyStr: ... @overload -def urlunparse(data: Sequence[_String]) -> _String: ... +def urlunparse(data: Sequence[AnyStr]) -> AnyStr: ... @overload -def urlunsplit(data: Tuple[_String, _String, _String, _String, _String]) -> _String: ... +def urlunsplit(data: Tuple[AnyStr, AnyStr, AnyStr, AnyStr, AnyStr]) -> AnyStr: ... @overload -def urlunsplit(data: Sequence[_String]) -> _String: ... -def urljoin(base: _String, url: _String, - allow_fragments: bool = ...) -> _String: ... +def urlunsplit(data: Sequence[AnyStr]) -> AnyStr: ... +def urljoin(base: AnyStr, url: AnyStr, allow_fragments: bool = ...) -> AnyStr: ... def urldefrag(url: AnyStr) -> Tuple[AnyStr, AnyStr]: ... def unquote(s: AnyStr) -> AnyStr: ... -def parse_qs(qs: AnyStr, keep_blank_values: bool = ..., - strict_parsing: bool = ...) -> Dict[AnyStr, List[AnyStr]]: ... -def parse_qsl(qs: AnyStr, keep_blank_values: int = ..., - strict_parsing: bool = ...) -> List[Tuple[AnyStr, AnyStr]]: ... +def parse_qs(qs: AnyStr, keep_blank_values: bool = ..., strict_parsing: bool = ...) -> Dict[AnyStr, List[AnyStr]]: ... +def parse_qsl(qs: AnyStr, keep_blank_values: int = ..., strict_parsing: bool = ...) -> List[Tuple[AnyStr, AnyStr]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/_winreg.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/_winreg.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2/_winreg.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2/_winreg.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,10 @@ - import sys - -from typing import Optional, Type, Union, Tuple, Any from types import TracebackType +from typing import Any, Optional, Tuple, Type, Union _KeyType = Union[HKEYType, int] -def CloseKey(__hkey: _KeyType): ... +def CloseKey(__hkey: _KeyType) -> None: ... def ConnectRegistry(__computer_name: Optional[str], __key: _KeyType) -> HKEYType: ... def CreateKey(__key: _KeyType, __sub_key: Optional[str]) -> HKEYType: ... def CreateKeyEx(key: _KeyType, sub_key: Optional[str], reserved: int = ..., access: int = ...) -> HKEYType: ... @@ -25,7 +23,9 @@ def QueryValueEx(__key: _KeyType, __name: str) -> Tuple[Any, int]: ... def SaveKey(__key: _KeyType, __file_name: str) -> None: ... def SetValue(__key: _KeyType, __sub_key: str, __type: int, __value: str) -> None: ... -def SetValueEx(__key: _KeyType, __value_name: str, __reserved: Any, __type: int, __value: str) -> None: ... # reserved is ignored +def SetValueEx( + __key: _KeyType, __value_name: Optional[str], __reserved: Any, __type: int, __value: Union[str, int] +) -> None: ... # reserved is ignored def DisableReflectionKey(__key: _KeyType) -> None: ... def EnableReflectionKey(__key: _KeyType) -> None: ... def QueryReflectionKey(__key: _KeyType) -> bool: ... @@ -60,9 +60,6 @@ REG_LINK: int REG_MULTI_SZ: int REG_NONE: int -if sys.version_info >= (3, 6): - REG_QWORD: int - REG_QWORD_LITTLE_ENDIAN: int REG_RESOURCE_LIST: int REG_FULL_RESOURCE_DESCRIPTOR: int REG_RESOURCE_REQUIREMENTS_LIST: int @@ -93,7 +90,8 @@ def __bool__(self) -> bool: ... def __int__(self) -> int: ... def __enter__(self) -> HKEYType: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> Optional[bool]: ... - + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... def Close(self) -> None: ... def Detach(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/aifc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/aifc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/aifc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/aifc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,7 @@ -from typing import Union, IO, Optional, Type, NamedTuple, List, Tuple, Any, Text, overload -from typing_extensions import Literal -from types import TracebackType import sys +from types import TracebackType +from typing import IO, Any, List, NamedTuple, Optional, Text, Tuple, Type, Union, overload +from typing_extensions import Literal class Error(Exception): ... @@ -20,8 +20,9 @@ def __init__(self, f: _File) -> None: ... if sys.version_info >= (3, 4): def __enter__(self) -> Aifc_read: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def initfp(self, file: IO[bytes]) -> None: ... def getfp(self) -> IO[bytes]: ... def rewind(self) -> None: ... @@ -44,8 +45,9 @@ def __del__(self) -> None: ... if sys.version_info >= (3, 4): def __enter__(self) -> Aifc_write: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def initfp(self, file: IO[bytes]) -> None: ... def aiff(self) -> None: ... def aifc(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/antigravity.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/antigravity.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/antigravity.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/antigravity.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,3 @@ - import sys if sys.version_info >= (3, 0): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/argparse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/argparse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/argparse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/argparse.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,28 @@ +import sys from typing import ( - Any, Callable, Dict, Generator, Iterable, List, IO, NoReturn, Optional, - Pattern, Protocol, Sequence, Text, Tuple, Type, Union, TypeVar, overload + IO, + Any, + Callable, + Dict, + Generator, + Iterable, + List, + NoReturn, + Optional, + Pattern, + Protocol, + Sequence, + Text, + Tuple, + Type, + TypeVar, + Union, + overload, ) -import sys -_T = TypeVar('_T') -_ActionT = TypeVar('_ActionT', bound=Action) -_N = TypeVar('_N') +_T = TypeVar("_T") +_ActionT = TypeVar("_ActionT", bound=Action) +_N = TypeVar("_N") if sys.version_info >= (3,): _Text = str @@ -22,6 +38,8 @@ _UNRECOGNIZED_ARGS_ATTR: str # undocumented class ArgumentError(Exception): + argument_name: Optional[str] + message: str def __init__(self, argument: Optional[Action], message: str) -> None: ... # undocumented @@ -44,27 +62,29 @@ _defaults: Dict[str, Any] _negative_number_matcher: Pattern[str] _has_negative_number_optionals: List[bool] - - def __init__(self, description: Optional[Text], prefix_chars: Text, - argument_default: Optional[Text], conflict_handler: Text) -> None: ... + def __init__( + self, description: Optional[Text], prefix_chars: Text, argument_default: Optional[Text], conflict_handler: Text + ) -> None: ... def register(self, registry_name: Text, value: Any, object: Any) -> None: ... def _registry_get(self, registry_name: Text, value: Any, default: Any = ...) -> Any: ... def set_defaults(self, **kwargs: Any) -> None: ... def get_default(self, dest: Text) -> Any: ... - def add_argument(self, - *name_or_flags: Text, - action: Union[Text, Type[Action]] = ..., - nargs: Union[int, Text] = ..., - const: Any = ..., - default: Any = ..., - type: Union[Callable[[Text], _T], Callable[[str], _T], FileType] = ..., - choices: Iterable[_T] = ..., - required: bool = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., - dest: Optional[Text] = ..., - version: Text = ..., - **kwargs: Any) -> Action: ... + def add_argument( + self, + *name_or_flags: Text, + action: Union[Text, Type[Action]] = ..., + nargs: Union[int, Text] = ..., + const: Any = ..., + default: Any = ..., + type: Union[Callable[[Text], _T], Callable[[str], _T], FileType] = ..., + choices: Iterable[_T] = ..., + required: bool = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + dest: Optional[Text] = ..., + version: Text = ..., + **kwargs: Any, + ) -> Action: ... def add_argument_group(self, *args: Any, **kwargs: Any) -> _ArgumentGroup: ... def add_mutually_exclusive_group(self, **kwargs: Any) -> _MutuallyExclusiveGroup: ... def _add_action(self, action: _ActionT) -> _ActionT: ... @@ -98,48 +118,53 @@ _subparsers: Optional[_ArgumentGroup] if sys.version_info >= (3, 9): - def __init__(self, - prog: Optional[str] = ..., - usage: Optional[str] = ..., - description: Optional[str] = ..., - epilog: Optional[str] = ..., - parents: Sequence[ArgumentParser] = ..., - formatter_class: _FormatterClass = ..., - prefix_chars: str = ..., - fromfile_prefix_chars: Optional[str] = ..., - argument_default: Optional[str] = ..., - conflict_handler: str = ..., - add_help: bool = ..., - allow_abbrev: bool = ..., - exit_on_error: bool = ...) -> None: ... + def __init__( + self, + prog: Optional[str] = ..., + usage: Optional[str] = ..., + description: Optional[str] = ..., + epilog: Optional[str] = ..., + parents: Sequence[ArgumentParser] = ..., + formatter_class: _FormatterClass = ..., + prefix_chars: str = ..., + fromfile_prefix_chars: Optional[str] = ..., + argument_default: Optional[str] = ..., + conflict_handler: str = ..., + add_help: bool = ..., + allow_abbrev: bool = ..., + exit_on_error: bool = ..., + ) -> None: ... elif sys.version_info >= (3, 5): - def __init__(self, - prog: Optional[str] = ..., - usage: Optional[str] = ..., - description: Optional[str] = ..., - epilog: Optional[str] = ..., - parents: Sequence[ArgumentParser] = ..., - formatter_class: _FormatterClass = ..., - prefix_chars: str = ..., - fromfile_prefix_chars: Optional[str] = ..., - argument_default: Optional[str] = ..., - conflict_handler: str = ..., - add_help: bool = ..., - allow_abbrev: bool = ...) -> None: ... + def __init__( + self, + prog: Optional[str] = ..., + usage: Optional[str] = ..., + description: Optional[str] = ..., + epilog: Optional[str] = ..., + parents: Sequence[ArgumentParser] = ..., + formatter_class: _FormatterClass = ..., + prefix_chars: str = ..., + fromfile_prefix_chars: Optional[str] = ..., + argument_default: Optional[str] = ..., + conflict_handler: str = ..., + add_help: bool = ..., + allow_abbrev: bool = ..., + ) -> None: ... else: - def __init__(self, - prog: Optional[Text] = ..., - usage: Optional[Text] = ..., - description: Optional[Text] = ..., - epilog: Optional[Text] = ..., - parents: Sequence[ArgumentParser] = ..., - formatter_class: _FormatterClass = ..., - prefix_chars: Text = ..., - fromfile_prefix_chars: Optional[Text] = ..., - argument_default: Optional[Text] = ..., - conflict_handler: Text = ..., - add_help: bool = ...) -> None: ... - + def __init__( + self, + prog: Optional[Text] = ..., + usage: Optional[Text] = ..., + description: Optional[Text] = ..., + epilog: Optional[Text] = ..., + parents: Sequence[ArgumentParser] = ..., + formatter_class: _FormatterClass = ..., + prefix_chars: Text = ..., + fromfile_prefix_chars: Optional[Text] = ..., + argument_default: Optional[Text] = ..., + conflict_handler: Text = ..., + add_help: bool = ..., + ) -> None: ... # The type-ignores in these overloads should be temporary. See: # https://github.com/python/typeshed/pull/2643#issuecomment-442280277 @overload @@ -152,44 +177,52 @@ def parse_args(self, *, namespace: None) -> Namespace: ... # type: ignore @overload def parse_args(self, *, namespace: _N) -> _N: ... - if sys.version_info >= (3, 7): - def add_subparsers(self, *, title: str = ..., - description: Optional[str] = ..., - prog: str = ..., - parser_class: Type[ArgumentParser] = ..., - action: Type[Action] = ..., - option_string: str = ..., - dest: Optional[str] = ..., - required: bool = ..., - help: Optional[str] = ..., - metavar: Optional[str] = ...) -> _SubParsersAction: ... + def add_subparsers( + self, + *, + title: str = ..., + description: Optional[str] = ..., + prog: str = ..., + parser_class: Type[ArgumentParser] = ..., + action: Type[Action] = ..., + option_string: str = ..., + dest: Optional[str] = ..., + required: bool = ..., + help: Optional[str] = ..., + metavar: Optional[str] = ..., + ) -> _SubParsersAction: ... else: - def add_subparsers(self, *, title: Text = ..., - description: Optional[Text] = ..., - prog: Text = ..., - parser_class: Type[ArgumentParser] = ..., - action: Type[Action] = ..., - option_string: Text = ..., - dest: Optional[Text] = ..., - help: Optional[Text] = ..., - metavar: Optional[Text] = ...) -> _SubParsersAction: ... - + def add_subparsers( + self, + *, + title: Text = ..., + description: Optional[Text] = ..., + prog: Text = ..., + parser_class: Type[ArgumentParser] = ..., + action: Type[Action] = ..., + option_string: Text = ..., + dest: Optional[Text] = ..., + help: Optional[Text] = ..., + metavar: Optional[Text] = ..., + ) -> _SubParsersAction: ... def print_usage(self, file: Optional[IO[str]] = ...) -> None: ... def print_help(self, file: Optional[IO[str]] = ...) -> None: ... def format_usage(self) -> str: ... def format_help(self) -> str: ... - def parse_known_args(self, args: Optional[Sequence[Text]] = ..., - namespace: Optional[Namespace] = ...) -> Tuple[Namespace, List[str]]: ... + def parse_known_args( + self, args: Optional[Sequence[Text]] = ..., namespace: Optional[Namespace] = ... + ) -> Tuple[Namespace, List[str]]: ... def convert_arg_line_to_args(self, arg_line: Text) -> List[str]: ... def exit(self, status: int = ..., message: Optional[Text] = ...) -> NoReturn: ... def error(self, message: Text) -> NoReturn: ... if sys.version_info >= (3, 7): - def parse_intermixed_args(self, args: Optional[Sequence[str]] = ..., - namespace: Optional[Namespace] = ...) -> Namespace: ... - def parse_known_intermixed_args(self, - args: Optional[Sequence[str]] = ..., - namespace: Optional[Namespace] = ...) -> Tuple[Namespace, List[str]]: ... + def parse_intermixed_args( + self, args: Optional[Sequence[str]] = ..., namespace: Optional[Namespace] = ... + ) -> Namespace: ... + def parse_known_intermixed_args( + self, args: Optional[Sequence[str]] = ..., namespace: Optional[Namespace] = ... + ) -> Tuple[Namespace, List[str]]: ... # undocumented def _get_optional_actions(self) -> List[Action]: ... def _get_positional_actions(self) -> List[Action]: ... @@ -220,21 +253,25 @@ _whitespace_matcher: Pattern[str] _long_break_matcher: Pattern[str] _Section: Type[Any] # Nested class - def __init__(self, prog: Text, indent_increment: int = ..., - max_help_position: int = ..., - width: Optional[int] = ...) -> None: ... + def __init__( + self, prog: Text, indent_increment: int = ..., max_help_position: int = ..., width: Optional[int] = ... + ) -> None: ... def _indent(self) -> None: ... def _dedent(self) -> None: ... def _add_item(self, func: Callable[..., _Text], args: Iterable[Any]) -> None: ... def start_section(self, heading: Optional[Text]) -> None: ... def end_section(self) -> None: ... def add_text(self, text: Optional[Text]) -> None: ... - def add_usage(self, usage: Text, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[Text] = ...) -> None: ... + def add_usage( + self, usage: Text, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[Text] = ... + ) -> None: ... def add_argument(self, action: Action) -> None: ... def add_arguments(self, actions: Iterable[Action]) -> None: ... def format_help(self) -> _Text: ... def _join_parts(self, part_strings: Iterable[Text]) -> _Text: ... - def _format_usage(self, usage: Text, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[Text]) -> _Text: ... + def _format_usage( + self, usage: Text, actions: Iterable[Action], groups: Iterable[_ArgumentGroup], prefix: Optional[Text] + ) -> _Text: ... def _format_actions_usage(self, actions: Iterable[Action], groups: Iterable[_ArgumentGroup]) -> _Text: ... def _format_text(self, text: Text) -> _Text: ... def _format_action(self, action: Action) -> _Text: ... @@ -252,6 +289,7 @@ class RawDescriptionHelpFormatter(HelpFormatter): ... class RawTextHelpFormatter(RawDescriptionHelpFormatter): ... class ArgumentDefaultsHelpFormatter(HelpFormatter): ... + if sys.version_info >= (3,): class MetavarTypeHelpFormatter(HelpFormatter): ... @@ -266,21 +304,26 @@ required: bool help: Optional[_Text] metavar: Optional[Union[_Text, Tuple[_Text, ...]]] - - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - nargs: Optional[Union[int, Text]] = ..., - const: Optional[_T] = ..., - default: Union[_T, str, None] = ..., - type: Optional[Union[Callable[[Text], _T], Callable[[str], _T], FileType]] = ..., - choices: Optional[Iterable[_T]] = ..., - required: bool = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ...) -> None: ... - def __call__(self, parser: ArgumentParser, namespace: Namespace, - values: Union[Text, Sequence[Any], None], - option_string: Optional[Text] = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + dest: Text, + nargs: Optional[Union[int, Text]] = ..., + const: Optional[_T] = ..., + default: Union[_T, str, None] = ..., + type: Optional[Union[Callable[[Text], _T], Callable[[str], _T], FileType]] = ..., + choices: Optional[Iterable[_T]] = ..., + required: bool = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + ) -> None: ... + def __call__( + self, + parser: ArgumentParser, + namespace: Namespace, + values: Union[Text, Sequence[Any], None], + option_string: Optional[Text] = ..., + ) -> None: ... if sys.version_info >= (3, 9): def format_usage(self) -> str: ... @@ -290,7 +333,6 @@ self, option_strings: Sequence[str], dest: str, - const: None = ..., # unused in implementation default: Union[_T, str, None] = ..., type: Optional[Union[Callable[[Text], _T], Callable[[str], _T], FileType]] = ..., choices: Optional[Iterable[_T]] = ..., @@ -312,21 +354,20 @@ if sys.version_info >= (3,): _encoding: Optional[str] _errors: Optional[str] - def __init__(self, mode: str = ..., bufsize: int = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> None: ... + def __init__( + self, mode: str = ..., bufsize: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ... + ) -> None: ... else: - def __init__(self, - mode: Text = ..., bufsize: Optional[int] = ...) -> None: ... + def __init__(self, mode: Text = ..., bufsize: Optional[int] = ...) -> None: ... def __call__(self, string: Text) -> IO[Any]: ... # undocumented class _ArgumentGroup(_ActionsContainer): title: Optional[_Text] _group_actions: List[Action] - def __init__(self, container: _ActionsContainer, - title: Optional[Text] = ..., - description: Optional[Text] = ..., **kwargs: Any) -> None: ... + def __init__( + self, container: _ActionsContainer, title: Optional[Text] = ..., description: Optional[Text] = ..., **kwargs: Any + ) -> None: ... # undocumented class _MutuallyExclusiveGroup(_ArgumentGroup): @@ -339,73 +380,68 @@ # undocumented class _StoreConstAction(Action): - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - const: Any, - default: Any = ..., - required: bool = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + dest: Text, + const: Any, + default: Any = ..., + required: bool = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + ) -> None: ... # undocumented class _StoreTrueAction(_StoreConstAction): - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - default: bool = ..., - required: bool = ..., - help: Optional[Text] = ...) -> None: ... + def __init__( + self, option_strings: Sequence[Text], dest: Text, default: bool = ..., required: bool = ..., help: Optional[Text] = ... + ) -> None: ... # undocumented class _StoreFalseAction(_StoreConstAction): - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - default: bool = ..., - required: bool = ..., - help: Optional[Text] = ...) -> None: ... + def __init__( + self, option_strings: Sequence[Text], dest: Text, default: bool = ..., required: bool = ..., help: Optional[Text] = ... + ) -> None: ... # undocumented class _AppendAction(Action): ... # undocumented class _AppendConstAction(Action): - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - const: Any, - default: Any = ..., - required: bool = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + dest: Text, + const: Any, + default: Any = ..., + required: bool = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + ) -> None: ... # undocumented class _CountAction(Action): - def __init__(self, - option_strings: Sequence[Text], - dest: Text, - default: Any = ..., - required: bool = ..., - help: Optional[Text] = ...) -> None: ... + def __init__( + self, option_strings: Sequence[Text], dest: Text, default: Any = ..., required: bool = ..., help: Optional[Text] = ... + ) -> None: ... # undocumented class _HelpAction(Action): - def __init__(self, - option_strings: Sequence[Text], - dest: Text = ..., - default: Text = ..., - help: Optional[Text] = ...) -> None: ... + def __init__( + self, option_strings: Sequence[Text], dest: Text = ..., default: Text = ..., help: Optional[Text] = ... + ) -> None: ... # undocumented class _VersionAction(Action): version: Optional[_Text] - def __init__(self, - option_strings: Sequence[Text], - version: Optional[Text] = ..., - dest: Text = ..., - default: Text = ..., - help: Text = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + version: Optional[Text] = ..., + dest: Text = ..., + default: Text = ..., + help: Text = ..., + ) -> None: ... # undocumented class _SubParsersAction(Action): @@ -416,22 +452,26 @@ choices: Dict[_Text, ArgumentParser] _choices_actions: List[Action] if sys.version_info >= (3, 7): - def __init__(self, - option_strings: Sequence[Text], - prog: Text, - parser_class: Type[ArgumentParser], - dest: Text = ..., - required: bool = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + prog: Text, + parser_class: Type[ArgumentParser], + dest: Text = ..., + required: bool = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + ) -> None: ... else: - def __init__(self, - option_strings: Sequence[Text], - prog: Text, - parser_class: Type[ArgumentParser], - dest: Text = ..., - help: Optional[Text] = ..., - metavar: Optional[Union[Text, Tuple[Text, ...]]] = ...) -> None: ... + def __init__( + self, + option_strings: Sequence[Text], + prog: Text, + parser_class: Type[ArgumentParser], + dest: Text = ..., + help: Optional[Text] = ..., + metavar: Optional[Union[Text, Tuple[Text, ...]]] = ..., + ) -> None: ... # TODO: Type keyword args properly. def add_parser(self, name: Text, **kwargs: Any) -> ArgumentParser: ... def _get_subactions(self) -> List[Action]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/array.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/array.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/array.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/array.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,18 +1,13 @@ -# Stubs for array - -# Based on http://docs.python.org/3.6/library/array.html - import sys -from typing import (Any, BinaryIO, Generic, Iterable, Iterator, List, MutableSequence, - overload, Text, Tuple, TypeVar, Union) +from typing import Any, BinaryIO, Generic, Iterable, List, MutableSequence, Text, Tuple, TypeVar, Union, overload from typing_extensions import Literal -_IntTypeCode = Literal['b', 'B', 'h', 'H', 'i', 'I', 'l', 'L', 'q', 'Q'] -_FloatTypeCode = Literal['f', 'd'] -_UnicodeTypeCode = Literal['u'] +_IntTypeCode = Literal["b", "B", "h", "H", "i", "I", "l", "L", "q", "Q"] +_FloatTypeCode = Literal["f", "d"] +_UnicodeTypeCode = Literal["u"] _TypeCode = Union[_IntTypeCode, _FloatTypeCode, _UnicodeTypeCode] -_T = TypeVar('_T', int, float, Text) +_T = TypeVar("_T", int, float, Text) if sys.version_info >= (3,): typecodes: str @@ -21,17 +16,13 @@ typecode: _TypeCode itemsize: int @overload - def __init__(self: array[int], typecode: _IntTypeCode, - __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... + def __init__(self: array[int], typecode: _IntTypeCode, __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... @overload - def __init__(self: array[float], typecode: _FloatTypeCode, - __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... + def __init__(self: array[float], typecode: _FloatTypeCode, __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... @overload - def __init__(self: array[Text], typecode: _UnicodeTypeCode, - __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... + def __init__(self: array[Text], typecode: _UnicodeTypeCode, __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... @overload - def __init__(self, typecode: str, - __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... + def __init__(self, typecode: str, __initializer: Union[bytes, Iterable[_T]] = ...) -> None: ... def append(self, __v: _T) -> None: ... def buffer_info(self) -> Tuple[int, int]: ... def byteswap(self) -> None: ... @@ -59,19 +50,15 @@ if sys.version_info < (3, 9): def fromstring(self, __buffer: bytes) -> None: ... def tostring(self) -> bytes: ... - def __len__(self) -> int: ... - @overload def __getitem__(self, i: int) -> _T: ... @overload def __getitem__(self, s: slice) -> array[_T]: ... - @overload # type: ignore # Overrides MutableSequence def __setitem__(self, i: int, o: _T) -> None: ... @overload def __setitem__(self, s: slice, o: array[_T]) -> None: ... - def __delitem__(self, i: Union[int, slice]) -> None: ... def __add__(self, x: array[_T]) -> array[_T]: ... def __ge__(self, other: array[_T]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/asyncore.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/asyncore.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/asyncore.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/asyncore.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,7 @@ -from typing import Tuple, Union, Any, Dict, overload - import sys -from socket import SocketType -from typing import Optional from _typeshed import FileDescriptorLike +from socket import SocketType +from typing import Any, Dict, Optional, Tuple, Union, overload # cyclic dependence with asynchat _maptype = Dict[int, Any] @@ -22,7 +20,6 @@ def loop(timeout: float = ..., use_poll: bool = ..., map: Optional[_maptype] = ..., count: Optional[int] = ...) -> None: ... - # Not really subclass of socket.socket; it's only delegation. # It is not covariant to it. class dispatcher: @@ -34,7 +31,6 @@ closing: bool ignore_log_types: frozenset[str] socket: Optional[SocketType] - def __init__(self, sock: Optional[SocketType] = ..., map: Optional[_maptype] = ...) -> None: ... def add_channel(self, map: Optional[_maptype] = ...) -> None: ... def del_channel(self, map: Optional[_maptype] = ...) -> None: ... @@ -50,7 +46,6 @@ def send(self, data: bytes) -> int: ... def recv(self, buffer_size: int) -> bytes: ... def close(self) -> None: ... - def log(self, message: Any) -> None: ... def log_info(self, message: Any, type: str = ...) -> None: ... def handle_read_event(self) -> None: ... @@ -64,34 +59,26 @@ def handle_connect(self) -> None: ... def handle_accept(self) -> None: ... def handle_close(self) -> None: ... - if sys.version_info < (3, 5): # Historically, some methods were "imported" from `self.socket` by # means of `__getattr__`. This was long deprecated, and as of Python # 3.5 has been removed; simply call the relevant methods directly on # self.socket if necessary. - def detach(self) -> int: ... def fileno(self) -> int: ... - # return value is an address def getpeername(self) -> Any: ... def getsockname(self) -> Any: ... - @overload def getsockopt(self, level: int, optname: int, buflen: None = ...) -> int: ... @overload def getsockopt(self, level: int, optname: int, buflen: int) -> bytes: ... - def gettimeout(self) -> float: ... - def ioctl(self, control: object, - option: Tuple[int, int, int]) -> None: ... + def ioctl(self, control: object, option: Tuple[int, int, int]) -> None: ... # TODO the return value may be BinaryIO or TextIO, depending on mode - def makefile(self, mode: str = ..., buffering: int = ..., - encoding: str = ..., errors: str = ..., - newline: str = ...) -> Any: - ... - + def makefile( + self, mode: str = ..., buffering: int = ..., encoding: str = ..., errors: str = ..., newline: str = ... + ) -> Any: ... # return type is an address def recvfrom(self, bufsize: int, flags: int = ...) -> Any: ... def recvfrom_into(self, buffer: bytes, nbytes: int, flags: int = ...) -> Any: ... @@ -116,22 +103,17 @@ if sys.platform != "win32": class file_wrapper: fd: int - def __init__(self, fd: int) -> None: ... def recv(self, bufsize: int, flags: int = ...) -> bytes: ... def send(self, data: bytes, flags: int = ...) -> int: ... - @overload def getsockopt(self, level: int, optname: int, buflen: None = ...) -> int: ... @overload def getsockopt(self, level: int, optname: int, buflen: int) -> bytes: ... - def read(self, bufsize: int, flags: int = ...) -> bytes: ... def write(self, data: bytes, flags: int = ...) -> int: ... - def close(self) -> None: ... def fileno(self) -> int: ... - class file_dispatcher(dispatcher): def __init__(self, fd: FileDescriptorLike, map: Optional[_maptype] = ...) -> None: ... def set_file(self, fd: int) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/audioop.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/audioop.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/audioop.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/audioop.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any, Optional, Tuple +from typing import Optional, Tuple AdpcmState = Tuple[int, int] RatecvState = Tuple[int, Tuple[Tuple[int, int], ...]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/base64.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/base64.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/base64.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/base64.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for base64 - -from typing import IO, Optional, Text, Union import sys +from typing import IO, Optional, Union if sys.version_info < (3,): _encodable = Union[bytes, unicode] @@ -11,30 +9,29 @@ _decodable = Union[bytes, str] def b64encode(s: _encodable, altchars: Optional[bytes] = ...) -> bytes: ... -def b64decode(s: _decodable, altchars: Optional[bytes] = ..., - validate: bool = ...) -> bytes: ... +def b64decode(s: _decodable, altchars: Optional[bytes] = ..., validate: bool = ...) -> bytes: ... def standard_b64encode(s: _encodable) -> bytes: ... def standard_b64decode(s: _decodable) -> bytes: ... def urlsafe_b64encode(s: _encodable) -> bytes: ... def urlsafe_b64decode(s: _decodable) -> bytes: ... def b32encode(s: _encodable) -> bytes: ... -def b32decode(s: _decodable, casefold: bool = ..., - map01: Optional[bytes] = ...) -> bytes: ... +def b32decode(s: _decodable, casefold: bool = ..., map01: Optional[bytes] = ...) -> bytes: ... def b16encode(s: _encodable) -> bytes: ... def b16decode(s: _decodable, casefold: bool = ...) -> bytes: ... + if sys.version_info >= (3, 4): - def a85encode(b: _encodable, *, foldspaces: bool = ..., wrapcol: int = ..., - pad: bool = ..., adobe: bool = ...) -> bytes: ... - def a85decode(b: _decodable, *, foldspaces: bool = ..., - adobe: bool = ..., ignorechars: Union[str, bytes] = ...) -> bytes: ... + def a85encode(b: _encodable, *, foldspaces: bool = ..., wrapcol: int = ..., pad: bool = ..., adobe: bool = ...) -> bytes: ... + def a85decode(b: _decodable, *, foldspaces: bool = ..., adobe: bool = ..., ignorechars: Union[str, bytes] = ...) -> bytes: ... def b85encode(b: _encodable, pad: bool = ...) -> bytes: ... def b85decode(b: _decodable) -> bytes: ... def decode(input: IO[bytes], output: IO[bytes]) -> None: ... def encode(input: IO[bytes], output: IO[bytes]) -> None: ... + if sys.version_info >= (3,): def encodebytes(s: bytes) -> bytes: ... def decodebytes(s: bytes) -> bytes: ... + if sys.version_info < (3, 9): def encodestring(s: bytes) -> bytes: ... def decodestring(s: bytes) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/bdb.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/bdb.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/bdb.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/bdb.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,5 @@ - -from typing import Set, Dict, Iterable, Any, Callable, Mapping, Tuple, Type, SupportsInt, List, Union, TypeVar, Optional, IO -from types import FrameType, TracebackType, CodeType - +from types import CodeType, FrameType, TracebackType +from typing import IO, Any, Callable, Dict, Iterable, List, Mapping, Optional, Set, SupportsInt, Tuple, Type, TypeVar, Union _T = TypeVar("_T") _TraceDispatch = Callable[[FrameType, str, Any], Any] # TODO: Recursive type @@ -22,7 +20,6 @@ stopframe: Optional[FrameType] returnframe: Optional[FrameType] stoplineno: int - def __init__(self, skip: Optional[Iterable[str]] = ...) -> None: ... def canonic(self, filename: str) -> str: ... def reset(self) -> None: ... @@ -47,7 +44,9 @@ def set_trace(self, frame: Optional[FrameType] = ...) -> None: ... def set_continue(self) -> None: ... def set_quit(self) -> None: ... - def set_break(self, filename: str, lineno: int, temporary: bool = ..., cond: Optional[str] = ..., funcname: Optional[str] = ...) -> None: ... + def set_break( + self, filename: str, lineno: int, temporary: bool = ..., cond: Optional[str] = ..., funcname: Optional[str] = ... + ) -> None: ... def clear_break(self, filename: str, lineno: int) -> None: ... def clear_bpbynumber(self, arg: SupportsInt) -> None: ... def clear_all_file_breaks(self, filename: str) -> None: ... @@ -63,7 +62,9 @@ self, cmd: Union[str, CodeType], globals: Optional[Dict[str, Any]] = ..., locals: Optional[Mapping[str, Any]] = ... ) -> None: ... def runeval(self, expr: str, globals: Optional[Dict[str, Any]] = ..., locals: Optional[Mapping[str, Any]] = ...) -> None: ... - def runctx(self, cmd: Union[str, CodeType], globals: Optional[Dict[str, Any]], locals: Optional[Mapping[str, Any]]) -> None: ... + def runctx( + self, cmd: Union[str, CodeType], globals: Optional[Dict[str, Any]], locals: Optional[Mapping[str, Any]] + ) -> None: ... def runcall(self, __func: Callable[..., _T], *args: Any, **kwds: Any) -> Optional[_T]: ... class Breakpoint: @@ -82,8 +83,9 @@ ignore: int hits: int number: int - - def __init__(self, file: str, line: int, temporary: bool = ..., cond: Optional[str] = ..., funcname: Optional[str] = ...) -> None: ... + def __init__( + self, file: str, line: int, temporary: bool = ..., cond: Optional[str] = ..., funcname: Optional[str] = ... + ) -> None: ... def deleteMe(self) -> None: ... def enable(self) -> None: ... def disable(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/binascii.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/binascii.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/binascii.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/binascii.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,5 @@ -# Stubs for binascii - -# Based on http://docs.python.org/3.2/library/binascii.html - import sys -from typing import Union, Text +from typing import Text, Union if sys.version_info < (3,): # Python 2 accepts unicode ascii pretty much everywhere. @@ -16,15 +12,21 @@ _Ascii = Union[bytes, str] def a2b_uu(__data: _Ascii) -> bytes: ... + if sys.version_info >= (3, 7): def b2a_uu(__data: _Bytes, *, backtick: bool = ...) -> bytes: ... + else: def b2a_uu(__data: _Bytes) -> bytes: ... + def a2b_base64(__data: _Ascii) -> bytes: ... + if sys.version_info >= (3, 6): def b2a_base64(__data: _Bytes, *, newline: bool = ...) -> bytes: ... + else: def b2a_base64(__data: _Bytes) -> bytes: ... + def a2b_qp(data: _Ascii, header: bool = ...) -> bytes: ... def b2a_qp(data: _Bytes, quotetabs: bool = ..., istext: bool = ..., header: bool = ...) -> bytes: ... def a2b_hqx(__data: _Ascii) -> bytes: ... @@ -34,10 +36,13 @@ def crc_hqx(__data: _Bytes, __crc: int) -> int: ... def crc32(__data: _Bytes, __crc: int = ...) -> int: ... def b2a_hex(__data: _Bytes) -> bytes: ... + if sys.version_info >= (3, 8): def hexlify(data: bytes, sep: Union[str, bytes] = ..., bytes_per_sep: int = ...) -> bytes: ... + else: def hexlify(__data: _Bytes) -> bytes: ... + def a2b_hex(__hexstr: _Ascii) -> bytes: ... def unhexlify(__hexstr: _Ascii) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_bisect.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_bisect.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_bisect.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_bisect.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ -"""Stub file for the '_bisect' module.""" +from typing import MutableSequence, Optional, Sequence, TypeVar -from typing import Optional, Sequence, MutableSequence, TypeVar +_T = TypeVar("_T") -_T = TypeVar('_T') def bisect_left(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ... def bisect_right(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ... def insort_left(a: MutableSequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/bz2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/bz2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/bz2.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/bz2.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,7 @@ import io import sys -from typing import IO, Any, Optional, TextIO, Union, overload, TypeVar from _typeshed import AnyPath +from typing import IO, Any, Optional, TextIO, TypeVar, Union, overload from typing_extensions import Literal _PathOrFile = Union[AnyPath, IO[bytes]] @@ -44,17 +44,11 @@ class BZ2File(io.BufferedIOBase, IO[bytes]): def __enter__(self: _T) -> _T: ... if sys.version_info >= (3, 9): - def __init__(self, - filename: _PathOrFile, - mode: str = ..., - *, - compresslevel: int = ...) -> None: ... + def __init__(self, filename: _PathOrFile, mode: str = ..., *, compresslevel: int = ...) -> None: ... else: - def __init__(self, - filename: _PathOrFile, - mode: str = ..., - buffering: Optional[Any] = ..., - compresslevel: int = ...) -> None: ... + def __init__( + self, filename: _PathOrFile, mode: str = ..., buffering: Optional[Any] = ..., compresslevel: int = ... + ) -> None: ... class BZ2Compressor(object): def __init__(self, compresslevel: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cgi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cgi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cgi.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cgi.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,25 +1,43 @@ import sys -from typing import Any, AnyStr, Dict, IO, Iterator, List, Mapping, Optional, Tuple, TypeVar, Union +from _typeshed import SupportsGetItem, SupportsItemAccess +from builtins import type as _type +from typing import IO, Any, AnyStr, Dict, Iterable, Iterator, List, Mapping, Optional, Protocol, Tuple, TypeVar, Union + +_T = TypeVar("_T", bound=FieldStorage) + +def parse( + fp: Optional[IO[Any]] = ..., + environ: SupportsItemAccess[str, str] = ..., + keep_blank_values: bool = ..., + strict_parsing: bool = ..., +) -> Dict[str, List[str]]: ... -_T = TypeVar('_T', bound=FieldStorage) - -def parse(fp: Optional[IO[Any]] = ..., environ: Mapping[str, str] = ..., - keep_blank_values: bool = ..., strict_parsing: bool = ...) -> Dict[str, List[str]]: ... if sys.version_info < (3, 8): def parse_qs(qs: str, keep_blank_values: bool = ..., strict_parsing: bool = ...) -> Dict[str, List[str]]: ... - def parse_qsl(qs: str, keep_blank_values: bool = ..., strict_parsing: bool = ...) -> Dict[str, List[str]]: ... + def parse_qsl(qs: str, keep_blank_values: bool = ..., strict_parsing: bool = ...) -> List[Tuple[str, str]]: ... + if sys.version_info >= (3, 7): - def parse_multipart(fp: IO[Any], pdict: Mapping[str, bytes], encoding: str = ..., errors: str = ...) -> Dict[str, List[Any]]: ... + def parse_multipart( + fp: IO[Any], pdict: SupportsGetItem[str, bytes], encoding: str = ..., errors: str = ... + ) -> Dict[str, List[Any]]: ... + else: - def parse_multipart(fp: IO[Any], pdict: Mapping[str, bytes]) -> Dict[str, List[bytes]]: ... + def parse_multipart(fp: IO[Any], pdict: SupportsGetItem[str, bytes]) -> Dict[str, List[bytes]]: ... + +class _Environ(Protocol): + def __getitem__(self, __k: str) -> str: ... + def keys(self) -> Iterable[str]: ... + def parse_header(line: str) -> Tuple[str, Dict[str, str]]: ... -def test(environ: Mapping[str, str] = ...) -> None: ... -def print_environ(environ: Mapping[str, str] = ...) -> None: ... +def test(environ: _Environ = ...) -> None: ... +def print_environ(environ: _Environ = ...) -> None: ... def print_form(form: Dict[str, Any]) -> None: ... def print_directory() -> None: ... def print_environ_usage() -> None: ... + if sys.version_info < (3,): def escape(s: AnyStr, quote: bool = ...) -> AnyStr: ... + elif sys.version_info < (3, 8): def escape(s: str, quote: Optional[bool] = ...) -> str: ... @@ -35,13 +53,11 @@ headers: Dict[Any, Any] name: Any value: Any - def __init__(self, name: Any, value: Any) -> None: ... def __repr__(self) -> str: ... - class FieldStorage(object): - FieldStorageClass: Optional[type] + FieldStorageClass: Optional[_type] keep_blank_values: int strict_parsing: int qs_on_post: Optional[str] @@ -65,17 +81,42 @@ value: Union[None, bytes, List[Any]] if sys.version_info >= (3, 6): - def __init__(self, fp: Optional[IO[Any]] = ..., headers: Optional[Mapping[str, str]] = ..., outerboundary: bytes = ..., - environ: Mapping[str, str] = ..., keep_blank_values: int = ..., strict_parsing: int = ..., - limit: Optional[int] = ..., encoding: str = ..., errors: str = ..., max_num_fields: Optional[int] = ...) -> None: ... + def __init__( + self, + fp: Optional[IO[Any]] = ..., + headers: Optional[Mapping[str, str]] = ..., + outerboundary: bytes = ..., + environ: SupportsGetItem[str, str] = ..., + keep_blank_values: int = ..., + strict_parsing: int = ..., + limit: Optional[int] = ..., + encoding: str = ..., + errors: str = ..., + max_num_fields: Optional[int] = ..., + ) -> None: ... elif sys.version_info >= (3, 0): - def __init__(self, fp: Optional[IO[Any]] = ..., headers: Optional[Mapping[str, str]] = ..., outerboundary: bytes = ..., - environ: Mapping[str, str] = ..., keep_blank_values: int = ..., strict_parsing: int = ..., - limit: Optional[int] = ..., encoding: str = ..., errors: str = ...) -> None: ... + def __init__( + self, + fp: Optional[IO[Any]] = ..., + headers: Optional[Mapping[str, str]] = ..., + outerboundary: bytes = ..., + environ: SupportsGetItem[str, str] = ..., + keep_blank_values: int = ..., + strict_parsing: int = ..., + limit: Optional[int] = ..., + encoding: str = ..., + errors: str = ..., + ) -> None: ... else: - def __init__(self, fp: IO[Any] = ..., headers: Mapping[str, str] = ..., outerboundary: bytes = ..., - environ: Mapping[str, str] = ..., keep_blank_values: int = ..., strict_parsing: int = ...) -> None: ... - + def __init__( + self, + fp: IO[Any] = ..., + headers: Mapping[str, str] = ..., + outerboundary: bytes = ..., + environ: SupportsGetItem[str, str] = ..., + keep_blank_values: int = ..., + strict_parsing: int = ..., + ) -> None: ... if sys.version_info >= (3, 0): def __enter__(self: _T) -> _T: ... def __exit__(self, *args: Any) -> None: ... @@ -101,19 +142,14 @@ # In Python 2 it always returns bytes and ignores the "binary" flag def make_file(self, binary: Any = ...) -> IO[bytes]: ... - if sys.version_info < (3, 0): from UserDict import UserDict - class FormContentDict(UserDict[str, List[str]]): query_string: str def __init__(self, environ: Mapping[str, str] = ..., keep_blank_values: int = ..., strict_parsing: int = ...) -> None: ... - class SvFormContentDict(FormContentDict): def getlist(self, key: Any) -> Any: ... - class InterpFormContentDict(SvFormContentDict): ... - class FormContent(FormContentDict): # TODO this should have # def values(self, key: Any) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -"""Stub file for the 'cmath' module.""" - import sys from typing import SupportsComplex, SupportsFloat, Tuple, Union @@ -23,8 +21,10 @@ def cos(__z: _C) -> complex: ... def cosh(__z: _C) -> complex: ... def exp(__z: _C) -> complex: ... + if sys.version_info >= (3, 5): def isclose(a: _C, b: _C, *, rel_tol: SupportsFloat = ..., abs_tol: SupportsFloat = ...) -> bool: ... + def isinf(__z: _C) -> bool: ... def isnan(__z: _C) -> bool: ... def log(__x: _C, __y_obj: _C = ...) -> complex: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmd.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmd.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmd.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cmd.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ -# Stubs for cmd (Python 2/3) - -from typing import Any, Optional, Text, IO, List, Callable, Tuple +from typing import IO, Any, Callable, List, Optional, Tuple class Cmd: prompt: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_codecs.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_codecs.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_codecs.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_codecs.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,6 @@ -"""Stub file for the '_codecs' module.""" - -import sys -from typing import Any, Callable, Tuple, Optional, Dict, Text, Union - import codecs +import sys +from typing import Any, Callable, Dict, Optional, Text, Tuple, Union # For convenience: _Handler = Callable[[Exception], Tuple[Text, int]] @@ -19,6 +16,7 @@ # This type is not exposed; it is defined in unicodeobject.c class _EncodingMap(object): def size(self) -> int: ... + _MapT = Union[Dict[int, int], _EncodingMap] def register(__search_function: Callable[[str], Any]) -> None: ... @@ -28,11 +26,12 @@ def decode(obj: Any, encoding: Union[str, Text] = ..., errors: _Errors = ...) -> Any: ... def encode(obj: Any, encoding: Union[str, Text] = ..., errors: _Errors = ...) -> Any: ... def charmap_build(__map: Text) -> _MapT: ... - def ascii_decode(__data: _Decodable, __errors: _Errors = ...) -> Tuple[Text, int]: ... def ascii_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... + if sys.version_info < (3, 2): def charbuffer_encode(__data: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... + def charmap_decode(__data: _Decodable, __errors: _Errors = ..., __mapping: Optional[_MapT] = ...) -> Tuple[Text, int]: ... def charmap_encode(__str: _Encodable, __errors: _Errors = ..., __mapping: Optional[_MapT] = ...) -> Tuple[bytes, int]: ... def escape_decode(__data: _String, __errors: _Errors = ...) -> Tuple[str, int]: ... @@ -44,21 +43,27 @@ def readbuffer_encode(__data: _String, __errors: _Errors = ...) -> Tuple[bytes, int]: ... def unicode_escape_decode(__data: _String, __errors: _Errors = ...) -> Tuple[Text, int]: ... def unicode_escape_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... + if sys.version_info < (3, 8): def unicode_internal_decode(__obj: _String, __errors: _Errors = ...) -> Tuple[Text, int]: ... def unicode_internal_encode(__obj: _String, __errors: _Errors = ...) -> Tuple[bytes, int]: ... + def utf_16_be_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_16_be_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... def utf_16_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_16_encode(__str: _Encodable, __errors: _Errors = ..., __byteorder: int = ...) -> Tuple[bytes, int]: ... -def utf_16_ex_decode(__data: _Decodable, __errors: _Errors = ..., __byteorder: int = ..., __final: int = ...) -> Tuple[Text, int, int]: ... +def utf_16_ex_decode( + __data: _Decodable, __errors: _Errors = ..., __byteorder: int = ..., __final: int = ... +) -> Tuple[Text, int, int]: ... def utf_16_le_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_16_le_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... def utf_32_be_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_32_be_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... def utf_32_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_32_encode(__str: _Encodable, __errors: _Errors = ..., __byteorder: int = ...) -> Tuple[bytes, int]: ... -def utf_32_ex_decode(__data: _Decodable, __errors: _Errors = ..., __byteorder: int = ..., __final: int = ...) -> Tuple[Text, int, int]: ... +def utf_32_ex_decode( + __data: _Decodable, __errors: _Errors = ..., __byteorder: int = ..., __final: int = ... +) -> Tuple[Text, int, int]: ... def utf_32_le_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_32_le_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... def utf_7_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... @@ -66,7 +71,7 @@ def utf_8_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def utf_8_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... -if sys.platform == 'win32': +if sys.platform == "win32": def mbcs_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ... def mbcs_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ... if sys.version_info >= (3, 0): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/codecs.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/codecs.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/codecs.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/codecs.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,25 @@ import sys -from typing import Any, BinaryIO, Callable, Generator, IO, Iterable, Iterator, List, Optional, Protocol, Text, TextIO, Tuple, Type, TypeVar, Union, overload - -from abc import abstractmethod import types +from abc import abstractmethod +from typing import ( + IO, + Any, + BinaryIO, + Callable, + Generator, + Iterable, + Iterator, + List, + Optional, + Protocol, + Text, + TextIO, + Tuple, + Type, + TypeVar, + Union, + overload, +) from typing_extensions import Literal # TODO: this only satisfies the most common interface, where @@ -16,16 +33,19 @@ class _Encoder(Protocol): def __call__(self, input: _Decoded, errors: str = ...) -> Tuple[_Encoded, int]: ... # signature of Codec().encode + class _Decoder(Protocol): def __call__(self, input: _Encoded, errors: str = ...) -> Tuple[_Decoded, int]: ... # signature of Codec().decode class _StreamReader(Protocol): def __call__(self, stream: IO[_Encoded], errors: str = ...) -> StreamReader: ... + class _StreamWriter(Protocol): def __call__(self, stream: IO[_Encoded], errors: str = ...) -> StreamWriter: ... class _IncrementalEncoder(Protocol): def __call__(self, errors: str = ...) -> IncrementalEncoder: ... + class _IncrementalDecoder(Protocol): def __call__(self, errors: str = ...) -> IncrementalDecoder: ... @@ -55,15 +75,13 @@ def encode(obj: str, encoding: Literal["rot13", "rot_13"] = ..., errors: str = ...) -> str: ... # type: ignore @overload def encode(obj: _Decoded, encoding: str = ..., errors: str = ...) -> _Encoded: ... - @overload def decode(obj: bytes, encoding: _BytesToBytesEncodingT, errors: str = ...) -> bytes: ... # type: ignore @overload def decode(obj: str, encoding: Literal["rot13", "rot_13"] = ..., errors: str = ...) -> Text: ... @overload def decode(obj: _Encoded, encoding: str = ..., errors: str = ...) -> _Decoded: ... - -def lookup(encoding: str) -> CodecInfo: ... +def lookup(__encoding: str) -> CodecInfo: ... def utf_16_be_decode(__obj: _Encoded, __errors: str = ..., __final: bool = ...) -> Tuple[_Decoded, int]: ... # undocumented def utf_16_be_encode(__obj: _Decoded, __errors: str = ...) -> Tuple[_Encoded, int]: ... # undocumented @@ -81,16 +99,18 @@ @property def incrementaldecoder(self) -> _IncrementalDecoder: ... name: str - def __init__( - self, + def __new__( + cls, encode: _Encoder, decode: _Decoder, - streamreader: _StreamReader = ..., - streamwriter: _StreamWriter = ..., - incrementalencoder: _IncrementalEncoder = ..., - incrementaldecoder: _IncrementalDecoder = ..., - name: str = ..., - ) -> None: ... + streamreader: Optional[_StreamReader] = ..., + streamwriter: Optional[_StreamWriter] = ..., + incrementalencoder: Optional[_IncrementalEncoder] = ..., + incrementaldecoder: Optional[_IncrementalDecoder] = ..., + name: Optional[str] = ..., + *, + _is_text_encoding: Optional[bool] = ..., + ) -> CodecInfo: ... def getencoder(encoding: str) -> _Encoder: ... def getdecoder(encoding: str) -> _Decoder: ... @@ -98,9 +118,13 @@ def getincrementaldecoder(encoding: str) -> _IncrementalDecoder: ... def getreader(encoding: str) -> _StreamReader: ... def getwriter(encoding: str) -> _StreamWriter: ... -def register(search_function: Callable[[str], Optional[CodecInfo]]) -> None: ... -def open(filename: str, mode: str = ..., encoding: str = ..., errors: str = ..., buffering: int = ...) -> StreamReaderWriter: ... -def EncodedFile(file: IO[_Encoded], data_encoding: str, file_encoding: str = ..., errors: str = ...) -> StreamRecoder: ... +def register(__search_function: Callable[[str], Optional[CodecInfo]]) -> None: ... +def open( + filename: str, mode: str = ..., encoding: Optional[str] = ..., errors: str = ..., buffering: int = ... +) -> StreamReaderWriter: ... +def EncodedFile( + file: IO[_Encoded], data_encoding: str, file_encoding: Optional[str] = ..., errors: str = ... +) -> StreamRecoder: ... def iterencode(iterator: Iterable[_Decoded], encoding: str, errors: str = ...) -> Generator[_Encoded, None, None]: ... def iterdecode(iterator: Iterable[_Encoded], encoding: str, errors: str = ...) -> Generator[_Decoded, None, None]: ... @@ -118,8 +142,8 @@ # It is expected that different actions be taken depending on which of the # three subclasses of `UnicodeError` is actually ...ed. However, the Union # is still needed for at least one of the cases. -def register_error(name: str, error_handler: Callable[[UnicodeError], Tuple[Union[str, bytes], int]]) -> None: ... -def lookup_error(name: str) -> Callable[[UnicodeError], Tuple[Union[str, bytes], int]]: ... +def register_error(__errors: str, __handler: Callable[[UnicodeError], Tuple[Union[str, bytes], int]]) -> None: ... +def lookup_error(__name: str) -> Callable[[UnicodeError], Tuple[Union[str, bytes], int]]: ... def strict_errors(exception: UnicodeError) -> Tuple[Union[str, bytes], int]: ... def replace_errors(exception: UnicodeError) -> Tuple[Union[str, bytes], int]: ... def ignore_errors(exception: UnicodeError) -> Tuple[Union[str, bytes], int]: ... @@ -146,7 +170,7 @@ errors: str def __init__(self, errors: str = ...) -> None: ... @abstractmethod - def decode(self, object: _Encoded, final: bool = ...) -> _Decoded: ... + def decode(self, input: _Encoded, final: bool = ...) -> _Decoded: ... def reset(self) -> None: ... def getstate(self) -> Tuple[_Encoded, int]: ... def setstate(self, state: Tuple[_Encoded, int]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/contextlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/contextlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/contextlib.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/contextlib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,102 @@ +import sys +from types import TracebackType +from typing import IO, Any, Callable, ContextManager, Generic, Iterable, Iterator, Optional, Type, TypeVar, overload + +if sys.version_info >= (3, 5): + from typing import AsyncContextManager, AsyncIterator + +if sys.version_info >= (3, 6): + AbstractContextManager = ContextManager +if sys.version_info >= (3, 7): + AbstractAsyncContextManager = AsyncContextManager + +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_T_io = TypeVar("_T_io", bound=Optional[IO[str]]) +_F = TypeVar("_F", bound=Callable[..., Any]) + +_ExitFunc = Callable[[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]], bool] +_CM_EF = TypeVar("_CM_EF", ContextManager[Any], _ExitFunc) + +if sys.version_info >= (3, 2): + class _GeneratorContextManager(ContextManager[_T_co]): + def __call__(self, func: _F) -> _F: ... + def contextmanager(func: Callable[..., Iterator[_T]]) -> Callable[..., _GeneratorContextManager[_T]]: ... + +else: + class GeneratorContextManager(ContextManager[_T_co]): + def __call__(self, func: _F) -> _F: ... + def contextmanager(func: Callable[..., Iterator[_T]]) -> Callable[..., ContextManager[_T]]: ... + +if sys.version_info >= (3, 7): + def asynccontextmanager(func: Callable[..., AsyncIterator[_T]]) -> Callable[..., AsyncContextManager[_T]]: ... + +if sys.version_info < (3,): + def nested(*mgr: ContextManager[Any]) -> ContextManager[Iterable[Any]]: ... + +class closing(ContextManager[_T]): + def __init__(self, thing: _T) -> None: ... + +if sys.version_info >= (3, 4): + class suppress(ContextManager[None]): + def __init__(self, *exceptions: Type[BaseException]) -> None: ... + def __exit__( + self, exctype: Optional[Type[BaseException]], excinst: Optional[BaseException], exctb: Optional[TracebackType] + ) -> bool: ... + class redirect_stdout(ContextManager[_T_io]): + def __init__(self, new_target: _T_io) -> None: ... + +if sys.version_info >= (3, 5): + class redirect_stderr(ContextManager[_T_io]): + def __init__(self, new_target: _T_io) -> None: ... + +if sys.version_info >= (3,): + class ContextDecorator: + def __call__(self, func: _F) -> _F: ... + _U = TypeVar("_U", bound=ExitStack) + class ExitStack(ContextManager[ExitStack]): + def __init__(self) -> None: ... + def enter_context(self, cm: ContextManager[_T]) -> _T: ... + def push(self, exit: _CM_EF) -> _CM_EF: ... + def callback(self, callback: Callable[..., Any], *args: Any, **kwds: Any) -> Callable[..., Any]: ... + def pop_all(self: _U) -> _U: ... + def close(self) -> None: ... + def __enter__(self: _U) -> _U: ... + def __exit__( + self, + __exc_type: Optional[Type[BaseException]], + __exc_value: Optional[BaseException], + __traceback: Optional[TracebackType], + ) -> bool: ... + +if sys.version_info >= (3, 7): + from typing import Awaitable + + _S = TypeVar("_S", bound=AsyncExitStack) + + _ExitCoroFunc = Callable[[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]], Awaitable[bool]] + _CallbackCoroFunc = Callable[..., Awaitable[Any]] + _ACM_EF = TypeVar("_ACM_EF", AsyncContextManager[Any], _ExitCoroFunc) + class AsyncExitStack(AsyncContextManager[AsyncExitStack]): + def __init__(self) -> None: ... + def enter_context(self, cm: ContextManager[_T]) -> _T: ... + def enter_async_context(self, cm: AsyncContextManager[_T]) -> Awaitable[_T]: ... + def push(self, exit: _CM_EF) -> _CM_EF: ... + def push_async_exit(self, exit: _ACM_EF) -> _ACM_EF: ... + def callback(self, callback: Callable[..., Any], *args: Any, **kwds: Any) -> Callable[..., Any]: ... + def push_async_callback(self, callback: _CallbackCoroFunc, *args: Any, **kwds: Any) -> _CallbackCoroFunc: ... + def pop_all(self: _S) -> _S: ... + def aclose(self) -> Awaitable[None]: ... + def __aenter__(self: _S) -> Awaitable[_S]: ... + def __aexit__( + self, + __exc_type: Optional[Type[BaseException]], + __exc_value: Optional[BaseException], + __traceback: Optional[TracebackType], + ) -> Awaitable[bool]: ... + +if sys.version_info >= (3, 7): + @overload + def nullcontext(enter_result: _T) -> ContextManager[_T]: ... + @overload + def nullcontext() -> ContextManager[None]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cProfile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cProfile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/cProfile.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/cProfile.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,28 @@ +import sys +from _typeshed import AnyPath +from typing import Any, Callable, Dict, Optional, TypeVar, Union + +def run(statement: str, filename: Optional[str] = ..., sort: Union[str, int] = ...) -> None: ... +def runctx( + statement: str, globals: Dict[str, Any], locals: Dict[str, Any], filename: Optional[str] = ..., sort: Union[str, int] = ... +) -> None: ... + +_SelfT = TypeVar("_SelfT", bound=Profile) +_T = TypeVar("_T") + +class Profile: + def __init__( + self, timer: Callable[[], float] = ..., timeunit: float = ..., subcalls: bool = ..., builtins: bool = ... + ) -> None: ... + def enable(self) -> None: ... + def disable(self) -> None: ... + def print_stats(self, sort: Union[str, int] = ...) -> None: ... + def dump_stats(self, file: AnyPath) -> None: ... + def create_stats(self) -> None: ... + def snapshot_stats(self) -> None: ... + def run(self: _SelfT, cmd: str) -> _SelfT: ... + def runctx(self: _SelfT, cmd: str, globals: Dict[str, Any], locals: Dict[str, Any]) -> _SelfT: ... + def runcall(self, __func: Callable[..., _T], *args: Any, **kw: Any) -> _T: ... + if sys.version_info >= (3, 8): + def __enter__(self: _SelfT) -> _SelfT: ... + def __exit__(self, *exc_info: Any) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/crypt.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/crypt.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/crypt.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/crypt.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -3,7 +3,6 @@ if sys.version_info >= (3, 3): class _Method: ... - METHOD_CRYPT: _Method METHOD_MD5: _Method METHOD_SHA256: _Method @@ -18,5 +17,6 @@ else: def mksalt(method: Optional[_Method] = ...) -> str: ... def crypt(word: str, salt: Optional[Union[str, _Method]] = ...) -> str: ... + else: def crypt(word: str, salt: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_csv.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_csv.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_csv.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_csv.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,4 @@ import sys - from typing import Any, Iterable, Iterator, List, Optional, Protocol, Sequence, Text, Type, Union QUOTE_ALL: int @@ -40,9 +39,9 @@ def writerow(self, row: Sequence[Any]) -> Any: ... def writerows(self, rows: Iterable[Sequence[Any]]) -> None: ... - class _Writer(Protocol): def write(self, s: str) -> Any: ... + def writer(csvfile: _Writer, dialect: _DialectLike = ..., **fmtparams: Any) -> _writer: ... def reader(csvfile: Iterable[Text], dialect: _DialectLike = ..., **fmtparams: Any) -> _reader: ... def register_dialect(name: str, dialect: Any = ..., **fmtparams: Any) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/csv.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/csv.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/csv.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/csv.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -18,7 +18,7 @@ writer as writer, ) from collections import OrderedDict -from typing import Any, Dict, Iterable, Iterator, List, Mapping, Optional, Sequence, Text, Type, Union +from typing import Any, Dict, Iterable, Iterator, List, Mapping, Optional, Sequence, Text, Type _DictRow = Mapping[str, Any] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,23 +1,35 @@ -# Stubs for ctypes - +import sys from array import array from typing import ( - Any, Callable, ClassVar, Iterator, Iterable, List, Mapping, Optional, Sequence, Sized, Text, - Tuple, Type, Generic, TypeVar, overload, + Any, + Callable, + ClassVar, + Generic, + Iterable, + Iterator, + List, + Mapping, + Optional, + Sequence, + Text, + Tuple, + Type, + TypeVar, + Union as _UnionT, + overload, ) -from typing import Union as _UnionT -import sys -_T = TypeVar('_T') -_DLLT = TypeVar('_DLLT', bound=CDLL) -_CT = TypeVar('_CT', bound=_CData) +if sys.version_info >= (3, 9): + from types import GenericAlias +_T = TypeVar("_T") +_DLLT = TypeVar("_DLLT", bound=CDLL) +_CT = TypeVar("_CT", bound=_CData) RTLD_GLOBAL: int = ... RTLD_LOCAL: int = ... DEFAULT_MODE: int = ... - class CDLL(object): _func_flags_: ClassVar[int] = ... _func_restype_: ClassVar[_CData] = ... @@ -33,11 +45,13 @@ use_last_error: bool = ..., winmode: Optional[int] = ..., ) -> None: ... - def __getattr__(self, name: str) -> _FuncPointer: ... - def __getitem__(self, name: str) -> _FuncPointer: ... -if sys.platform == 'win32': + def __getattr__(self, name: str) -> _NamedFuncPointer: ... + def __getitem__(self, name: str) -> _NamedFuncPointer: ... + +if sys.platform == "win32": class OleDLL(CDLL): ... class WinDLL(CDLL): ... + class PyDLL(CDLL): ... class LibraryLoader(Generic[_DLLT]): @@ -45,9 +59,11 @@ def __getattr__(self, name: str) -> _DLLT: ... def __getitem__(self, name: str) -> _DLLT: ... def LoadLibrary(self, name: str) -> _DLLT: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... cdll: LibraryLoader[CDLL] = ... -if sys.platform == 'win32': +if sys.platform == "win32": windll: LibraryLoader[WinDLL] = ... oledll: LibraryLoader[OleDLL] = ... pydll: LibraryLoader[PyDLL] = ... @@ -66,6 +82,7 @@ # uses _CDataMeta as its metaclass is _CData. So it's safe to ignore the errors here. def __mul__(cls: Type[_CT], other: int) -> Type[Array[_CT]]: ... # type: ignore def __rmul__(cls: Type[_CT], other: int) -> Type[Array[_CT]]: ... # type: ignore + class _CData(metaclass=_CDataMeta): _b_base: int = ... _b_needsfree_: bool = ... @@ -81,17 +98,12 @@ @classmethod def in_dll(cls: Type[_CT], library: CDLL, name: str) -> _CT: ... -class _PointerLike(_CData): ... +class _CanCastTo(_CData): ... +class _PointerLike(_CanCastTo): ... + +_ECT = Callable[[Optional[Type[_CData]], _FuncPointer, Tuple[_CData, ...]], _CData] +_PF = _UnionT[Tuple[int], Tuple[int, str], Tuple[int, str, Any]] -_ECT = Callable[[Optional[Type[_CData]], - _FuncPointer, - Tuple[_CData, ...]], - _CData] -_PF = _UnionT[ - Tuple[int], - Tuple[int, str], - Tuple[int, str, Any] -] class _FuncPointer(_PointerLike, _CData): restype: _UnionT[Type[_CData], Callable[[int], None], None] = ... argtypes: Sequence[Type[_CData]] = ... @@ -101,28 +113,26 @@ @overload def __init__(self, callable: Callable[..., Any]) -> None: ... @overload - def __init__(self, func_spec: Tuple[_UnionT[str, int], CDLL], - paramflags: Tuple[_PF, ...] = ...) -> None: ... + def __init__(self, func_spec: Tuple[_UnionT[str, int], CDLL], paramflags: Tuple[_PF, ...] = ...) -> None: ... @overload - def __init__(self, vtlb_index: int, name: str, - paramflags: Tuple[_PF, ...] = ..., - iid: pointer[c_int] = ...) -> None: ... + def __init__(self, vtlb_index: int, name: str, paramflags: Tuple[_PF, ...] = ..., iid: pointer[c_int] = ...) -> None: ... def __call__(self, *args: Any, **kwargs: Any) -> Any: ... +class _NamedFuncPointer(_FuncPointer): + __name__: str + class ArgumentError(Exception): ... +def CFUNCTYPE( + restype: Optional[Type[_CData]], *argtypes: Type[_CData], use_errno: bool = ..., use_last_error: bool = ... +) -> Type[_FuncPointer]: ... + +if sys.platform == "win32": + def WINFUNCTYPE( + restype: Optional[Type[_CData]], *argtypes: Type[_CData], use_errno: bool = ..., use_last_error: bool = ... + ) -> Type[_FuncPointer]: ... -def CFUNCTYPE(restype: Optional[Type[_CData]], - *argtypes: Type[_CData], - use_errno: bool = ..., - use_last_error: bool = ...) -> Type[_FuncPointer]: ... -if sys.platform == 'win32': - def WINFUNCTYPE(restype: Optional[Type[_CData]], - *argtypes: Type[_CData], - use_errno: bool = ..., - use_last_error: bool = ...) -> Type[_FuncPointer]: ... -def PYFUNCTYPE(restype: Optional[Type[_CData]], - *argtypes: Type[_CData]) -> Type[_FuncPointer]: ... +def PYFUNCTYPE(restype: Optional[Type[_CData]], *argtypes: Type[_CData]) -> Type[_FuncPointer]: ... class _CArgObject: ... @@ -138,21 +148,27 @@ def addressof(obj: _CData) -> int: ... def alignment(obj_or_type: _UnionT[_CData, Type[_CData]]) -> int: ... def byref(obj: _CData, offset: int = ...) -> _CArgObject: ... -_PT = TypeVar('_PT', bound=_PointerLike) -def cast(obj: _UnionT[_CData, _CArgObject], type: Type[_PT]) -> _PT: ... -def create_string_buffer(init_or_size: _UnionT[int, bytes], - size: Optional[int] = ...) -> Array[c_char]: ... + +_CastT = TypeVar("_CastT", bound=_CanCastTo) + +def cast(obj: _UnionT[_CData, _CArgObject, int], type: Type[_CastT]) -> _CastT: ... +def create_string_buffer(init: _UnionT[int, bytes], size: Optional[int] = ...) -> Array[c_char]: ... + c_buffer = create_string_buffer -def create_unicode_buffer(init_or_size: _UnionT[int, Text], - size: Optional[int] = ...) -> Array[c_wchar]: ... -if sys.platform == 'win32': + +def create_unicode_buffer(init: _UnionT[int, Text], size: Optional[int] = ...) -> Array[c_wchar]: ... + +if sys.platform == "win32": def DllCanUnloadNow() -> int: ... def DllGetClassObject(rclsid: Any, riid: Any, ppv: Any) -> int: ... # TODO not documented def FormatError(code: int) -> str: ... def GetLastError() -> int: ... + def get_errno() -> int: ... -if sys.platform == 'win32': + +if sys.platform == "win32": def get_last_error() -> int: ... + def memmove(dst: _CVoidPLike, src: _CVoidConstPLike, count: int) -> None: ... def memset(dst: _CVoidPLike, c: int, count: int) -> None: ... def POINTER(type: Type[_CT]) -> Type[pointer[_CT]]: ... @@ -174,16 +190,21 @@ def __setitem__(self, s: slice, o: Iterable[_CT]) -> None: ... def resize(obj: _CData, size: int) -> None: ... + if sys.version_info < (3,): def set_conversion_mode(encoding: str, errors: str) -> Tuple[str, str]: ... + def set_errno(value: int) -> int: ... -if sys.platform == 'win32': + +if sys.platform == "win32": def set_last_error(value: int) -> int: ... + def sizeof(obj_or_type: _UnionT[_CData, Type[_CData]]) -> int: ... def string_at(address: _CVoidConstPLike, size: int = ...) -> bytes: ... -if sys.platform == 'win32': - def WinError(code: Optional[int] = ..., - descr: Optional[str] = ...) -> OSError: ... + +if sys.platform == "win32": + def WinError(code: Optional[int] = ..., descr: Optional[str] = ...) -> OSError: ... + def wstring_at(address: _CVoidConstPLike, size: int = ...) -> str: ... class _SimpleCData(Generic[_T], _CData): @@ -194,62 +215,56 @@ class c_char(_SimpleCData[bytes]): def __init__(self, value: _UnionT[int, bytes] = ...) -> None: ... + class c_char_p(_PointerLike, _SimpleCData[Optional[bytes]]): def __init__(self, value: Optional[_UnionT[int, bytes]] = ...) -> None: ... class c_double(_SimpleCData[float]): ... class c_longdouble(_SimpleCData[float]): ... class c_float(_SimpleCData[float]): ... - class c_int(_SimpleCData[int]): ... class c_int8(_SimpleCData[int]): ... class c_int16(_SimpleCData[int]): ... class c_int32(_SimpleCData[int]): ... class c_int64(_SimpleCData[int]): ... - class c_long(_SimpleCData[int]): ... class c_longlong(_SimpleCData[int]): ... - class c_short(_SimpleCData[int]): ... - class c_size_t(_SimpleCData[int]): ... class c_ssize_t(_SimpleCData[int]): ... - class c_ubyte(_SimpleCData[int]): ... - class c_uint(_SimpleCData[int]): ... class c_uint8(_SimpleCData[int]): ... class c_uint16(_SimpleCData[int]): ... class c_uint32(_SimpleCData[int]): ... class c_uint64(_SimpleCData[int]): ... - class c_ulong(_SimpleCData[int]): ... class c_ulonglong(_SimpleCData[int]): ... - class c_ushort(_SimpleCData[int]): ... - class c_void_p(_PointerLike, _SimpleCData[Optional[int]]): ... - class c_wchar(_SimpleCData[Text]): ... + class c_wchar_p(_PointerLike, _SimpleCData[Optional[Text]]): def __init__(self, value: Optional[_UnionT[int, Text]] = ...) -> None: ... class c_bool(_SimpleCData[bool]): def __init__(self, value: bool = ...) -> None: ... -if sys.platform == 'win32': +if sys.platform == "win32": class HRESULT(_SimpleCData[int]): ... # TODO undocumented -class py_object(_SimpleCData[_T]): ... +class py_object(_CanCastTo, _SimpleCData[_T]): ... class _CField: offset: int = ... size: int = ... + class _StructUnionMeta(_CDataMeta): _fields_: Sequence[_UnionT[Tuple[str, Type[_CData]], Tuple[str, Type[_CData], int]]] = ... _pack_: int = ... _anonymous_: Sequence[str] = ... def __getattr__(self, name: str) -> _CField: ... + class _StructUnionBase(_CData, metaclass=_StructUnionMeta): def __init__(self, *args: Any, **kw: Any) -> None: ... def __getattr__(self, name: str) -> Any: ... @@ -290,3 +305,5 @@ # Can't inherit from Sized because the metaclass conflict between # Sized and _CData prevents using _CDataMeta. def __len__(self) -> int: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/util.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ -# Stubs for ctypes.util - -from typing import Optional import sys +from typing import Optional def find_library(name: str) -> Optional[str]: ... -if sys.platform == 'win32': + +if sys.platform == "win32": def find_msvcrt() -> Optional[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/wintypes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/wintypes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/wintypes.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ctypes/wintypes.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,23 @@ from ctypes import ( - _SimpleCData, Array, Structure, c_byte, c_char, c_char_p, c_double, c_float, c_int, c_long, - c_longlong, c_short, c_uint, c_ulong, c_ulonglong, c_ushort, c_void_p, c_wchar, c_wchar_p, + Array, + Structure, + _SimpleCData, + c_byte, + c_char, + c_char_p, + c_double, + c_float, + c_int, + c_long, + c_longlong, + c_short, + c_uint, + c_ulong, + c_ulonglong, + c_ushort, + c_void_p, + c_wchar, + c_wchar_p, pointer, ) @@ -15,7 +32,9 @@ FLOAT = c_float BOOLEAN = BYTE BOOL = c_long + class VARIANT_BOOL(_SimpleCData[bool]): ... + ULONG = c_ulong LONG = c_long USHORT = c_ushort @@ -86,6 +105,7 @@ top: LONG right: LONG bottom: LONG + RECTL = RECT _RECTL = RECT tagRECT = RECT @@ -95,6 +115,7 @@ Top: SHORT Right: SHORT Bottom: SHORT + SMALL_RECT = _SMALL_RECT class _COORD(Structure): @@ -104,6 +125,7 @@ class POINT(Structure): x: LONG y: LONG + POINTL = POINT _POINTL = POINT tagPOINT = POINT @@ -111,6 +133,7 @@ class SIZE(Structure): cx: LONG cy: LONG + SIZEL = SIZE tagSIZE = SIZE @@ -119,6 +142,7 @@ class FILETIME(Structure): dwLowDateTime: DWORD dwHighDateTime: DWORD + _FILETIME = FILETIME class MSG(Structure): @@ -128,6 +152,7 @@ lParam: LPARAM time: DWORD pt: POINT + tagMSG = MSG MAX_PATH: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/ascii.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/ascii.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/ascii.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/ascii.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ -from typing import List, Union, overload, TypeVar +from typing import List, TypeVar, Union -_Ch = TypeVar('_Ch', str, int) +_Ch = TypeVar("_Ch", str, int) NUL: int SOH: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/curses/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,8 @@ from _curses import * # noqa: F403 from _curses import _CursesWindow as _CursesWindow -from typing import TypeVar, Callable, Any +from typing import Any, Callable, TypeVar -_T = TypeVar('_T') +_T = TypeVar("_T") # available after calling `curses.initscr()` LINES: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_curses.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_curses.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_curses.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_curses.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ import sys -from typing import Any, BinaryIO, IO, NamedTuple, Optional, Tuple, Union, overload +from typing import IO, Any, BinaryIO, NamedTuple, Optional, Tuple, Union, overload _chtype = Union[str, bytes, int] @@ -283,15 +283,30 @@ def tigetflag(__capname: str) -> int: ... def tigetnum(__capname: str) -> int: ... def tigetstr(__capname: str) -> bytes: ... -def tparm(__str: bytes, __i1: int = ..., __i2: int = ..., __i3: int = ..., __i4: int = ..., __i5: int = ..., __i6: int = ..., __i7: int = ..., __i8: int = ..., __i9: int = ...) -> bytes: ... +def tparm( + __str: bytes, + __i1: int = ..., + __i2: int = ..., + __i3: int = ..., + __i4: int = ..., + __i5: int = ..., + __i6: int = ..., + __i7: int = ..., + __i8: int = ..., + __i9: int = ..., +) -> bytes: ... def typeahead(__fd: int) -> None: ... def unctrl(__ch: _chtype) -> bytes: ... + if sys.version_info >= (3, 3): def unget_wch(__ch: Union[int, str]) -> None: ... + def ungetch(__ch: _chtype) -> None: ... def ungetmouse(__id: int, __x: int, __y: int, __z: int, __bstate: int) -> None: ... + if sys.version_info >= (3, 5): def update_lines_cols() -> int: ... + def use_default_colors() -> None: ... def use_env(__flag: bool) -> None: ... @@ -317,7 +332,17 @@ def attrset(self, attr: int) -> None: ... def bkgd(self, ch: _chtype, attr: int = ...) -> None: ... def bkgdset(self, ch: _chtype, attr: int = ...) -> None: ... - def border(self, ls: _chtype = ..., rs: _chtype = ..., ts: _chtype = ..., bs: _chtype = ..., tl: _chtype = ..., tr: _chtype = ..., bl: _chtype = ..., br: _chtype = ...) -> None: ... + def border( + self, + ls: _chtype = ..., + rs: _chtype = ..., + ts: _chtype = ..., + bs: _chtype = ..., + tl: _chtype = ..., + tr: _chtype = ..., + bl: _chtype = ..., + br: _chtype = ..., + ) -> None: ... @overload def box(self) -> None: ... @overload @@ -415,11 +440,15 @@ @overload def overlay(self, destwin: _CursesWindow) -> None: ... @overload - def overlay(self, destwin: _CursesWindow, sminrow: int, smincol: int, dminrow: int, dmincol: int, dmaxrow: int, dmaxcol: int) -> None: ... + def overlay( + self, destwin: _CursesWindow, sminrow: int, smincol: int, dminrow: int, dmincol: int, dmaxrow: int, dmaxcol: int + ) -> None: ... @overload def overwrite(self, destwin: _CursesWindow) -> None: ... @overload - def overwrite(self, destwin: _CursesWindow, sminrow: int, smincol: int, dminrow: int, dmincol: int, dmaxrow: int, dmaxcol: int) -> None: ... + def overwrite( + self, destwin: _CursesWindow, sminrow: int, smincol: int, dminrow: int, dmincol: int, dmaxrow: int, dmaxcol: int + ) -> None: ... def putwin(self, file: IO[Any]) -> None: ... def redrawln(self, beg: int, num: int) -> None: ... def redrawwin(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/datetime.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/datetime.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/datetime.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/datetime.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ import sys from time import struct_time -from typing import AnyStr, Optional, SupportsAbs, Tuple, Union, overload, ClassVar, Type, TypeVar +from typing import AnyStr, ClassVar, Optional, SupportsAbs, Tuple, Type, TypeVar, Union, overload _S = TypeVar("_S") @@ -23,7 +23,6 @@ utc: ClassVar[timezone] min: ClassVar[timezone] max: ClassVar[timezone] - def __init__(self, offset: timedelta, name: str = ...) -> None: ... def __hash__(self) -> int: ... @@ -33,9 +32,7 @@ min: ClassVar[date] max: ClassVar[date] resolution: ClassVar[timedelta] - def __new__(cls: Type[_S], year: int, month: int, day: int) -> _S: ... - @classmethod def fromtimestamp(cls: Type[_S], __timestamp: float) -> _S: ... @classmethod @@ -48,14 +45,12 @@ if sys.version_info >= (3, 8): @classmethod def fromisocalendar(cls: Type[_S], year: int, week: int, day: int) -> _S: ... - @property def year(self) -> int: ... @property def month(self) -> int: ... @property def day(self) -> int: ... - def ctime(self) -> str: ... def strftime(self, fmt: _Text) -> str: ... if sys.version_info >= (3,): @@ -91,12 +86,20 @@ resolution: ClassVar[timedelta] if sys.version_info >= (3, 6): - def __init__(self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., - tzinfo: Optional[_tzinfo] = ..., *, fold: int = ...) -> None: ... + def __init__( + self, + hour: int = ..., + minute: int = ..., + second: int = ..., + microsecond: int = ..., + tzinfo: Optional[_tzinfo] = ..., + *, + fold: int = ..., + ) -> None: ... else: - def __init__(self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., - tzinfo: Optional[_tzinfo] = ...) -> None: ... - + def __init__( + self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ... + ) -> None: ... @property def hour(self) -> int: ... @property @@ -110,7 +113,6 @@ if sys.version_info >= (3, 6): @property def fold(self) -> int: ... - def __le__(self, other: time) -> bool: ... def __lt__(self, other: time) -> bool: ... def __ge__(self, other: time) -> bool: ... @@ -132,12 +134,20 @@ def tzname(self) -> Optional[str]: ... def dst(self) -> Optional[timedelta]: ... if sys.version_info >= (3, 6): - def replace(self, hour: int = ..., minute: int = ..., second: int = ..., - microsecond: int = ..., tzinfo: Optional[_tzinfo] = ..., - *, fold: int = ...) -> time: ... + def replace( + self, + hour: int = ..., + minute: int = ..., + second: int = ..., + microsecond: int = ..., + tzinfo: Optional[_tzinfo] = ..., + *, + fold: int = ..., + ) -> time: ... else: - def replace(self, hour: int = ..., minute: int = ..., second: int = ..., - microsecond: int = ..., tzinfo: Optional[_tzinfo] = ...) -> time: ... + def replace( + self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ... + ) -> time: ... _date = date _time = time @@ -148,21 +158,35 @@ resolution: ClassVar[timedelta] if sys.version_info >= (3, 6): - def __init__(self, days: float = ..., seconds: float = ..., microseconds: float = ..., - milliseconds: float = ..., minutes: float = ..., hours: float = ..., - weeks: float = ..., *, fold: int = ...) -> None: ... - else: - def __init__(self, days: float = ..., seconds: float = ..., microseconds: float = ..., - milliseconds: float = ..., minutes: float = ..., hours: float = ..., - weeks: float = ...) -> None: ... - + def __init__( + self, + days: float = ..., + seconds: float = ..., + microseconds: float = ..., + milliseconds: float = ..., + minutes: float = ..., + hours: float = ..., + weeks: float = ..., + *, + fold: int = ..., + ) -> None: ... + else: + def __init__( + self, + days: float = ..., + seconds: float = ..., + microseconds: float = ..., + milliseconds: float = ..., + minutes: float = ..., + hours: float = ..., + weeks: float = ..., + ) -> None: ... @property def days(self) -> int: ... @property def seconds(self) -> int: ... @property def microseconds(self) -> int: ... - def total_seconds(self) -> float: ... def __add__(self, other: timedelta) -> timedelta: ... def __radd__(self, other: timedelta) -> timedelta: ... @@ -226,7 +250,6 @@ microsecond: int = ..., tzinfo: Optional[_tzinfo] = ..., ) -> _S: ... - @property def year(self) -> int: ... @property @@ -246,7 +269,6 @@ if sys.version_info >= (3, 6): @property def fold(self) -> int: ... - @classmethod def fromtimestamp(cls: Type[_S], t: float, tz: Optional[_tzinfo] = ...) -> _S: ... @classmethod @@ -290,13 +312,31 @@ def time(self) -> _time: ... def timetz(self) -> _time: ... if sys.version_info >= (3, 6): - def replace(self, year: int = ..., month: int = ..., day: int = ..., hour: int = ..., - minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: - Optional[_tzinfo] = ..., *, fold: int = ...) -> datetime: ... - else: - def replace(self, year: int = ..., month: int = ..., day: int = ..., hour: int = ..., - minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: - Optional[_tzinfo] = ...) -> datetime: ... + def replace( + self, + year: int = ..., + month: int = ..., + day: int = ..., + hour: int = ..., + minute: int = ..., + second: int = ..., + microsecond: int = ..., + tzinfo: Optional[_tzinfo] = ..., + *, + fold: int = ..., + ) -> datetime: ... + else: + def replace( + self, + year: int = ..., + month: int = ..., + day: int = ..., + hour: int = ..., + minute: int = ..., + second: int = ..., + microsecond: int = ..., + tzinfo: Optional[_tzinfo] = ..., + ) -> datetime: ... if sys.version_info >= (3, 8): def astimezone(self: _S, tz: Optional[_tzinfo] = ...) -> _S: ... elif sys.version_info >= (3, 3): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/decimal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/decimal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/decimal.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/decimal.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,7 @@ import numbers import sys from types import TracebackType -from typing import ( - Any, Container, Dict, List, NamedTuple, Optional, overload, Sequence, Text, Tuple, Type, TypeVar, Union, -) +from typing import Any, Container, Dict, List, NamedTuple, Optional, Sequence, Text, Tuple, Type, TypeVar, Union, overload _Decimal = Union[Decimal, int] _DecimalNew = Union[Decimal, float, Text, Tuple[int, Sequence[int], int]] @@ -11,7 +9,7 @@ _ComparableNum = Union[Decimal, float, numbers.Rational] else: _ComparableNum = Union[Decimal, float] -_DecimalT = TypeVar('_DecimalT', bound=Decimal) +_DecimalT = TypeVar("_DecimalT", bound=Decimal) class DecimalTuple(NamedTuple): sign: int @@ -39,27 +37,16 @@ def handle(self, context: Context, *args: Any) -> Optional[Decimal]: ... class Clamped(DecimalException): ... - class InvalidOperation(DecimalException): ... - class ConversionSyntax(InvalidOperation): ... - class DivisionByZero(DecimalException, ZeroDivisionError): ... - class DivisionImpossible(InvalidOperation): ... - class DivisionUndefined(InvalidOperation, ZeroDivisionError): ... - class Inexact(DecimalException): ... - class InvalidContext(InvalidOperation): ... - class Rounded(DecimalException): ... - class Subnormal(DecimalException): ... - class Overflow(Inexact, Rounded): ... - class Underflow(Inexact, Rounded, Subnormal): ... if sys.version_info >= (3,): @@ -80,15 +67,12 @@ def __div__(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... def __rdiv__(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... def __ne__(self, other: object, context: Optional[Context] = ...) -> bool: ... - def compare(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... def __hash__(self) -> int: ... def as_tuple(self) -> DecimalTuple: ... if sys.version_info >= (3, 6): def as_integer_ratio(self) -> Tuple[int, int]: ... - def to_eng_string(self, context: Optional[Context] = ...) -> str: ... - if sys.version_info >= (3,): def __abs__(self) -> Decimal: ... def __add__(self, other: _Decimal) -> Decimal: ... @@ -139,9 +123,7 @@ def __str__(self, eng: bool = ..., context: Optional[Context] = ...) -> str: ... def __sub__(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... def __truediv__(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... - def remainder_near(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... - def __float__(self) -> float: ... def __int__(self) -> int: ... def __trunc__(self) -> int: ... @@ -161,16 +143,15 @@ else: def __long__(self) -> long: ... def fma(self, other: _Decimal, third: _Decimal, context: Optional[Context] = ...) -> Decimal: ... - def __rpow__(self, other: _Decimal, context: Optional[Context] = ...) -> Decimal: ... def normalize(self, context: Optional[Context] = ...) -> Decimal: ... if sys.version_info >= (3,): - def quantize(self, exp: _Decimal, rounding: Optional[str] = ..., - context: Optional[Context] = ...) -> Decimal: ... + def quantize(self, exp: _Decimal, rounding: Optional[str] = ..., context: Optional[Context] = ...) -> Decimal: ... def same_quantum(self, other: _Decimal, context: Optional[Context] = ...) -> bool: ... else: - def quantize(self, exp: _Decimal, rounding: Optional[str] = ..., - context: Optional[Context] = ..., watchexp: bool = ...) -> Decimal: ... + def quantize( + self, exp: _Decimal, rounding: Optional[str] = ..., context: Optional[Context] = ..., watchexp: bool = ... + ) -> Decimal: ... def same_quantum(self, other: _Decimal) -> bool: ... def to_integral_exact(self, rounding: Optional[str] = ..., context: Optional[Context] = ...) -> Decimal: ... def to_integral_value(self, rounding: Optional[str] = ..., context: Optional[Context] = ...) -> Decimal: ... @@ -251,19 +232,31 @@ traps: Dict[_TrapType, bool] flags: Dict[_TrapType, bool] if sys.version_info >= (3,): - def __init__(self, prec: Optional[int] = ..., rounding: Optional[str] = ..., - Emin: Optional[int] = ..., Emax: Optional[int] = ..., - capitals: Optional[int] = ..., clamp: Optional[int] = ..., - flags: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., - traps: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., - _ignored_flags: Optional[List[_TrapType]] = ...) -> None: ... + def __init__( + self, + prec: Optional[int] = ..., + rounding: Optional[str] = ..., + Emin: Optional[int] = ..., + Emax: Optional[int] = ..., + capitals: Optional[int] = ..., + clamp: Optional[int] = ..., + flags: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., + traps: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., + _ignored_flags: Optional[List[_TrapType]] = ..., + ) -> None: ... else: - def __init__(self, prec: Optional[int] = ..., rounding: Optional[str] = ..., - traps: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., - flags: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., - Emin: Optional[int] = ..., Emax: Optional[int] = ..., - capitals: Optional[int] = ..., _clamp: Optional[int] = ..., - _ignored_flags: Optional[List[_TrapType]] = ...) -> None: ... + def __init__( + self, + prec: Optional[int] = ..., + rounding: Optional[str] = ..., + traps: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., + flags: Union[None, Dict[_TrapType, bool], Container[_TrapType]] = ..., + Emin: Optional[int] = ..., + Emax: Optional[int] = ..., + capitals: Optional[int] = ..., + _clamp: Optional[int] = ..., + _ignored_flags: Optional[List[_TrapType]] = ..., + ) -> None: ... if sys.version_info >= (3,): # __setattr__() only allows to set a specific set of attributes, # already defined above. diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/difflib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/difflib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/difflib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/difflib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,18 +1,32 @@ -# Based on https://docs.python.org/2.7/library/difflib.html and https://docs.python.org/3.2/library/difflib.html - import sys from typing import ( - Any, TypeVar, Callable, Iterable, Iterator, List, NamedTuple, Sequence, Tuple, - Generic, Optional, Text, Union, AnyStr, overload + Any, + AnyStr, + Callable, + Generic, + Iterable, + Iterator, + List, + NamedTuple, + Optional, + Sequence, + Text, + Tuple, + TypeVar, + Union, + overload, ) -_T = TypeVar('_T') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") if sys.version_info >= (3,): _StrType = Text else: # Aliases can't point to type vars, so we need to redeclare AnyStr - _StrType = TypeVar('_StrType', Text, bytes) + _StrType = TypeVar("_StrType", Text, bytes) _JunkCallback = Union[Callable[[Text], bool], Callable[[str], bool]] @@ -22,31 +36,36 @@ size: int class SequenceMatcher(Generic[_T]): - def __init__(self, isjunk: Optional[Callable[[_T], bool]] = ..., - a: Sequence[_T] = ..., b: Sequence[_T] = ..., - autojunk: bool = ...) -> None: ... + def __init__( + self, isjunk: Optional[Callable[[_T], bool]] = ..., a: Sequence[_T] = ..., b: Sequence[_T] = ..., autojunk: bool = ... + ) -> None: ... def set_seqs(self, a: Sequence[_T], b: Sequence[_T]) -> None: ... def set_seq1(self, a: Sequence[_T]) -> None: ... def set_seq2(self, b: Sequence[_T]) -> None: ... if sys.version_info >= (3, 9): - def find_longest_match(self, alo: int = ..., ahi: Optional[int] = ..., blo: int = ..., bhi: Optional[int] = ...) -> Match: ... + def find_longest_match( + self, alo: int = ..., ahi: Optional[int] = ..., blo: int = ..., bhi: Optional[int] = ... + ) -> Match: ... else: def find_longest_match(self, alo: int, ahi: int, blo: int, bhi: int) -> Match: ... def get_matching_blocks(self) -> List[Match]: ... def get_opcodes(self) -> List[Tuple[str, int, int, int, int]]: ... - def get_grouped_opcodes(self, n: int = ... - ) -> Iterable[List[Tuple[str, int, int, int, int]]]: ... + def get_grouped_opcodes(self, n: int = ...) -> Iterable[List[Tuple[str, int, int, int, int]]]: ... def ratio(self) -> float: ... def quick_ratio(self) -> float: ... def real_quick_ratio(self) -> float: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # mypy thinks the signatures of the overloads overlap, but the types still work fine @overload -def get_close_matches(word: AnyStr, possibilities: Iterable[AnyStr], # type: ignore - n: int = ..., cutoff: float = ...) -> List[AnyStr]: ... +def get_close_matches( # type: ignore + word: AnyStr, possibilities: Iterable[AnyStr], n: int = ..., cutoff: float = ... +) -> List[AnyStr]: ... @overload -def get_close_matches(word: Sequence[_T], possibilities: Iterable[Sequence[_T]], - n: int = ..., cutoff: float = ...) -> List[Sequence[_T]]: ... +def get_close_matches( + word: Sequence[_T], possibilities: Iterable[Sequence[_T]], n: int = ..., cutoff: float = ... +) -> List[Sequence[_T]]: ... class Differ: def __init__(self, linejunk: Optional[_JunkCallback] = ..., charjunk: Optional[_JunkCallback] = ...) -> None: ... @@ -54,33 +73,69 @@ def IS_LINE_JUNK(line: _StrType, pat: Any = ...) -> bool: ... # pat is undocumented def IS_CHARACTER_JUNK(ch: _StrType, ws: _StrType = ...) -> bool: ... # ws is undocumented -def unified_diff(a: Sequence[_StrType], b: Sequence[_StrType], fromfile: _StrType = ..., - tofile: _StrType = ..., fromfiledate: _StrType = ..., tofiledate: _StrType = ..., - n: int = ..., lineterm: _StrType = ...) -> Iterator[_StrType]: ... -def context_diff(a: Sequence[_StrType], b: Sequence[_StrType], fromfile: _StrType = ..., - tofile: _StrType = ..., fromfiledate: _StrType = ..., tofiledate: _StrType = ..., - n: int = ..., lineterm: _StrType = ...) -> Iterator[_StrType]: ... -def ndiff(a: Sequence[_StrType], b: Sequence[_StrType], - linejunk: Optional[_JunkCallback] = ..., - charjunk: Optional[_JunkCallback] = ... - ) -> Iterator[_StrType]: ... +def unified_diff( + a: Sequence[_StrType], + b: Sequence[_StrType], + fromfile: _StrType = ..., + tofile: _StrType = ..., + fromfiledate: _StrType = ..., + tofiledate: _StrType = ..., + n: int = ..., + lineterm: _StrType = ..., +) -> Iterator[_StrType]: ... +def context_diff( + a: Sequence[_StrType], + b: Sequence[_StrType], + fromfile: _StrType = ..., + tofile: _StrType = ..., + fromfiledate: _StrType = ..., + tofiledate: _StrType = ..., + n: int = ..., + lineterm: _StrType = ..., +) -> Iterator[_StrType]: ... +def ndiff( + a: Sequence[_StrType], b: Sequence[_StrType], linejunk: Optional[_JunkCallback] = ..., charjunk: Optional[_JunkCallback] = ... +) -> Iterator[_StrType]: ... class HtmlDiff(object): - def __init__(self, tabsize: int = ..., wrapcolumn: Optional[int] = ..., - linejunk: Optional[_JunkCallback] = ..., - charjunk: Optional[_JunkCallback] = ... - ) -> None: ... + def __init__( + self, + tabsize: int = ..., + wrapcolumn: Optional[int] = ..., + linejunk: Optional[_JunkCallback] = ..., + charjunk: Optional[_JunkCallback] = ..., + ) -> None: ... if sys.version_info >= (3, 5): - def make_file(self, fromlines: Sequence[_StrType], tolines: Sequence[_StrType], - fromdesc: _StrType = ..., todesc: _StrType = ..., context: bool = ..., - numlines: int = ..., *, charset: str = ...) -> _StrType: ... + def make_file( + self, + fromlines: Sequence[_StrType], + tolines: Sequence[_StrType], + fromdesc: _StrType = ..., + todesc: _StrType = ..., + context: bool = ..., + numlines: int = ..., + *, + charset: str = ..., + ) -> _StrType: ... else: - def make_file(self, fromlines: Sequence[_StrType], tolines: Sequence[_StrType], - fromdesc: _StrType = ..., todesc: _StrType = ..., context: bool = ..., - numlines: int = ...) -> _StrType: ... - def make_table(self, fromlines: Sequence[_StrType], tolines: Sequence[_StrType], - fromdesc: _StrType = ..., todesc: _StrType = ..., context: bool = ..., - numlines: int = ...) -> _StrType: ... + def make_file( + self, + fromlines: Sequence[_StrType], + tolines: Sequence[_StrType], + fromdesc: _StrType = ..., + todesc: _StrType = ..., + context: bool = ..., + numlines: int = ..., + ) -> _StrType: ... + def make_table( + self, + fromlines: Sequence[_StrType], + tolines: Sequence[_StrType], + fromdesc: _StrType = ..., + todesc: _StrType = ..., + context: bool = ..., + numlines: int = ..., + ) -> _StrType: ... def restore(delta: Iterable[_StrType], which: int) -> Iterator[_StrType]: ... @@ -94,5 +149,5 @@ fromfiledate: bytes = ..., tofiledate: bytes = ..., n: int = ..., - lineterm: bytes = ... + lineterm: bytes = ..., ) -> Iterator[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/archive_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/archive_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/archive_util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/archive_util.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# Stubs for distutils.archive_util - -from typing import Optional - - -def make_archive(base_name: str, format: str, root_dir: Optional[str] = ..., - base_dir: Optional[str] = ..., verbose: int = ..., - dry_run: int = ...) -> str: ... -def make_tarball(base_name: str, base_dir: str, compress: Optional[str] = ..., - verbose: int = ..., dry_run: int = ...) -> str: ... -def make_zipfile(base_name: str, base_dir: str, verbose: int = ..., - dry_run: int = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/bcppcompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/bcppcompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/bcppcompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/bcppcompiler.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Stubs for distutils.bcppcompiler - -from distutils.ccompiler import CCompiler - - -class BCPPCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/ccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/ccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/ccompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/ccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -# Stubs for distutils.ccompiler - -from typing import Any, Callable, List, Optional, Tuple, Union - - -_Macro = Union[Tuple[str], Tuple[str, Optional[str]]] - - -def gen_lib_options(compiler: CCompiler, library_dirs: List[str], - runtime_library_dirs: List[str], - libraries: List[str]) -> List[str]: ... -def gen_preprocess_options(macros: List[_Macro], - include_dirs: List[str]) -> List[str]: ... -def get_default_compiler(osname: Optional[str] = ..., - platform: Optional[str] = ...) -> str: ... -def new_compiler(plat: Optional[str] = ..., compiler: Optional[str] = ..., - verbose: int = ..., dry_run: int = ..., - force: int = ...) -> CCompiler: ... -def show_compilers() -> None: ... - -class CCompiler: - dry_run: bool - force: bool - verbose: bool - output_dir: Optional[str] - macros: List[_Macro] - include_dirs: List[str] - libraries: List[str] - library_dirs: List[str] - runtime_library_dirs: List[str] - objects: List[str] - def __init__(self, verbose: int = ..., dry_run: int = ..., - force: int = ...) -> None: ... - def add_include_dir(self, dir: str) -> None: ... - def set_include_dirs(self, dirs: List[str]) -> None: ... - def add_library(self, libname: str) -> None: ... - def set_libraries(self, libnames: List[str]) -> None: ... - def add_library_dir(self, dir: str) -> None: ... - def set_library_dirs(self, dirs: List[str]) -> None: ... - def add_runtime_library_dir(self, dir: str) -> None: ... - def set_runtime_library_dirs(self, dirs: List[str]) -> None: ... - def define_macro(self, name: str, value: Optional[str] = ...) -> None: ... - def undefine_macro(self, name: str) -> None: ... - def add_link_object(self, object: str) -> None: ... - def set_link_objects(self, objects: List[str]) -> None: ... - def detect_language(self, sources: Union[str, List[str]]) -> Optional[str]: ... - def find_library_file(self, dirs: List[str], lib: str, - debug: bool = ...) -> Optional[str]: ... - def has_function(self, funcname: str, includes: Optional[List[str]] = ..., - include_dirs: Optional[List[str]] = ..., - libraries: Optional[List[str]] = ..., - library_dirs: Optional[List[str]] = ...) -> bool: ... - def library_dir_option(self, dir: str) -> str: ... - def library_option(self, lib: str) -> str: ... - def runtime_library_dir_option(self, dir: str) -> str: ... - def set_executables(self, **args: str) -> None: ... - def compile(self, sources: List[str], output_dir: Optional[str] = ..., - macros: Optional[_Macro] = ..., - include_dirs: Optional[List[str]] = ..., debug: bool = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ..., - depends: Optional[List[str]] = ...) -> List[str]: ... - def create_static_lib(self, objects: List[str], output_libname: str, - output_dir: Optional[str] = ..., debug: bool = ..., - target_lang: Optional[str] = ...) -> None: ... - def link(self, target_desc: str, objects: List[str], output_filename: str, - output_dir: Optional[str] = ..., - libraries: Optional[List[str]] = ..., - library_dirs: Optional[List[str]] = ..., - runtime_library_dirs: Optional[List[str]] = ..., - export_symbols: Optional[List[str]] = ..., debug: bool = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ..., - build_temp: Optional[str] = ..., - target_lang: Optional[str] = ...) -> None: ... - def link_executable(self, objects: List[str], output_progname: str, - output_dir: Optional[str] = ..., - libraries: Optional[List[str]] = ..., - library_dirs: Optional[List[str]] = ..., - runtime_library_dirs: Optional[List[str]] = ..., - debug: bool = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ..., - target_lang: Optional[str] = ...) -> None: ... - def link_shared_lib(self, objects: List[str], output_libname: str, - output_dir: Optional[str] = ..., - libraries: Optional[List[str]] = ..., - library_dirs: Optional[List[str]] = ..., - runtime_library_dirs: Optional[List[str]] = ..., - export_symbols: Optional[List[str]] = ..., - debug: bool = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ..., - build_temp: Optional[str] = ..., - target_lang: Optional[str] = ...) -> None: ... - def link_shared_object(self, objects: List[str], output_filename: str, - output_dir: Optional[str] = ..., - libraries: Optional[List[str]] = ..., - library_dirs: Optional[List[str]] = ..., - runtime_library_dirs: Optional[List[str]] = ..., - export_symbols: Optional[List[str]] = ..., - debug: bool = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ..., - build_temp: Optional[str] = ..., - target_lang: Optional[str] = ...) -> None: ... - def preprocess(self, source: str, output_file: Optional[str] = ..., - macros: Optional[List[_Macro]] = ..., - include_dirs: Optional[List[str]] = ..., - extra_preargs: Optional[List[str]] = ..., - extra_postargs: Optional[List[str]] = ...) -> None: ... - def executable_filename(self, basename: str, strip_dir: int = ..., - output_dir: str = ...) -> str: ... - def library_filename(self, libname: str, lib_type: str = ..., - strip_dir: int = ..., - output_dir: str = ...) -> str: ... - def object_filenames(self, source_filenames: List[str], - strip_dir: int = ..., - output_dir: str = ...) -> List[str]: ... - def shared_object_filename(self, basename: str, strip_dir: int = ..., - output_dir: str = ...) -> str: ... - def execute(self, func: Callable[..., None], args: Tuple[Any, ...], - msg: Optional[str] = ..., level: int = ...) -> None: ... - def spawn(self, cmd: List[str]) -> None: ... - def mkpath(self, name: str, mode: int = ...) -> None: ... - def move_file(self, src: str, dst: str) -> str: ... - def announce(self, msg: str, level: int = ...) -> None: ... - def warn(self, msg: str) -> None: ... - def debug_print(self, msg: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cmd.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cmd.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cmd.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cmd.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# Stubs for distutils.cmd - -from typing import Callable, List, Tuple, Union, Optional, Iterable, Any, Text -from abc import abstractmethod -from distutils.dist import Distribution - -class Command: - sub_commands: List[Tuple[str, Optional[Callable[[Command], bool]]]] - def __init__(self, dist: Distribution) -> None: ... - @abstractmethod - def initialize_options(self) -> None: ... - @abstractmethod - def finalize_options(self) -> None: ... - @abstractmethod - def run(self) -> None: ... - - def announce(self, msg: Text, level: int = ...) -> None: ... - def debug_print(self, msg: Text) -> None: ... - - def ensure_string(self, option: str, default: Optional[str] = ...) -> None: ... - def ensure_string_list(self, option: Union[str, List[str]]) -> None: ... - def ensure_filename(self, option: str) -> None: ... - def ensure_dirname(self, option: str) -> None: ... - - def get_command_name(self) -> str: ... - def set_undefined_options(self, src_cmd: Text, *option_pairs: Tuple[str, str]) -> None: ... - def get_finalized_command(self, command: Text, create: int = ...) -> Command: ... - def reinitialize_command(self, command: Union[Command, Text], reinit_subcommands: int = ...) -> Command: ... - def run_command(self, command: Text) -> None: ... - def get_sub_commands(self) -> List[str]: ... - - def warn(self, msg: Text) -> None: ... - def execute(self, func: Callable[..., Any], args: Iterable[Any], msg: Optional[Text] = ..., level: int = ...) -> None: ... - def mkpath(self, name: str, mode: int = ...) -> None: ... - def copy_file(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., link: Optional[str] = ..., level: Any = ...) -> Tuple[str, bool]: ... # level is not used - def copy_tree(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., preserve_symlinks: int = ..., level: Any = ...) -> List[str]: ... # level is not used - def move_file(self, src: str, dst: str, level: Any = ...) -> str: ... # level is not used - def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ... # level is not used - def make_archive(self, base_name: str, format: str, root_dir: Optional[str] = ..., base_dir: Optional[str] = ..., owner: Optional[str] = ..., group: Optional[str] = ...) -> str: ... - def make_file(self, infiles: Union[str, List[str], Tuple[str]], outfile: str, func: Callable[..., Any], args: List[Any], exec_msg: Optional[str] = ..., skip_msg: Optional[str] = ..., level: Any = ...) -> None: ... # level is not used diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/bdist_msi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/bdist_msi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/bdist_msi.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/bdist_msi.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -from distutils.cmd import Command - -class bdist_msi(Command): - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/build_py.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/build_py.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/build_py.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/build_py.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -from distutils.cmd import Command -import sys - -if sys.version_info >= (3,): - class build_py(Command): - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def run(self) -> None: ... - - class build_py_2to3(build_py): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/config.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/config.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -from distutils import log as log -from distutils.ccompiler import CCompiler -from distutils.core import Command as Command -from distutils.errors import DistutilsExecError as DistutilsExecError -from distutils.sysconfig import customize_compiler as customize_compiler -from typing import Any, Dict, List, Match, Optional, Pattern, Sequence, Tuple, Union - -LANG_EXT: Dict[str, str] - -class config(Command): - description: str = ... - # Tuple is full name, short name, description - user_options: Sequence[Tuple[str, Optional[str], str]] = ... - compiler: Optional[Union[str, CCompiler]] = ... - cc: Optional[str] = ... - include_dirs: Optional[Sequence[str]] = ... - libraries: Optional[Sequence[str]] = ... - library_dirs: Optional[Sequence[str]] = ... - noisy: int = ... - dump_source: int = ... - temp_files: Sequence[str] = ... - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def run(self) -> None: ... - def try_cpp( - self, - body: Optional[str] = ..., - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - lang: str = ..., - ) -> bool: ... - def search_cpp( - self, - pattern: Union[Pattern[str], str], - body: Optional[str] = ..., - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - lang: str = ..., - ) -> bool: ... - def try_compile( - self, body: str, headers: Optional[Sequence[str]] = ..., include_dirs: Optional[Sequence[str]] = ..., lang: str = ... - ) -> bool: ... - def try_link( - self, - body: str, - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - libraries: Optional[Sequence[str]] = ..., - library_dirs: Optional[Sequence[str]] = ..., - lang: str = ..., - ) -> bool: ... - def try_run( - self, - body: str, - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - libraries: Optional[Sequence[str]] = ..., - library_dirs: Optional[Sequence[str]] = ..., - lang: str = ..., - ) -> bool: ... - def check_func( - self, - func: str, - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - libraries: Optional[Sequence[str]] = ..., - library_dirs: Optional[Sequence[str]] = ..., - decl: int = ..., - call: int = ..., - ) -> bool: ... - def check_lib( - self, - library: str, - library_dirs: Optional[Sequence[str]] = ..., - headers: Optional[Sequence[str]] = ..., - include_dirs: Optional[Sequence[str]] = ..., - other_libraries: List[str] = ..., - ) -> bool: ... - def check_header( - self, - header: str, - include_dirs: Optional[Sequence[str]] = ..., - library_dirs: Optional[Sequence[str]] = ..., - lang: str = ..., - ) -> bool: ... - -def dump_file(filename: str, head: Optional[str] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/install.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/install.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/install.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/command/install.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -from distutils.cmd import Command -from typing import Optional, Text - - -class install(Command): - user: bool - prefix: Optional[Text] - home: Optional[Text] - root: Optional[Text] - install_lib: Optional[Text] - - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/core.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/core.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/core.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/core.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -# Stubs for distutils.core - -from typing import Any, List, Mapping, Optional, Tuple, Type, Union -from distutils.cmd import Command as Command -from distutils.dist import Distribution as Distribution -from distutils.extension import Extension as Extension - -def setup( - *, - name: str = ..., - version: str = ..., - description: str = ..., - long_description: str = ..., - author: str = ..., - author_email: str = ..., - maintainer: str = ..., - maintainer_email: str = ..., - url: str = ..., - download_url: str = ..., - packages: List[str] = ..., - py_modules: List[str] = ..., - scripts: List[str] = ..., - ext_modules: List[Extension] = ..., - classifiers: List[str] = ..., - distclass: Type[Distribution] = ..., - script_name: str = ..., - script_args: List[str] = ..., - options: Mapping[str, Any] = ..., - license: str = ..., - keywords: Union[List[str], str] = ..., - platforms: Union[List[str], str] = ..., - cmdclass: Mapping[str, Type[Command]] = ..., - data_files: List[Tuple[str, List[str]]] = ..., - package_dir: Mapping[str, str] = ..., - obsoletes: List[str] = ..., - provides: List[str] = ..., - requires: List[str] = ..., - command_packages: List[str] = ..., - command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ..., - package_data: Mapping[str, List[str]] = ..., - include_package_data: bool = ..., - libraries: List[str] = ..., - headers: List[str] = ..., - ext_package: str = ..., - include_dirs: List[str] = ..., - password: str = ..., - fullname: str = ..., - **attrs: Any, -) -> None: ... -def run_setup(script_name: str, script_args: Optional[List[str]] = ..., stop_after: str = ...) -> Distribution: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cygwinccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cygwinccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cygwinccompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/cygwinccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Stubs for distutils.cygwinccompiler - -from distutils.unixccompiler import UnixCCompiler - - -class CygwinCCompiler(UnixCCompiler): ... -class Mingw32CCompiler(CygwinCCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/debug.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/debug.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/debug.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/debug.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Stubs for distutils.debug - -DEBUG: bool diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dep_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dep_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dep_util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dep_util.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# Stubs for distutils.dep_util - -from typing import List, Tuple - -def newer(source: str, target: str) -> bool: ... -def newer_pairwise(sources: List[str], - targets: List[str]) -> List[Tuple[str, str]]: ... -def newer_group(sources: List[str], target: str, missing: str = ...) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dir_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dir_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dir_util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dir_util.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# Stubs for distutils.dir_util - -from typing import List - - -def mkpath(name: str, mode: int = ..., verbose: int = ..., - dry_run: int = ...) -> List[str]: ... -def create_tree(base_dir: str, files: List[str], mode: int = ..., - verbose: int = ..., dry_run: int = ...) -> None: ... -def copy_tree(src: str, dst: str, preserve_mode: int = ..., - preserve_times: int = ..., preserve_symlinks: int = ..., - update: int = ..., verbose: int = ..., - dry_run: int = ...) -> List[str]: ... -def remove_tree(directory: str, verbose: int = ..., - dry_run: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dist.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/dist.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# Stubs for distutils.dist -from distutils.cmd import Command - -from typing import Any, Dict, Iterable, Mapping, Optional, Text, Tuple, Type - - -class Distribution: - cmdclass: Dict[str, Type[Command]] - def __init__(self, attrs: Optional[Mapping[str, Any]] = ...) -> None: ... - def get_option_dict(self, command: str) -> Dict[str, Tuple[str, Text]]: ... - def parse_config_files(self, filenames: Optional[Iterable[Text]] = ...) -> None: ... - def get_command_obj(self, command: str, create: bool = ...) -> Optional[Command]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/errors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/errors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/errors.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/errors.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -class DistutilsError(Exception): ... -class DistutilsModuleError(DistutilsError): ... -class DistutilsClassError(DistutilsError): ... -class DistutilsGetoptError(DistutilsError): ... -class DistutilsArgError(DistutilsError): ... -class DistutilsFileError(DistutilsError): ... -class DistutilsOptionError(DistutilsError): ... -class DistutilsSetupError(DistutilsError): ... -class DistutilsPlatformError(DistutilsError): ... -class DistutilsExecError(DistutilsError): ... -class DistutilsInternalError(DistutilsError): ... -class DistutilsTemplateError(DistutilsError): ... -class DistutilsByteCompileError(DistutilsError): ... -class CCompilerError(Exception): ... -class PreprocessError(CCompilerError): ... -class CompileError(CCompilerError): ... -class LibError(CCompilerError): ... -class LinkError(CCompilerError): ... -class UnknownFileError(CCompilerError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/extension.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/extension.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/extension.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/extension.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# Stubs for distutils.extension - -from typing import List, Optional, Tuple -import sys - -class Extension: - if sys.version_info >= (3,): - def __init__(self, - name: str, - sources: List[str], - include_dirs: List[str] = ..., - define_macros: List[Tuple[str, Optional[str]]] = ..., - undef_macros: List[str] = ..., - library_dirs: List[str] = ..., - libraries: List[str] = ..., - runtime_library_dirs: List[str] = ..., - extra_objects: List[str] = ..., - extra_compile_args: List[str] = ..., - extra_link_args: List[str] = ..., - export_symbols: List[str] = ..., - swig_opts: Optional[str] = ..., # undocumented - depends: List[str] = ..., - language: str = ..., - optional: bool = ...) -> None: ... - else: - def __init__(self, - name: str, - sources: List[str], - include_dirs: List[str] = ..., - define_macros: List[Tuple[str, Optional[str]]] = ..., - undef_macros: List[str] = ..., - library_dirs: List[str] = ..., - libraries: List[str] = ..., - runtime_library_dirs: List[str] = ..., - extra_objects: List[str] = ..., - extra_compile_args: List[str] = ..., - extra_link_args: List[str] = ..., - export_symbols: List[str] = ..., - swig_opts: Optional[str] = ..., # undocumented - depends: List[str] = ..., - language: str = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/fancy_getopt.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/fancy_getopt.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/fancy_getopt.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/fancy_getopt.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# Stubs for distutils.fancy_getopt - -from typing import ( - Any, List, Mapping, Optional, Tuple, Union, - TypeVar, overload, -) - -_Option = Tuple[str, Optional[str], str] -_GR = Tuple[List[str], OptionDummy] - -def fancy_getopt(options: List[_Option], - negative_opt: Mapping[_Option, _Option], - object: Any, - args: Optional[List[str]]) -> Union[List[str], _GR]: ... -def wrap_text(text: str, width: int) -> List[str]: ... - -class FancyGetopt: - def __init__(self, option_table: Optional[List[_Option]] = ...) -> None: ... - # TODO kinda wrong, `getopt(object=object())` is invalid - @overload - def getopt(self, args: Optional[List[str]] = ...) -> _GR: ... - @overload - def getopt(self, args: Optional[List[str]], object: Any) -> List[str]: ... - def get_option_order(self) -> List[Tuple[str, str]]: ... - def generate_help(self, header: Optional[str] = ...) -> List[str]: ... - -class OptionDummy: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/filelist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/filelist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/filelist.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/filelist.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Stubs for distutils.filelist - -class FileList: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/file_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/file_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/file_util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/file_util.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# Stubs for distutils.file_util - -from typing import Optional, Sequence, Tuple - - -def copy_file(src: str, dst: str, preserve_mode: bool = ..., - preserve_times: bool = ..., update: bool = ..., - link: Optional[str] = ..., verbose: bool = ..., - dry_run: bool = ...) -> Tuple[str, str]: ... -def move_file(src: str, dst: str, verbose: bool = ..., - dry_run: bool = ...) -> str: ... -def write_file(filename: str, contents: Sequence[str]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/log.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/log.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/log.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/log.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -from typing import Any, Callable, Iterable, Text - -DEBUG: int -INFO: int -WARN: int -ERROR: int -FATAL: int - -class Log: - def __init__(self, threshold: int = ...) -> None: ... - def log(self, level: int, msg: Text, *args: Any) -> None: ... - def debug(self, msg: Text, *args: Any) -> None: ... - def info(self, msg: Text, *args: Any) -> None: ... - def warn(self, msg: Text, *args: Any) -> None: ... - def error(self, msg: Text, *args: Any) -> None: ... - def fatal(self, msg: Text, *args: Any) -> None: ... - -_LogFunc = Callable[[Text, Iterable[Any]], None] - -log: Callable[[int, Text, Iterable[Any]], None] -debug: _LogFunc -info: _LogFunc -warn: _LogFunc -error: _LogFunc -fatal: _LogFunc - -def set_threshold(level: int) -> int: ... -def set_verbosity(v: int) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/msvccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/msvccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/msvccompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/msvccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Stubs for distutils.msvccompiler - -from distutils.ccompiler import CCompiler - - -class MSVCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/spawn.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/spawn.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/spawn.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/spawn.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# Stubs for distutils.spawn - -from typing import List, Optional - -def spawn(cmd: List[str], search_path: bool = ..., - verbose: bool = ..., dry_run: bool = ...) -> None: ... -def find_executable(executable: str, - path: Optional[str] = ...) -> Optional[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/sysconfig.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/sysconfig.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/sysconfig.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/sysconfig.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# Stubs for distutils.sysconfig - -from typing import Mapping, Optional, Union -from distutils.ccompiler import CCompiler - -PREFIX: str -EXEC_PREFIX: str - -def get_config_var(name: str) -> Union[int, str, None]: ... -def get_config_vars(*args: str) -> Mapping[str, Union[int, str]]: ... -def get_config_h_filename() -> str: ... -def get_makefile_filename() -> str: ... -def get_python_inc(plat_specific: bool = ..., - prefix: Optional[str] = ...) -> str: ... -def get_python_lib(plat_specific: bool = ..., standard_lib: bool = ..., - prefix: Optional[str] = ...) -> str: ... - -def customize_compiler(compiler: CCompiler) -> None: ... -def set_python_build() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/text_file.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/text_file.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/text_file.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/text_file.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -# Stubs for distutils.text_file - -from typing import IO, List, Optional, Tuple, Union - -class TextFile: - def __init__(self, filename: Optional[str] = ..., - file: Optional[IO[str]] = ..., - *, strip_comments: bool = ..., - lstrip_ws: bool = ..., rstrip_ws: bool = ..., - skip_blanks: bool = ..., join_lines: bool = ..., - collapse_join: bool = ...) -> None: ... - def open(self, filename: str) -> None: ... - def close(self) -> None: ... - def warn(self, msg: str, - line: Union[List[int], Tuple[int, int], int] = ...) -> None: ... - def readline(self) -> Optional[str]: ... - def readlines(self) -> List[str]: ... - def unreadline(self, line: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/unixccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/unixccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/unixccompiler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/unixccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Stubs for distutils.unixccompiler - -from distutils.ccompiler import CCompiler - - -class UnixCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/util.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# Stubs for distutils.util - -from typing import Any, Callable, List, Mapping, Optional, Tuple - - -def get_platform() -> str: ... -def convert_path(pathname: str) -> str: ... -def change_root(new_root: str, pathname: str) -> str: ... -def check_environ() -> None: ... -def subst_vars(s: str, local_vars: Mapping[str, str]) -> None: ... -def split_quoted(s: str) -> List[str]: ... -def execute(func: Callable[..., None], args: Tuple[Any, ...], - msg: Optional[str] = ..., verbose: bool = ..., - dry_run: bool = ...) -> None: ... -def strtobool(val: str) -> bool: ... -def byte_compile(py_files: List[str], optimize: int = ..., force: bool = ..., - prefix: Optional[str] = ..., base_dir: Optional[str] = ..., - verbose: bool = ..., dry_run: bool = ..., - direct: Optional[bool] = ...) -> None: ... -def rfc822_escape(header: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/version.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/version.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/version.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/distutils/version.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -import sys -from abc import abstractmethod -from typing import Any, Optional, TypeVar, Union, Pattern, Text, Tuple - -_T = TypeVar('_T', bound=Version) - -class Version: - def __repr__(self) -> str: ... - - if sys.version_info >= (3,): - def __eq__(self, other: object) -> bool: ... - def __lt__(self: _T, other: Union[_T, str]) -> bool: ... - def __le__(self: _T, other: Union[_T, str]) -> bool: ... - def __gt__(self: _T, other: Union[_T, str]) -> bool: ... - def __ge__(self: _T, other: Union[_T, str]) -> bool: ... - - @abstractmethod - def __init__(self, vstring: Optional[Text] = ...) -> None: ... - @abstractmethod - def parse(self: _T, vstring: Text) -> _T: ... - @abstractmethod - def __str__(self) -> str: ... - if sys.version_info >= (3,): - @abstractmethod - def _cmp(self: _T, other: Union[_T, str]) -> bool: ... - else: - @abstractmethod - def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... - -class StrictVersion(Version): - version_re: Pattern[str] - version: Tuple[int, int, int] - prerelease: Optional[Tuple[Text, int]] - - def __init__(self, vstring: Optional[Text] = ...) -> None: ... - def parse(self: _T, vstring: Text) -> _T: ... - def __str__(self) -> str: ... - if sys.version_info >= (3,): - def _cmp(self: _T, other: Union[_T, str]) -> bool: ... - else: - def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... - -class LooseVersion(Version): - component_re: Pattern[str] - vstring: Text - version: Tuple[Union[Text, int], ...] - - def __init__(self, vstring: Optional[Text] = ...) -> None: ... - def parse(self: _T, vstring: Text) -> _T: ... - def __str__(self) -> str: ... - if sys.version_info >= (3,): - def _cmp(self: _T, other: Union[_T, str]) -> bool: ... - else: - def __cmp__(self: _T, other: Union[_T, str]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/doctest.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/doctest.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/doctest.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/doctest.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,15 +1,16 @@ -from typing import Any, Callable, Dict, List, NamedTuple, Optional, Tuple, Type, Union - import sys import types import unittest +from typing import Any, Callable, Dict, List, NamedTuple, Optional, Tuple, Type, Union class TestResults(NamedTuple): failed: int attempted: int OPTIONFLAGS_BY_NAME: Dict[str, int] + def register_optionflag(name: str) -> int: ... + DONT_ACCEPT_TRUE_FOR_1: int DONT_ACCEPT_BLANKLINE: int NORMALIZE_WHITESPACE: int @@ -38,8 +39,15 @@ lineno: int indent: int options: Dict[int, bool] - def __init__(self, source: str, want: str, exc_msg: Optional[str] = ..., lineno: int = ..., indent: int = ..., - options: Optional[Dict[int, bool]] = ...) -> None: ... + def __init__( + self, + source: str, + want: str, + exc_msg: Optional[str] = ..., + lineno: int = ..., + indent: int = ..., + options: Optional[Dict[int, bool]] = ..., + ) -> None: ... def __hash__(self) -> int: ... class DocTest: @@ -49,20 +57,37 @@ filename: Optional[str] lineno: Optional[int] docstring: Optional[str] - def __init__(self, examples: List[Example], globs: Dict[str, Any], name: str, filename: Optional[str], lineno: Optional[int], docstring: Optional[str]) -> None: ... + def __init__( + self, + examples: List[Example], + globs: Dict[str, Any], + name: str, + filename: Optional[str], + lineno: Optional[int], + docstring: Optional[str], + ) -> None: ... def __hash__(self) -> int: ... def __lt__(self, other: DocTest) -> bool: ... class DocTestParser: def parse(self, string: str, name: str = ...) -> List[Union[str, Example]]: ... - def get_doctest(self, string: str, globs: Dict[str, Any], name: str, filename: Optional[str], lineno: Optional[int]) -> DocTest: ... + def get_doctest( + self, string: str, globs: Dict[str, Any], name: str, filename: Optional[str], lineno: Optional[int] + ) -> DocTest: ... def get_examples(self, string: str, name: str = ...) -> List[Example]: ... class DocTestFinder: - def __init__(self, verbose: bool = ..., parser: DocTestParser = ..., - recurse: bool = ..., exclude_empty: bool = ...) -> None: ... - def find(self, obj: object, name: Optional[str] = ..., module: Union[None, bool, types.ModuleType] = ..., - globs: Optional[Dict[str, Any]] = ..., extraglobs: Optional[Dict[str, Any]] = ...) -> List[DocTest]: ... + def __init__( + self, verbose: bool = ..., parser: DocTestParser = ..., recurse: bool = ..., exclude_empty: bool = ... + ) -> None: ... + def find( + self, + obj: object, + name: Optional[str] = ..., + module: Union[None, bool, types.ModuleType] = ..., + globs: Optional[Dict[str, Any]] = ..., + extraglobs: Optional[Dict[str, Any]] = ..., + ) -> List[DocTest]: ... _Out = Callable[[str], Any] _ExcInfo = Tuple[Type[BaseException], BaseException, types.TracebackType] @@ -74,13 +99,14 @@ tries: int failures: int test: DocTest - def __init__(self, checker: Optional[OutputChecker] = ..., verbose: Optional[bool] = ..., optionflags: int = ...) -> None: ... def report_start(self, out: _Out, test: DocTest, example: Example) -> None: ... def report_success(self, out: _Out, test: DocTest, example: Example, got: str) -> None: ... def report_failure(self, out: _Out, test: DocTest, example: Example, got: str) -> None: ... def report_unexpected_exception(self, out: _Out, test: DocTest, example: Example, exc_info: _ExcInfo) -> None: ... - def run(self, test: DocTest, compileflags: Optional[int] = ..., out: Optional[_Out] = ..., clear_globs: bool = ...) -> TestResults: ... + def run( + self, test: DocTest, compileflags: Optional[int] = ..., out: Optional[_Out] = ..., clear_globs: bool = ... + ) -> TestResults: ... def summarize(self, verbose: Optional[bool] = ...) -> TestResults: ... def merge(self, other: DocTestRunner) -> None: ... @@ -92,35 +118,62 @@ test: DocTest example: Example got: str - def __init__(self, test: DocTest, example: Example, got: str) -> None: ... class UnexpectedException(Exception): test: DocTest example: Example exc_info: _ExcInfo - def __init__(self, test: DocTest, example: Example, exc_info: _ExcInfo) -> None: ... class DebugRunner(DocTestRunner): ... master: Optional[DocTestRunner] -def testmod(m: Optional[types.ModuleType] = ..., name: Optional[str] = ..., globs: Optional[Dict[str, Any]] = ..., verbose: Optional[bool] = ..., - report: bool = ..., optionflags: int = ..., extraglobs: Optional[Dict[str, Any]] = ..., - raise_on_error: bool = ..., exclude_empty: bool = ...) -> TestResults: ... -def testfile(filename: str, module_relative: bool = ..., name: Optional[str] = ..., package: Union[None, str, types.ModuleType] = ..., - globs: Optional[Dict[str, Any]] = ..., verbose: Optional[bool] = ..., report: bool = ..., optionflags: int = ..., - extraglobs: Optional[Dict[str, Any]] = ..., raise_on_error: bool = ..., parser: DocTestParser = ..., - encoding: Optional[str] = ...) -> TestResults: ... -def run_docstring_examples(f: object, globs: Dict[str, Any], verbose: bool = ..., name: str = ..., - compileflags: Optional[int] = ..., optionflags: int = ...) -> None: ... +def testmod( + m: Optional[types.ModuleType] = ..., + name: Optional[str] = ..., + globs: Optional[Dict[str, Any]] = ..., + verbose: Optional[bool] = ..., + report: bool = ..., + optionflags: int = ..., + extraglobs: Optional[Dict[str, Any]] = ..., + raise_on_error: bool = ..., + exclude_empty: bool = ..., +) -> TestResults: ... +def testfile( + filename: str, + module_relative: bool = ..., + name: Optional[str] = ..., + package: Union[None, str, types.ModuleType] = ..., + globs: Optional[Dict[str, Any]] = ..., + verbose: Optional[bool] = ..., + report: bool = ..., + optionflags: int = ..., + extraglobs: Optional[Dict[str, Any]] = ..., + raise_on_error: bool = ..., + parser: DocTestParser = ..., + encoding: Optional[str] = ..., +) -> TestResults: ... +def run_docstring_examples( + f: object, + globs: Dict[str, Any], + verbose: bool = ..., + name: str = ..., + compileflags: Optional[int] = ..., + optionflags: int = ..., +) -> None: ... def set_unittest_reportflags(flags: int) -> int: ... class DocTestCase(unittest.TestCase): - def __init__(self, test: DocTest, optionflags: int = ..., setUp: Optional[Callable[[DocTest], Any]] = ..., - tearDown: Optional[Callable[[DocTest], Any]] = ..., - checker: Optional[OutputChecker] = ...) -> None: ... + def __init__( + self, + test: DocTest, + optionflags: int = ..., + setUp: Optional[Callable[[DocTest], Any]] = ..., + tearDown: Optional[Callable[[DocTest], Any]] = ..., + checker: Optional[OutputChecker] = ..., + ) -> None: ... def setUp(self) -> None: ... def tearDown(self) -> None: ... def runTest(self) -> None: ... @@ -138,20 +191,31 @@ if sys.version_info >= (3, 4): class _DocTestSuite(unittest.TestSuite): ... + else: _DocTestSuite = unittest.TestSuite -def DocTestSuite(module: Union[None, str, types.ModuleType] = ..., globs: Optional[Dict[str, Any]] = ..., - extraglobs: Optional[Dict[str, Any]] = ..., test_finder: Optional[DocTestFinder] = ..., - **options: Any) -> _DocTestSuite: ... +def DocTestSuite( + module: Union[None, str, types.ModuleType] = ..., + globs: Optional[Dict[str, Any]] = ..., + extraglobs: Optional[Dict[str, Any]] = ..., + test_finder: Optional[DocTestFinder] = ..., + **options: Any, +) -> _DocTestSuite: ... class DocFileCase(DocTestCase): def id(self) -> str: ... def format_failure(self, err: str) -> str: ... -def DocFileTest(path: str, module_relative: bool = ..., package: Union[None, str, types.ModuleType] = ..., - globs: Optional[Dict[str, Any]] = ..., parser: DocTestParser = ..., - encoding: Optional[str] = ..., **options: Any) -> DocFileCase: ... +def DocFileTest( + path: str, + module_relative: bool = ..., + package: Union[None, str, types.ModuleType] = ..., + globs: Optional[Dict[str, Any]] = ..., + parser: DocTestParser = ..., + encoding: Optional[str] = ..., + **options: Any, +) -> DocFileCase: ... def DocFileSuite(*paths: str, **kw: Any) -> _DocTestSuite: ... def script_from_examples(s: str) -> str: ... def testsource(module: Union[None, str, types.ModuleType], name: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_dummy_threading.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_dummy_threading.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_dummy_threading.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_dummy_threading.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,20 +1,17 @@ - -from typing import ( - Any, Callable, Iterable, List, Mapping, Optional, Text, Tuple, Type, Union, - TypeVar, -) -from types import FrameType, TracebackType import sys +from types import FrameType, TracebackType +from typing import Any, Callable, Iterable, List, Mapping, Optional, Text, Type, TypeVar, Union # TODO recursive type _TF = Callable[[FrameType, str, Any], Optional[Callable[..., Any]]] _PF = Callable[[FrameType, str, Any], None] -_T = TypeVar('_T') +_T = TypeVar("_T") __all__: List[str] def active_count() -> int: ... + if sys.version_info < (3,): def activeCount() -> int: ... @@ -41,30 +38,35 @@ class ThreadError(Exception): ... - class local(object): def __getattribute__(self, name: str) -> Any: ... def __setattr__(self, name: str, value: Any) -> None: ... def __delattr__(self, name: str) -> None: ... - class Thread: name: str ident: Optional[int] daemon: bool if sys.version_info >= (3,): - def __init__(self, group: None = ..., - target: Optional[Callable[..., Any]] = ..., - name: Optional[str] = ..., - args: Iterable[Any] = ..., - kwargs: Mapping[str, Any] = ..., - *, daemon: Optional[bool] = ...) -> None: ... - else: - def __init__(self, group: None = ..., - target: Optional[Callable[..., Any]] = ..., - name: Optional[Text] = ..., - args: Iterable[Any] = ..., - kwargs: Mapping[Text, Any] = ...) -> None: ... + def __init__( + self, + group: None = ..., + target: Optional[Callable[..., Any]] = ..., + name: Optional[str] = ..., + args: Iterable[Any] = ..., + kwargs: Mapping[str, Any] = ..., + *, + daemon: Optional[bool] = ..., + ) -> None: ... + else: + def __init__( + self, + group: None = ..., + target: Optional[Callable[..., Any]] = ..., + name: Optional[Text] = ..., + args: Iterable[Any] = ..., + kwargs: Mapping[Text, Any] = ..., + ) -> None: ... def start(self) -> None: ... def run(self) -> None: ... def join(self, timeout: Optional[float] = ...) -> None: ... @@ -79,16 +81,14 @@ def isDaemon(self) -> bool: ... def setDaemon(self, daemonic: bool) -> None: ... - class _DummyThread(Thread): ... - class Lock: def __init__(self) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -96,29 +96,26 @@ def release(self) -> None: ... def locked(self) -> bool: ... - class _RLock: def __init__(self) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: def acquire(self, blocking: bool = ...) -> bool: ... def release(self) -> None: ... - RLock = _RLock - class Condition: def __init__(self, lock: Union[Lock, _RLock, None] = ...) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -126,19 +123,17 @@ def release(self) -> None: ... def wait(self, timeout: Optional[float] = ...) -> bool: ... if sys.version_info >= (3,): - def wait_for(self, predicate: Callable[[], _T], - timeout: Optional[float] = ...) -> _T: ... + def wait_for(self, predicate: Callable[[], _T], timeout: Optional[float] = ...) -> _T: ... def notify(self, n: int = ...) -> None: ... def notify_all(self) -> None: ... def notifyAll(self) -> None: ... - class Semaphore: def __init__(self, value: int = ...) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -150,7 +145,6 @@ class BoundedSemaphore(Semaphore): ... - class Event: def __init__(self) -> None: ... def is_set(self) -> bool: ... @@ -161,30 +155,36 @@ def wait(self, timeout: Optional[float] = ...) -> bool: ... if sys.version_info >= (3, 8): - from _thread import _ExceptHookArgs as ExceptHookArgs, ExceptHookArgs as _ExceptHookArgs # don't ask + import _thread + + # don't ask... + _ExceptHookArgs = _thread.ExceptHookArgs + ExceptHookArgs = _thread._ExceptHookArgs + excepthook: Callable[[_ExceptHookArgs], Any] class Timer(Thread): if sys.version_info >= (3,): - def __init__(self, interval: float, function: Callable[..., Any], - args: Optional[Iterable[Any]] = ..., - kwargs: Optional[Mapping[str, Any]] = ...) -> None: ... - else: - def __init__(self, interval: float, function: Callable[..., Any], - args: Iterable[Any] = ..., - kwargs: Mapping[str, Any] = ...) -> None: ... + def __init__( + self, + interval: float, + function: Callable[..., Any], + args: Optional[Iterable[Any]] = ..., + kwargs: Optional[Mapping[str, Any]] = ..., + ) -> None: ... + else: + def __init__( + self, interval: float, function: Callable[..., Any], args: Iterable[Any] = ..., kwargs: Mapping[str, Any] = ... + ) -> None: ... def cancel(self) -> None: ... - if sys.version_info >= (3,): class Barrier: parties: int n_waiting: int broken: bool - def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., - timeout: Optional[float] = ...) -> None: ... + def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., timeout: Optional[float] = ...) -> None: ... def wait(self, timeout: Optional[float] = ...) -> int: ... def reset(self) -> None: ... def abort(self) -> None: ... - class BrokenBarrierError(RuntimeError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/filecmp.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/filecmp.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/filecmp.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/filecmp.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,36 +1,48 @@ -# Stubs for filecmp (Python 2/3) import sys -from typing import AnyStr, Callable, Dict, Generic, Iterable, List, Optional, Sequence, Tuple, Union, Text +from typing import Any, AnyStr, Callable, Dict, Generic, Iterable, List, Optional, Sequence, Text, Tuple, Union if sys.version_info >= (3, 6): from os import PathLike +if sys.version_info >= (3, 9): + from types import GenericAlias + DEFAULT_IGNORES: List[str] if sys.version_info >= (3, 6): - def cmp(f1: Union[bytes, Text, PathLike[AnyStr]], f2: Union[bytes, Text, PathLike[AnyStr]], shallow: Union[int, bool] = ...) -> bool: ... - def cmpfiles(a: Union[AnyStr, PathLike[AnyStr]], b: Union[AnyStr, PathLike[AnyStr]], common: Iterable[AnyStr], - shallow: Union[int, bool] = ...) -> Tuple[List[AnyStr], List[AnyStr], List[AnyStr]]: ... + def cmp( + f1: Union[bytes, Text, PathLike[AnyStr]], f2: Union[bytes, Text, PathLike[AnyStr]], shallow: Union[int, bool] = ... + ) -> bool: ... + def cmpfiles( + a: Union[AnyStr, PathLike[AnyStr]], + b: Union[AnyStr, PathLike[AnyStr]], + common: Iterable[AnyStr], + shallow: Union[int, bool] = ..., + ) -> Tuple[List[AnyStr], List[AnyStr], List[AnyStr]]: ... + else: def cmp(f1: Union[bytes, Text], f2: Union[bytes, Text], shallow: Union[int, bool] = ...) -> bool: ... - def cmpfiles(a: AnyStr, b: AnyStr, common: Iterable[AnyStr], - shallow: Union[int, bool] = ...) -> Tuple[List[AnyStr], List[AnyStr], List[AnyStr]]: ... + def cmpfiles( + a: AnyStr, b: AnyStr, common: Iterable[AnyStr], shallow: Union[int, bool] = ... + ) -> Tuple[List[AnyStr], List[AnyStr], List[AnyStr]]: ... class dircmp(Generic[AnyStr]): if sys.version_info >= (3, 6): - def __init__(self, a: Union[AnyStr, PathLike[AnyStr]], b: Union[AnyStr, PathLike[AnyStr]], - ignore: Optional[Sequence[AnyStr]] = ..., - hide: Optional[Sequence[AnyStr]] = ...) -> None: ... + def __init__( + self, + a: Union[AnyStr, PathLike[AnyStr]], + b: Union[AnyStr, PathLike[AnyStr]], + ignore: Optional[Sequence[AnyStr]] = ..., + hide: Optional[Sequence[AnyStr]] = ..., + ) -> None: ... else: - def __init__(self, a: AnyStr, b: AnyStr, - ignore: Optional[Sequence[AnyStr]] = ..., - hide: Optional[Sequence[AnyStr]] = ...) -> None: ... - + def __init__( + self, a: AnyStr, b: AnyStr, ignore: Optional[Sequence[AnyStr]] = ..., hide: Optional[Sequence[AnyStr]] = ... + ) -> None: ... left: AnyStr right: AnyStr hide: Sequence[AnyStr] ignore: Sequence[AnyStr] - # These properties are created at runtime by __getattr__ subdirs: Dict[AnyStr, dircmp[AnyStr]] same_files: List[AnyStr] @@ -44,11 +56,9 @@ right_only: List[AnyStr] left_list: List[AnyStr] right_list: List[AnyStr] - def report(self) -> None: ... def report_partial_closure(self) -> None: ... def report_full_closure(self) -> None: ... - methodmap: Dict[str, Callable[[], None]] def phase0(self) -> None: ... def phase1(self) -> None: ... @@ -56,6 +66,8 @@ def phase3(self) -> None: ... def phase4(self) -> None: ... def phase4_closure(self) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... if sys.version_info >= (3,): def clear_cache() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/fractions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/fractions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/fractions.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/fractions.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,159 @@ +import sys +from decimal import Decimal +from numbers import Integral, Rational, Real +from typing import Optional, Tuple, Union, overload +from typing_extensions import Literal + +_ComparableNum = Union[int, float, Decimal, Real] + +if sys.version_info < (3, 9): + @overload + def gcd(a: int, b: int) -> int: ... + @overload + def gcd(a: Integral, b: int) -> Integral: ... + @overload + def gcd(a: int, b: Integral) -> Integral: ... + @overload + def gcd(a: Integral, b: Integral) -> Integral: ... + +class Fraction(Rational): + @overload + def __new__( + cls, numerator: Union[int, Rational] = ..., denominator: Optional[Union[int, Rational]] = ..., *, _normalize: bool = ... + ) -> Fraction: ... + @overload + def __new__(cls, __value: Union[float, Decimal, str], *, _normalize: bool = ...) -> Fraction: ... + @classmethod + def from_float(cls, f: float) -> Fraction: ... + @classmethod + def from_decimal(cls, dec: Decimal) -> Fraction: ... + def limit_denominator(self, max_denominator: int = ...) -> Fraction: ... + if sys.version_info >= (3, 8): + def as_integer_ratio(self) -> Tuple[int, int]: ... + @property + def numerator(self) -> int: ... + @property + def denominator(self) -> int: ... + @overload + def __add__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __add__(self, other: float) -> float: ... + @overload + def __add__(self, other: complex) -> complex: ... + @overload + def __radd__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __radd__(self, other: float) -> float: ... + @overload + def __radd__(self, other: complex) -> complex: ... + @overload + def __sub__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __sub__(self, other: float) -> float: ... + @overload + def __sub__(self, other: complex) -> complex: ... + @overload + def __rsub__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __rsub__(self, other: float) -> float: ... + @overload + def __rsub__(self, other: complex) -> complex: ... + @overload + def __mul__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __mul__(self, other: float) -> float: ... + @overload + def __mul__(self, other: complex) -> complex: ... + @overload + def __rmul__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __rmul__(self, other: float) -> float: ... + @overload + def __rmul__(self, other: complex) -> complex: ... + @overload + def __truediv__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __truediv__(self, other: float) -> float: ... + @overload + def __truediv__(self, other: complex) -> complex: ... + @overload + def __rtruediv__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __rtruediv__(self, other: float) -> float: ... + @overload + def __rtruediv__(self, other: complex) -> complex: ... + if sys.version_info < (3, 0): + @overload + def __div__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __div__(self, other: float) -> float: ... + @overload + def __div__(self, other: complex) -> complex: ... + @overload + def __rdiv__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __rdiv__(self, other: float) -> float: ... + @overload + def __rdiv__(self, other: complex) -> complex: ... + @overload + def __floordiv__(self, other: Union[int, Fraction]) -> int: ... + @overload + def __floordiv__(self, other: float) -> float: ... + @overload + def __rfloordiv__(self, other: Union[int, Fraction]) -> int: ... + @overload + def __rfloordiv__(self, other: float) -> float: ... + @overload + def __mod__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __mod__(self, other: float) -> float: ... + @overload + def __rmod__(self, other: Union[int, Fraction]) -> Fraction: ... + @overload + def __rmod__(self, other: float) -> float: ... + @overload + def __divmod__(self, other: Union[int, Fraction]) -> Tuple[int, Fraction]: ... + @overload + def __divmod__(self, other: float) -> Tuple[float, Fraction]: ... + @overload + def __rdivmod__(self, other: Union[int, Fraction]) -> Tuple[int, Fraction]: ... + @overload + def __rdivmod__(self, other: float) -> Tuple[float, Fraction]: ... + @overload + def __pow__(self, other: int) -> Fraction: ... + @overload + def __pow__(self, other: Union[float, Fraction]) -> float: ... + @overload + def __pow__(self, other: complex) -> complex: ... + @overload + def __rpow__(self, other: Union[int, float, Fraction]) -> float: ... + @overload + def __rpow__(self, other: complex) -> complex: ... + def __pos__(self) -> Fraction: ... + def __neg__(self) -> Fraction: ... + def __abs__(self) -> Fraction: ... + def __trunc__(self) -> int: ... + if sys.version_info >= (3, 0): + def __floor__(self) -> int: ... + def __ceil__(self) -> int: ... + @overload + def __round__(self, ndigits: None = ...) -> int: ... + @overload + def __round__(self, ndigits: int) -> Fraction: ... + def __hash__(self) -> int: ... + def __eq__(self, other: object) -> bool: ... + def __lt__(self, other: _ComparableNum) -> bool: ... + def __gt__(self, other: _ComparableNum) -> bool: ... + def __le__(self, other: _ComparableNum) -> bool: ... + def __ge__(self, other: _ComparableNum) -> bool: ... + if sys.version_info >= (3, 0): + def __bool__(self) -> bool: ... + else: + def __nonzero__(self) -> bool: ... + # Not actually defined within fractions.py, but provides more useful + # overrides + @property + def real(self) -> Fraction: ... + @property + def imag(self) -> Literal[0]: ... + def conjugate(self) -> Fraction: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ftplib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ftplib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ftplib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ftplib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,25 +1,10 @@ import sys -from typing import ( - Any, - BinaryIO, - Callable, - Dict, - Generic, - Iterable, - Iterator, - List, - Optional, - Text, - TextIO, - Tuple, - Type, - TypeVar, - Union, -) -from types import TracebackType +from _typeshed import SupportsRead, SupportsReadline from socket import socket from ssl import SSLContext -from _typeshed import SupportsRead, SupportsReadline +from types import TracebackType +from typing import Any, BinaryIO, Callable, Dict, Iterable, Iterator, List, Optional, Text, TextIO, Tuple, Type, TypeVar, Union +from typing_extensions import Literal _T = TypeVar("_T") _IntOrStr = Union[int, Text] @@ -166,3 +151,15 @@ def get_account(self, host: Text) -> Tuple[Optional[str], Optional[str], Optional[str]]: ... def get_macros(self) -> List[str]: ... def get_macro(self, macro: Text) -> Tuple[str, ...]: ... + +def parse150(resp: str) -> Optional[int]: ... # undocumented +def parse227(resp: str) -> Tuple[str, int]: ... # undocumented +def parse229(resp: str, peer: Any) -> Tuple[str, int]: ... # undocumented +def parse257(resp: str) -> str: ... # undocumented +def ftpcp( + source: FTP, + sourcename: str, + target: FTP, + targetname: str = ..., + type: Literal["A", "I"] = ..., +) -> None: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/genericpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/genericpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/genericpath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/genericpath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,15 +1,19 @@ -from typing import Sequence, AnyStr, Text, Union import sys +from typing import AnyStr, Sequence, Text, Union if sys.version_info >= (3, 0): def commonprefix(m: Sequence[str]) -> str: ... + else: def commonprefix(m: Sequence[AnyStr]) -> AnyStr: ... + if sys.version_info >= (3, 6): from builtins import _PathLike def exists(path: Union[AnyStr, _PathLike[AnyStr]]) -> bool: ... + else: def exists(path: Text) -> bool: ... + def isfile(path: Text) -> bool: ... def isdir(s: Text) -> bool: ... def getsize(filename: Text) -> int: ... @@ -17,7 +21,6 @@ def getatime(filename: Text) -> float: ... def getctime(filename: Text) -> float: ... - if sys.version_info >= (3, 4): def samestat(s1: str, s2: str) -> int: ... def samefile(f1: str, f2: str) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_heapq.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_heapq.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_heapq.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_heapq.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,5 @@ -"""Stub file for the '_heapq' module.""" - -from typing import TypeVar, List, Iterable, Any, Callable, Optional import sys +from typing import Any, Callable, Iterable, List, Optional, TypeVar _T = TypeVar("_T") @@ -10,6 +8,7 @@ def heappush(__heap: List[_T], __item: _T) -> None: ... def heappushpop(__heap: List[_T], __item: _T) -> _T: ... def heapreplace(__heap: List[_T], __item: _T) -> _T: ... + if sys.version_info < (3,): def nlargest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ... def nsmallest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/hmac.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/hmac.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/hmac.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/hmac.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,30 +1,27 @@ -# Stubs for hmac - -from typing import Any, AnyStr, Callable, Optional, Union, overload -from types import ModuleType import sys - -_B = Union[bytes, bytearray] +from _typeshed import ReadableBuffer +from types import ModuleType +from typing import Any, AnyStr, Callable, Optional, Union, overload # TODO more precise type for object of hashlib _Hash = Any +_DigestMod = Union[str, Callable[[], _Hash], ModuleType] digest_size: None if sys.version_info >= (3, 8): - _DigestMod = Union[str, Callable[[], _Hash], ModuleType] # In reality digestmod has a default value, but the function always throws an error # if the argument is not given, so we pretend it is a required argument. @overload - def new(key: _B, msg: Optional[_B], digestmod: _DigestMod) -> HMAC: ... + def new(key: bytes, msg: Optional[ReadableBuffer], digestmod: _DigestMod) -> HMAC: ... @overload - def new(key: _B, *, digestmod: _DigestMod) -> HMAC: ... + def new(key: bytes, *, digestmod: _DigestMod) -> HMAC: ... + elif sys.version_info >= (3, 4): - def new(key: _B, msg: Optional[_B] = ..., - digestmod: Optional[Union[str, Callable[[], _Hash], ModuleType]] = ...) -> HMAC: ... + def new(key: bytes, msg: Optional[ReadableBuffer] = ..., digestmod: Optional[_DigestMod] = ...) -> HMAC: ... + else: - def new(key: _B, msg: Optional[_B] = ..., - digestmod: Optional[Union[Callable[[], _Hash], ModuleType]] = ...) -> HMAC: ... + def new(key: bytes, msg: Optional[ReadableBuffer] = ..., digestmod: Optional[_DigestMod] = ...) -> HMAC: ... class HMAC: if sys.version_info >= (3,): @@ -32,15 +29,16 @@ if sys.version_info >= (3, 4): block_size: int name: str - def update(self, msg: _B) -> None: ... + def __init__(self, key: bytes, msg: Optional[ReadableBuffer] = ..., digestmod: _DigestMod = ...) -> None: ... + def update(self, msg: ReadableBuffer) -> None: ... def digest(self) -> bytes: ... def hexdigest(self) -> str: ... def copy(self) -> HMAC: ... @overload -def compare_digest(a: bytearray, b: bytearray) -> bool: ... +def compare_digest(__a: ReadableBuffer, __b: ReadableBuffer) -> bool: ... @overload -def compare_digest(a: AnyStr, b: AnyStr) -> bool: ... +def compare_digest(__a: AnyStr, __b: AnyStr) -> bool: ... if sys.version_info >= (3, 7): - def digest(key: _B, msg: _B, digest: str) -> bytes: ... + def digest(key: bytes, msg: ReadableBuffer, digest: str) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/imaplib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/imaplib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/imaplib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/imaplib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -2,8 +2,9 @@ import sys import time from socket import socket as _socket -from ssl import SSLSocket, SSLContext -from typing import Any, Callable, Dict, IO, List, Optional, Pattern, Text, Tuple, Type, Union +from ssl import SSLContext, SSLSocket +from types import TracebackType +from typing import IO, Any, Callable, Dict, List, Optional, Pattern, Text, Tuple, Type, Union from typing_extensions import Literal # TODO: Commands should use their actual return types, not this type alias. @@ -30,13 +31,17 @@ welcome: bytes = ... capabilities: Tuple[str] = ... PROTOCOL_VERSION: str = ... - def __init__(self, host: str = ..., port: int = ...) -> None: ... + if sys.version_info >= (3, 9): + def __init__(self, host: str = ..., port: int = ..., timeout: Optional[float] = ...) -> None: ... + def open(self, host: str = ..., port: int = ..., timeout: Optional[float] = ...) -> None: ... + else: + def __init__(self, host: str = ..., port: int = ...) -> None: ... + def open(self, host: str = ..., port: int = ...) -> None: ... def __getattr__(self, attr: str) -> Any: ... host: str = ... port: int = ... sock: _socket = ... file: Union[IO[Text], IO[bytes]] = ... - def open(self, host: str = ..., port: int = ...) -> None: ... def read(self, size: int) -> bytes: ... def readline(self) -> bytes: ... def send(self, data: bytes) -> None: ... @@ -56,7 +61,7 @@ if sys.version_info >= (3, 5): def enable(self, capability: str) -> _CommandResults: ... def __enter__(self) -> IMAP4: ... - def __exit__(self, *args) -> None: ... + def __exit__(self, t: Optional[Type[BaseException]], v: Optional[BaseException], tb: Optional[TracebackType]) -> None: ... def expunge(self) -> _CommandResults: ... def fetch(self, message_set: str, message_parts: str) -> Tuple[str, _AnyResponseData]: ... def getacl(self, mailbox: str) -> _CommandResults: ... @@ -88,22 +93,46 @@ def thread(self, threading_algorithm: str, charset: str, *search_criteria: str) -> _CommandResults: ... def uid(self, command: str, *args: str) -> _CommandResults: ... def unsubscribe(self, mailbox: str) -> _CommandResults: ... + if sys.version_info >= (3, 9): + def unselect(self) -> _CommandResults: ... def xatom(self, name: str, *args: str) -> _CommandResults: ... def print_log(self) -> None: ... class IMAP4_SSL(IMAP4): keyfile: str = ... certfile: str = ... - if sys.version_info >= (3, 3): - def __init__(self, host: str = ..., port: int = ..., keyfile: Optional[str] = ..., certfile: Optional[str] = ..., ssl_context: Optional[SSLContext] = ...) -> None: ... + if sys.version_info >= (3, 9): + def __init__( + self, + host: str = ..., + port: int = ..., + keyfile: Optional[str] = ..., + certfile: Optional[str] = ..., + ssl_context: Optional[SSLContext] = ..., + timeout: Optional[float] = ..., + ) -> None: ... + elif sys.version_info >= (3, 3): + def __init__( + self, + host: str = ..., + port: int = ..., + keyfile: Optional[str] = ..., + certfile: Optional[str] = ..., + ssl_context: Optional[SSLContext] = ..., + ) -> None: ... else: - def __init__(self, host: str = ..., port: int = ..., keyfile: Optional[str] = ..., certfile: Optional[str] = ...) -> None: ... + def __init__( + self, host: str = ..., port: int = ..., keyfile: Optional[str] = ..., certfile: Optional[str] = ... + ) -> None: ... host: str = ... port: int = ... sock: _socket = ... sslobj: SSLSocket = ... file: IO[Any] = ... - def open(self, host: str = ..., port: Optional[int] = ...) -> None: ... + if sys.version_info >= (3, 9): + def open(self, host: str = ..., port: Optional[int] = ..., timeout: Optional[float] = ...) -> None: ... + else: + def open(self, host: str = ..., port: Optional[int] = ...) -> None: ... def read(self, size: int) -> bytes: ... def readline(self) -> bytes: ... def send(self, data: bytes) -> None: ... @@ -111,7 +140,6 @@ def socket(self) -> _socket: ... def ssl(self) -> SSLSocket: ... - class IMAP4_stream(IMAP4): command: str = ... def __init__(self, command: str) -> None: ... @@ -122,7 +150,10 @@ process: subprocess.Popen[bytes] = ... writefile: IO[Any] = ... readfile: IO[Any] = ... - def open(self, host: str = ..., port: Optional[int] = ...) -> None: ... + if sys.version_info >= (3, 9): + def open(self, host: Optional[str] = ..., port: Optional[int] = ..., timeout: Optional[float] = ...) -> None: ... + else: + def open(self, host: Optional[str] = ..., port: Optional[int] = ...) -> None: ... def read(self, size: int) -> bytes: ... def readline(self) -> bytes: ... def send(self, data: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/imghdr.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/imghdr.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/imghdr.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/imghdr.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -7,15 +7,14 @@ def read(self, size: int) -> bytes: ... def seek(self, offset: int) -> Any: ... - if sys.version_info >= (3, 6): _File = Union[Text, os.PathLike[Text], _ReadableBinary] else: _File = Union[Text, _ReadableBinary] - @overload def what(file: _File, h: None = ...) -> Optional[str]: ... @overload def what(file: Any, h: bytes) -> Optional[str]: ... + tests: List[Callable[[bytes, Optional[BinaryIO]], Optional[str]]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/keyword.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/keyword.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/keyword.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/keyword.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,10 @@ +import sys +from typing import Sequence, Text + +def iskeyword(s: Text) -> bool: ... + +kwlist: Sequence[str] + +if sys.version_info >= (3, 9): + def issoftkeyword(s: str) -> bool: ... + softkwlist: Sequence[str] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/locale.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/locale.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/locale.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/locale.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,6 @@ -# Stubs for locale - +import sys from decimal import Decimal from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Sequence, Tuple, Union -import sys # workaround for mypy#2010 if sys.version_info < (3,): @@ -81,8 +79,7 @@ class Error(Exception): ... -def setlocale(category: int, - locale: Union[_str, Iterable[_str], None] = ...) -> _str: ... +def setlocale(category: int, locale: Union[_str, Iterable[_str], None] = ...) -> _str: ... def localeconv() -> Mapping[_str, Union[int, _str, List[int]]]: ... def nl_langinfo(option: int) -> _str: ... def getdefaultlocale(envvars: Tuple[_str, ...] = ...) -> Tuple[Optional[_str], Optional[_str]]: ... @@ -92,18 +89,19 @@ def resetlocale(category: int = ...) -> None: ... def strcoll(string1: _str, string2: _str) -> int: ... def strxfrm(string: _str) -> _str: ... -def format(percent: _str, value: Union[float, Decimal], grouping: bool = ..., - monetary: bool = ..., *additional: Any) -> _str: ... +def format(percent: _str, value: Union[float, Decimal], grouping: bool = ..., monetary: bool = ..., *additional: Any) -> _str: ... + if sys.version_info >= (3, 7): - def format_string(f: _str, val: Any, - grouping: bool = ..., monetary: bool = ...) -> _str: ... + def format_string(f: _str, val: Any, grouping: bool = ..., monetary: bool = ...) -> _str: ... + else: - def format_string(f: _str, val: Any, - grouping: bool = ...) -> _str: ... -def currency(val: Union[int, float, Decimal], symbol: bool = ..., grouping: bool = ..., - international: bool = ...) -> _str: ... + def format_string(f: _str, val: Any, grouping: bool = ...) -> _str: ... + +def currency(val: Union[int, float, Decimal], symbol: bool = ..., grouping: bool = ..., international: bool = ...) -> _str: ... + if sys.version_info >= (3, 5): def delocalize(string: _str) -> _str: ... + def atof(string: _str, func: Callable[[_str], float] = ...) -> float: ... def atoi(string: _str) -> int: ... def str(val: float) -> _str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/config.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/config.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,8 @@ +import sys from _typeshed import AnyPath, StrPath -from typing import Any, Callable, Dict, Optional, IO, Union from threading import Thread -import sys +from typing import IO, Any, Callable, Dict, Optional, Union + if sys.version_info >= (3,): from configparser import RawConfigParser else: @@ -12,17 +13,20 @@ else: _Path = StrPath - def dictConfig(config: Dict[str, Any]) -> None: ... + if sys.version_info >= (3, 4): - def fileConfig(fname: Union[_Path, IO[str], RawConfigParser], - defaults: Optional[Dict[str, str]] = ..., - disable_existing_loggers: bool = ...) -> None: ... - def listen(port: int = ..., - verify: Optional[Callable[[bytes], Optional[bytes]]] = ...) -> Thread: ... + def fileConfig( + fname: Union[_Path, IO[str], RawConfigParser], + defaults: Optional[Dict[str, str]] = ..., + disable_existing_loggers: bool = ..., + ) -> None: ... + def listen(port: int = ..., verify: Optional[Callable[[bytes], Optional[bytes]]] = ...) -> Thread: ... + else: - def fileConfig(fname: Union[str, IO[str]], - defaults: Optional[Dict[str, str]] = ..., - disable_existing_loggers: bool = ...) -> None: ... + def fileConfig( + fname: Union[str, IO[str]], defaults: Optional[Dict[str, str]] = ..., disable_existing_loggers: bool = ... + ) -> None: ... def listen(port: int = ...) -> Thread: ... + def stopListening() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/handlers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/handlers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/handlers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/handlers.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,20 +1,18 @@ -from _typeshed import StrPath import datetime -from logging import Handler, FileHandler, LogRecord -from socket import SocketType import ssl import sys -from typing import Any, Callable, Dict, List, Optional, Tuple, Union, overload +from _typeshed import StrPath +from logging import FileHandler, Handler, LogRecord +from socket import SocketKind, SocketType +from typing import Any, Callable, ClassVar, Dict, List, Optional, Tuple, Union + if sys.version_info >= (3, 7): - from queue import SimpleQueue, Queue + from queue import Queue, SimpleQueue elif sys.version_info >= (3,): from queue import Queue else: from Queue import Queue -# TODO update socket stubs to add SocketKind -_SocketKind = int - DEFAULT_TCP_LOGGING_PORT: int DEFAULT_UDP_LOGGING_PORT: int DEFAULT_HTTP_LOGGING_PORT: int @@ -25,60 +23,85 @@ class WatchedFileHandler(FileHandler): dev: int ino: int - def __init__(self, filename: StrPath, mode: str = ..., encoding: Optional[str] = ..., - delay: bool = ...) -> None: ... + def __init__(self, filename: StrPath, mode: str = ..., encoding: Optional[str] = ..., delay: bool = ...) -> None: ... def _statstream(self) -> None: ... - if sys.version_info >= (3,): class BaseRotatingHandler(FileHandler): terminator: str namer: Optional[Callable[[str], str]] rotator: Optional[Callable[[str, str], None]] - def __init__(self, filename: StrPath, mode: str, - encoding: Optional[str] = ..., - delay: bool = ...) -> None: ... + def __init__(self, filename: StrPath, mode: str, encoding: Optional[str] = ..., delay: bool = ...) -> None: ... def rotation_filename(self, default_name: str) -> None: ... def rotate(self, source: str, dest: str) -> None: ... - if sys.version_info >= (3,): class RotatingFileHandler(BaseRotatingHandler): - def __init__(self, filename: StrPath, mode: str = ..., maxBytes: int = ..., - backupCount: int = ..., encoding: Optional[str] = ..., - delay: bool = ...) -> None: ... + def __init__( + self, + filename: StrPath, + mode: str = ..., + maxBytes: int = ..., + backupCount: int = ..., + encoding: Optional[str] = ..., + delay: bool = ..., + ) -> None: ... def doRollover(self) -> None: ... + else: class RotatingFileHandler(Handler): - def __init__(self, filename: str, mode: str = ..., maxBytes: int = ..., - backupCount: int = ..., encoding: Optional[str] = ..., - delay: bool = ...) -> None: ... + def __init__( + self, + filename: str, + mode: str = ..., + maxBytes: int = ..., + backupCount: int = ..., + encoding: Optional[str] = ..., + delay: bool = ..., + ) -> None: ... def doRollover(self) -> None: ... - if sys.version_info >= (3,): class TimedRotatingFileHandler(BaseRotatingHandler): if sys.version_info >= (3, 4): - def __init__(self, filename: StrPath, when: str = ..., - interval: int = ..., - backupCount: int = ..., encoding: Optional[str] = ..., - delay: bool = ..., utc: bool = ..., - atTime: Optional[datetime.datetime] = ...) -> None: ... + def __init__( + self, + filename: StrPath, + when: str = ..., + interval: int = ..., + backupCount: int = ..., + encoding: Optional[str] = ..., + delay: bool = ..., + utc: bool = ..., + atTime: Optional[datetime.datetime] = ..., + ) -> None: ... else: - def __init__(self, - filename: str, when: str = ..., interval: int = ..., - backupCount: int = ..., encoding: Optional[str] = ..., - delay: bool = ..., utc: bool = ...) -> None: ... + def __init__( + self, + filename: str, + when: str = ..., + interval: int = ..., + backupCount: int = ..., + encoding: Optional[str] = ..., + delay: bool = ..., + utc: bool = ..., + ) -> None: ... def doRollover(self) -> None: ... + else: class TimedRotatingFileHandler(Handler): - def __init__(self, - filename: str, when: str = ..., interval: int = ..., - backupCount: int = ..., encoding: Optional[str] = ..., - delay: bool = ..., utc: bool = ...) -> None: ... + def __init__( + self, + filename: str, + when: str = ..., + interval: int = ..., + backupCount: int = ..., + encoding: Optional[str] = ..., + delay: bool = ..., + utc: bool = ..., + ) -> None: ... def doRollover(self) -> None: ... - class SocketHandler(Handler): retryStart: float retryFactor: float @@ -92,32 +115,38 @@ def send(self, s: bytes) -> None: ... def createSocket(self) -> None: ... - class DatagramHandler(SocketHandler): def makeSocket(self) -> SocketType: ... # type: ignore - class SysLogHandler(Handler): + LOG_EMERG: int LOG_ALERT: int LOG_CRIT: int - LOG_DEBUG: int - LOG_EMERG: int LOG_ERR: int - LOG_INFO: int - LOG_NOTICE: int LOG_WARNING: int - LOG_AUTH: int - LOG_AUTHPRIV: int - LOG_CRON: int - LOG_DAEMON: int - LOG_FTP: int + LOG_NOTICE: int + LOG_INFO: int + LOG_DEBUG: int + LOG_KERN: int - LOG_LPR: int + LOG_USER: int LOG_MAIL: int - LOG_NEWS: int + LOG_DAEMON: int + LOG_AUTH: int LOG_SYSLOG: int - LOG_USER: int + LOG_LPR: int + LOG_NEWS: int LOG_UUCP: int + LOG_CRON: int + LOG_AUTHPRIV: int + LOG_FTP: int + + if sys.version_info >= (3, 9): + LOG_NTP: int + LOG_SECURITY: int + LOG_CONSOLE: int + LOG_SOLCRON: int + LOG_LOCAL0: int LOG_LOCAL1: int LOG_LOCAL2: int @@ -126,39 +155,52 @@ LOG_LOCAL5: int LOG_LOCAL6: int LOG_LOCAL7: int - def __init__(self, address: Union[Tuple[str, int], str] = ..., - facility: int = ..., socktype: Optional[_SocketKind] = ...) -> None: ... - def encodePriority(self, facility: Union[int, str], - priority: Union[int, str]) -> int: ... + unixsocket: bool # undocumented + socktype: SocketKind # undocumented + if sys.version_info >= (3,): + ident: str # undocumented + facility: int # undocumented + priority_names: ClassVar[Dict[str, int]] # undocumented + facility_names: ClassVar[Dict[str, int]] # undocumented + priority_map: ClassVar[Dict[str, str]] # undocumented + def __init__( + self, address: Union[Tuple[str, int], str] = ..., facility: int = ..., socktype: Optional[SocketKind] = ... + ) -> None: ... + def encodePriority(self, facility: Union[int, str], priority: Union[int, str]) -> int: ... def mapPriority(self, levelName: str) -> str: ... - class NTEventLogHandler(Handler): - def __init__(self, appname: str, dllname: Optional[str] = ..., - logtype: str = ...) -> None: ... + def __init__(self, appname: str, dllname: Optional[str] = ..., logtype: str = ...) -> None: ... def getEventCategory(self, record: LogRecord) -> int: ... # TODO correct return value? def getEventType(self, record: LogRecord) -> int: ... def getMessageID(self, record: LogRecord) -> int: ... - class SMTPHandler(Handler): # TODO `secure` can also be an empty tuple if sys.version_info >= (3,): - def __init__(self, mailhost: Union[str, Tuple[str, int]], fromaddr: str, - toaddrs: List[str], subject: str, - credentials: Optional[Tuple[str, str]] = ..., - secure: Union[Tuple[str], Tuple[str, str], None] = ..., - timeout: float = ...) -> None: ... + def __init__( + self, + mailhost: Union[str, Tuple[str, int]], + fromaddr: str, + toaddrs: List[str], + subject: str, + credentials: Optional[Tuple[str, str]] = ..., + secure: Union[Tuple[str], Tuple[str, str], None] = ..., + timeout: float = ..., + ) -> None: ... else: - def __init__(self, - mailhost: Union[str, Tuple[str, int]], fromaddr: str, - toaddrs: List[str], subject: str, - credentials: Optional[Tuple[str, str]] = ..., - secure: Union[Tuple[str], Tuple[str, str], None] = ...) -> None: ... + def __init__( + self, + mailhost: Union[str, Tuple[str, int]], + fromaddr: str, + toaddrs: List[str], + subject: str, + credentials: Optional[Tuple[str, str]] = ..., + secure: Union[Tuple[str], Tuple[str, str], None] = ..., + ) -> None: ... def getSubject(self, record: LogRecord) -> str: ... - class BufferingHandler(Handler): buffer: List[LogRecord] def __init__(self, capacity: int) -> None: ... @@ -166,30 +208,32 @@ class MemoryHandler(BufferingHandler): if sys.version_info >= (3, 6): - def __init__(self, capacity: int, flushLevel: int = ..., - target: Optional[Handler] = ..., flushOnClose: bool = ...) -> None: ... + def __init__( + self, capacity: int, flushLevel: int = ..., target: Optional[Handler] = ..., flushOnClose: bool = ... + ) -> None: ... else: - def __init__(self, capacity: int, flushLevel: int = ..., - target: Optional[Handler] = ...) -> None: ... + def __init__(self, capacity: int, flushLevel: int = ..., target: Optional[Handler] = ...) -> None: ... def setTarget(self, target: Handler) -> None: ... - class HTTPHandler(Handler): if sys.version_info >= (3, 5): - def __init__(self, host: str, url: str, method: str = ..., - secure: bool = ..., - credentials: Optional[Tuple[str, str]] = ..., - context: Optional[ssl.SSLContext] = ...) -> None: ... + def __init__( + self, + host: str, + url: str, + method: str = ..., + secure: bool = ..., + credentials: Optional[Tuple[str, str]] = ..., + context: Optional[ssl.SSLContext] = ..., + ) -> None: ... elif sys.version_info >= (3,): - def __init__(self, - host: str, url: str, method: str = ..., secure: bool = ..., - credentials: Optional[Tuple[str, str]] = ...) -> None: ... + def __init__( + self, host: str, url: str, method: str = ..., secure: bool = ..., credentials: Optional[Tuple[str, str]] = ... + ) -> None: ... else: - def __init__(self, - host: str, url: str, method: str = ...) -> None: ... + def __init__(self, host: str, url: str, method: str = ...) -> None: ... def mapLogRecord(self, record: LogRecord) -> Dict[str, Any]: ... - if sys.version_info >= (3,): class QueueHandler(Handler): if sys.version_info >= (3, 7): @@ -198,18 +242,15 @@ def __init__(self, queue: Queue[Any]) -> None: ... def prepare(self, record: LogRecord) -> Any: ... def enqueue(self, record: LogRecord) -> None: ... - class QueueListener: if sys.version_info >= (3, 7): - def __init__(self, queue: Union[SimpleQueue[Any], Queue[Any]], - *handlers: Handler, - respect_handler_level: bool = ...) -> None: ... + def __init__( + self, queue: Union[SimpleQueue[Any], Queue[Any]], *handlers: Handler, respect_handler_level: bool = ... + ) -> None: ... elif sys.version_info >= (3, 5): - def __init__(self, queue: Queue[Any], *handlers: Handler, - respect_handler_level: bool = ...) -> None: ... + def __init__(self, queue: Queue[Any], *handlers: Handler, respect_handler_level: bool = ...) -> None: ... else: - def __init__(self, - queue: Queue, *handlers: Handler) -> None: ... + def __init__(self, queue: Queue, *handlers: Handler) -> None: ... def dequeue(self, block: bool) -> LogRecord: ... def prepare(self, record: LogRecord) -> Any: ... def start(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/logging/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,27 @@ +import sys +import threading from _typeshed import StrPath -from typing import ( - Any, Callable, Dict, Iterable, List, Mapping, MutableMapping, Optional, IO, - Sequence, Tuple, Text, Union, overload, -) from string import Template from time import struct_time -from types import TracebackType, FrameType -import sys -import threading +from types import FrameType, TracebackType +from typing import ( + IO, + Any, + Callable, + Dict, + Iterable, + List, + Mapping, + MutableMapping, + Optional, + Sequence, + Text, + Tuple, + Union, + overload, +) -_SysExcInfoType = Union[Tuple[type, BaseException, Optional[TracebackType]], - Tuple[None, None, None]] +_SysExcInfoType = Union[Tuple[type, BaseException, Optional[TracebackType]], Tuple[None, None, None]] if sys.version_info >= (3, 5): _ExcInfoType = Union[None, bool, _SysExcInfoType, BaseException] else: @@ -53,30 +64,87 @@ def getEffectiveLevel(self) -> int: ... def getChild(self, suffix: str) -> Logger: ... if sys.version_info >= (3, 8): - def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def log(self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... def _log( self, level: int, @@ -88,31 +156,80 @@ stacklevel: int = ..., ) -> None: ... # undocumented elif sys.version_info >= (3,): - def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... fatal = critical - def log(self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... def _log( self, level: int, @@ -123,29 +240,35 @@ stack_info: bool = ..., ) -> None: ... # undocumented else: - def debug(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def info(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def warning(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def debug( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def info( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def warning( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... warn = warning - def error(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def critical(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def error( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def critical( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... fatal = critical - def log(self, - level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def exception(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... def _log( self, level: int, @@ -165,23 +288,35 @@ def findCaller(self) -> Tuple[str, int, str]: ... def handle(self, record: LogRecord) -> None: ... if sys.version_info >= (3,): - def makeRecord(self, name: str, level: int, fn: str, lno: int, msg: Any, - args: _ArgsType, - exc_info: Optional[_SysExcInfoType], - func: Optional[str] = ..., - extra: Optional[Mapping[str, Any]] = ..., - sinfo: Optional[str] = ...) -> LogRecord: ... + def makeRecord( + self, + name: str, + level: int, + fn: str, + lno: int, + msg: Any, + args: _ArgsType, + exc_info: Optional[_SysExcInfoType], + func: Optional[str] = ..., + extra: Optional[Mapping[str, Any]] = ..., + sinfo: Optional[str] = ..., + ) -> LogRecord: ... else: - def makeRecord(self, - name: str, level: int, fn: str, lno: int, msg: Any, - args: _ArgsType, - exc_info: Optional[_SysExcInfoType], - func: Optional[str] = ..., - extra: Optional[Mapping[str, Any]] = ...) -> LogRecord: ... + def makeRecord( + self, + name: str, + level: int, + fn: str, + lno: int, + msg: Any, + args: _ArgsType, + exc_info: Optional[_SysExcInfoType], + func: Optional[str] = ..., + extra: Optional[Mapping[str, Any]] = ..., + ) -> LogRecord: ... if sys.version_info >= (3,): def hasHandlers(self) -> bool: ... - CRITICAL: int FATAL: int ERROR: int @@ -191,7 +326,6 @@ DEBUG: int NOTSET: int - class Handler(Filterer): level: int # undocumented formatter: Optional[Formatter] # undocumented @@ -211,7 +345,6 @@ def format(self, record: LogRecord) -> str: ... def emit(self, record: LogRecord) -> None: ... - class Formatter: converter: Callable[[Optional[float]], struct_time] _fmt: Optional[str] @@ -222,18 +355,13 @@ default_msec_format: str if sys.version_info >= (3, 8): - def __init__(self, fmt: Optional[str] = ..., - datefmt: Optional[str] = ..., - style: str = ..., validate: bool = ...) -> None: ... + def __init__( + self, fmt: Optional[str] = ..., datefmt: Optional[str] = ..., style: str = ..., validate: bool = ... + ) -> None: ... elif sys.version_info >= (3,): - def __init__(self, fmt: Optional[str] = ..., - datefmt: Optional[str] = ..., - style: str = ...) -> None: ... + def __init__(self, fmt: Optional[str] = ..., datefmt: Optional[str] = ..., style: str = ...) -> None: ... else: - def __init__(self, - fmt: Optional[str] = ..., - datefmt: Optional[str] = ...) -> None: ... - + def __init__(self, fmt: Optional[str] = ..., datefmt: Optional[str] = ...) -> None: ... def format(self, record: LogRecord) -> str: ... def formatTime(self, record: LogRecord, datefmt: Optional[str] = ...) -> str: ... def formatException(self, ei: _SysExcInfoType) -> str: ... @@ -241,11 +369,9 @@ def formatMessage(self, record: LogRecord) -> str: ... # undocumented def formatStack(self, stack_info: str) -> str: ... - class Filter: def __init__(self, name: str = ...) -> None: ... - def filter(self, record: LogRecord) -> int: ... - + def filter(self, record: LogRecord) -> bool: ... class LogRecord: args: _ArgsType @@ -272,97 +398,221 @@ thread: int threadName: str if sys.version_info >= (3,): - def __init__(self, name: str, level: int, pathname: str, lineno: int, - msg: Any, args: _ArgsType, - exc_info: Optional[_SysExcInfoType], - func: Optional[str] = ..., - sinfo: Optional[str] = ...) -> None: ... + def __init__( + self, + name: str, + level: int, + pathname: str, + lineno: int, + msg: Any, + args: _ArgsType, + exc_info: Optional[_SysExcInfoType], + func: Optional[str] = ..., + sinfo: Optional[str] = ..., + ) -> None: ... else: - def __init__(self, - name: str, level: int, pathname: str, lineno: int, - msg: Any, args: _ArgsType, - exc_info: Optional[_SysExcInfoType], - func: Optional[str] = ...) -> None: ... + def __init__( + self, + name: str, + level: int, + pathname: str, + lineno: int, + msg: Any, + args: _ArgsType, + exc_info: Optional[_SysExcInfoType], + func: Optional[str] = ..., + ) -> None: ... def getMessage(self) -> str: ... - class LoggerAdapter: logger: Logger extra: Mapping[str, Any] def __init__(self, logger: Logger, extra: Mapping[str, Any]) -> None: ... def process(self, msg: Any, kwargs: MutableMapping[str, Any]) -> Tuple[Any, MutableMapping[str, Any]]: ... if sys.version_info >= (3, 8): - def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def log(self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... elif sys.version_info >= (3,): - def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def log(self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + self, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... else: - def debug(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def info(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def warning(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def error(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def exception(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def critical(self, - msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def log(self, - level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def debug( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def info( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def warning( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def error( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def exception( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def critical( + self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def log( + self, + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... def isEnabledFor(self, level: int) -> bool: ... if sys.version_info >= (3,): def getEffectiveLevel(self) -> int: ... @@ -381,123 +631,247 @@ if sys.version_info >= (3,): def getLogger(name: Optional[str] = ...) -> Logger: ... + else: @overload def getLogger() -> Logger: ... @overload def getLogger(name: Union[Text, str]) -> Logger: ... + def getLoggerClass() -> type: ... + if sys.version_info >= (3,): def getLogRecordFactory() -> Callable[..., LogRecord]: ... if sys.version_info >= (3, 8): - def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def log(level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., stacklevel: int = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def log( + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + stacklevel: int = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + elif sys.version_info >= (3,): - def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def warn(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... - def log(level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ..., - **kwargs: Any) -> None: ... + def debug( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def info( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warning( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def warn( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def error( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def critical( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def exception( + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + def log( + level: int, + msg: Any, + *args: Any, + exc_info: _ExcInfoType = ..., + stack_info: bool = ..., + extra: Optional[Dict[str, Any]] = ..., + **kwargs: Any, + ) -> None: ... + else: - def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def debug( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def info( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def warning( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... warn = warning - def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... - def log(level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., - extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ... + def error( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def critical( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def exception( + msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + def log( + level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any + ) -> None: ... + fatal = critical if sys.version_info >= (3, 7): def disable(level: int = ...) -> None: ... + else: def disable(level: int) -> None: ... + def addLevelName(level: int, levelName: str) -> None: ... def getLevelName(level: Union[int, str]) -> Any: ... - def makeLogRecord(dict: Mapping[str, Any]) -> LogRecord: ... if sys.version_info >= (3, 8): - def basicConfig(*, filename: Optional[StrPath] = ..., filemode: str = ..., - format: str = ..., datefmt: Optional[str] = ..., style: str = ..., - level: Optional[_Level] = ..., stream: Optional[IO[str]] = ..., - handlers: Optional[Iterable[Handler]] = ..., force: bool = ...) -> None: ... + def basicConfig( + *, + filename: Optional[StrPath] = ..., + filemode: str = ..., + format: str = ..., + datefmt: Optional[str] = ..., + style: str = ..., + level: Optional[_Level] = ..., + stream: Optional[IO[str]] = ..., + handlers: Optional[Iterable[Handler]] = ..., + force: bool = ..., + ) -> None: ... + elif sys.version_info >= (3,): - def basicConfig(*, filename: Optional[StrPath] = ..., filemode: str = ..., - format: str = ..., datefmt: Optional[str] = ..., style: str = ..., - level: Optional[_Level] = ..., stream: Optional[IO[str]] = ..., - handlers: Optional[Iterable[Handler]] = ...) -> None: ... + def basicConfig( + *, + filename: Optional[StrPath] = ..., + filemode: str = ..., + format: str = ..., + datefmt: Optional[str] = ..., + style: str = ..., + level: Optional[_Level] = ..., + stream: Optional[IO[str]] = ..., + handlers: Optional[Iterable[Handler]] = ..., + ) -> None: ... + else: @overload def basicConfig() -> None: ... @overload - def basicConfig(*, filename: Optional[str] = ..., filemode: str = ..., - format: str = ..., datefmt: Optional[str] = ..., - level: Optional[_Level] = ..., stream: IO[str] = ...) -> None: ... -def shutdown(handlerList: Sequence[Any] = ...) -> None: ... # handlerList is undocumented + def basicConfig( + *, + filename: Optional[str] = ..., + filemode: str = ..., + format: str = ..., + datefmt: Optional[str] = ..., + level: Optional[_Level] = ..., + stream: IO[str] = ..., + ) -> None: ... +def shutdown(handlerList: Sequence[Any] = ...) -> None: ... # handlerList is undocumented def setLoggerClass(klass: type) -> None: ... - def captureWarnings(capture: bool) -> None: ... if sys.version_info >= (3,): def setLogRecordFactory(factory: Callable[..., LogRecord]) -> None: ... - if sys.version_info >= (3,): lastResort: Optional[StreamHandler] - class StreamHandler(Handler): stream: IO[str] # undocumented if sys.version_info >= (3, 2): @@ -506,25 +880,20 @@ if sys.version_info >= (3, 7): def setStream(self, stream: IO[str]) -> Optional[IO[str]]: ... - class FileHandler(StreamHandler): baseFilename: str # undocumented mode: str # undocumented encoding: Optional[str] # undocumented delay: bool # undocumented - def __init__(self, filename: StrPath, mode: str = ..., - encoding: Optional[str] = ..., delay: bool = ...) -> None: ... + def __init__(self, filename: StrPath, mode: str = ..., encoding: Optional[str] = ..., delay: bool = ...) -> None: ... def _open(self) -> IO[Any]: ... - class NullHandler(Handler): ... - class PlaceHolder: def __init__(self, alogger: Logger) -> None: ... def append(self, alogger: Logger) -> None: ... - # Below aren't in module docs but still visible class RootLogger(Logger): @@ -532,25 +901,18 @@ root: RootLogger - if sys.version_info >= (3,): class PercentStyle(object): default_format: str asctime_format: str asctime_search: str _fmt: str - def __init__(self, fmt: str) -> None: ... def usesTime(self) -> bool: ... def format(self, record: Any) -> str: ... - - class StrFormatStyle(PercentStyle): - ... - + class StrFormatStyle(PercentStyle): ... class StringTemplateStyle(PercentStyle): _tpl: Template - _STYLES: Dict[str, Tuple[PercentStyle, str]] - BASIC_FORMAT: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/macpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/macpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/macpath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/macpath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,13 +1,10 @@ -# Stubs for os.path -# Ron Murawski - import os import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Union, Text, Callable, Optional -from _typeshed import StrPath, BytesPath, AnyPath +from _typeshed import AnyPath, BytesPath, StrPath +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Text, Tuple, TypeVar, Union, overload if sys.version_info < (3, 8): - _T = TypeVar('_T') + _T = TypeVar("_T") if sys.version_info >= (3, 6): from builtins import _PathLike @@ -59,7 +56,6 @@ def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... @overload def realpath(path: AnyStr) -> AnyStr: ... - else: def abspath(path: AnyStr) -> AnyStr: ... def basename(s: AnyStr) -> AnyStr: ... @@ -69,31 +65,26 @@ def normcase(path: AnyStr) -> AnyStr: ... def normpath(s: AnyStr) -> AnyStr: ... def realpath(path: AnyStr) -> AnyStr: ... - # NOTE: Empty lists results in '' (str) regardless of contained type. # Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes # So, fall back to Any def commonprefix(m: Sequence[AnyPath]) -> Any: ... - if sys.version_info >= (3, 3): def exists(path: Union[AnyPath, int]) -> bool: ... else: def exists(path: AnyPath) -> bool: ... def lexists(path: AnyPath) -> bool: ... - # These return float if os.stat_float_times() == True, # but int is a subclass of float. def getatime(filename: AnyPath) -> float: ... def getmtime(filename: AnyPath) -> float: ... def getctime(filename: AnyPath) -> float: ... - def getsize(filename: AnyPath) -> int: ... def isabs(s: AnyPath) -> bool: ... def isfile(path: AnyPath) -> bool: ... def isdir(s: AnyPath) -> bool: ... def islink(s: AnyPath) -> bool: ... def ismount(s: AnyPath) -> bool: ... - if sys.version_info < (3, 0): # Make sure signatures are disjunct, and allow combinations of bytes and unicode. # (Since Python 2 allows that, too) @@ -117,11 +108,9 @@ def join(s: BytesPath, *paths: BytesPath) -> bytes: ... else: def join(s: AnyStr, *paths: AnyStr) -> AnyStr: ... - def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... def sameopenfile(fp1: int, fp2: int) -> bool: ... def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... - if sys.version_info >= (3, 6): @overload def split(s: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... @@ -139,6 +128,5 @@ def split(s: AnyStr) -> Tuple[AnyStr, AnyStr]: ... def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - if sys.version_info < (3,): def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/marshal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/marshal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/marshal.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/marshal.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any, IO +from typing import IO, Any version: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/math.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/math.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/math.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/math.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,5 @@ -# Stubs for math -# See: http://docs.python.org/2/library/math.html - -from typing import Tuple, Iterable, SupportsFloat, SupportsInt, overload - import sys +from typing import Iterable, Optional, SupportsFloat, SupportsInt, Tuple, overload e: float pi: float @@ -20,64 +16,106 @@ def atan(__x: SupportsFloat) -> float: ... def atan2(__y: SupportsFloat, __x: SupportsFloat) -> float: ... def atanh(__x: SupportsFloat) -> float: ... + if sys.version_info >= (3,): def ceil(__x: SupportsFloat) -> int: ... + else: def ceil(__x: SupportsFloat) -> float: ... + +if sys.version_info >= (3, 8): + def comb(__n: int, __k: int) -> int: ... + def copysign(__x: SupportsFloat, __y: SupportsFloat) -> float: ... def cos(__x: SupportsFloat) -> float: ... def cosh(__x: SupportsFloat) -> float: ... def degrees(__x: SupportsFloat) -> float: ... + if sys.version_info >= (3, 8): def dist(__p: Iterable[SupportsFloat], __q: Iterable[SupportsFloat]) -> float: ... + def erf(__x: SupportsFloat) -> float: ... def erfc(__x: SupportsFloat) -> float: ... def exp(__x: SupportsFloat) -> float: ... def expm1(__x: SupportsFloat) -> float: ... def fabs(__x: SupportsFloat) -> float: ... def factorial(__x: SupportsInt) -> int: ... + if sys.version_info >= (3,): def floor(__x: SupportsFloat) -> int: ... + else: def floor(__x: SupportsFloat) -> float: ... + def fmod(__x: SupportsFloat, __y: SupportsFloat) -> float: ... def frexp(__x: SupportsFloat) -> Tuple[float, int]: ... def fsum(__seq: Iterable[float]) -> float: ... def gamma(__x: SupportsFloat) -> float: ... -if sys.version_info >= (3, 5): + +if sys.version_info >= (3, 9): + def gcd(*integers: int) -> int: ... + +elif sys.version_info >= (3, 5): def gcd(__x: int, __y: int) -> int: ... + if sys.version_info >= (3, 8): def hypot(*coordinates: SupportsFloat) -> float: ... + else: def hypot(__x: SupportsFloat, __y: SupportsFloat) -> float: ... + if sys.version_info >= (3, 5): def isclose(a: SupportsFloat, b: SupportsFloat, *, rel_tol: SupportsFloat = ..., abs_tol: SupportsFloat = ...) -> bool: ... + def isinf(__x: SupportsFloat) -> bool: ... + if sys.version_info >= (3,): def isfinite(__x: SupportsFloat) -> bool: ... + def isnan(__x: SupportsFloat) -> bool: ... + if sys.version_info >= (3, 8): def isqrt(__n: int) -> int: ... + +if sys.version_info >= (3, 9): + def lcm(*integers: int) -> int: ... + def ldexp(__x: SupportsFloat, __i: int) -> float: ... def lgamma(__x: SupportsFloat) -> float: ... def log(x: SupportsFloat, base: SupportsFloat = ...) -> float: ... def log10(__x: SupportsFloat) -> float: ... def log1p(__x: SupportsFloat) -> float: ... + if sys.version_info >= (3, 3): def log2(__x: SupportsFloat) -> float: ... + def modf(__x: SupportsFloat) -> Tuple[float, float]: ... + +if sys.version_info >= (3, 9): + def nextafter(__x: SupportsFloat, __y: SupportsFloat) -> float: ... + +if sys.version_info >= (3, 8): + def perm(__n: int, __k: Optional[int] = ...) -> int: ... + def pow(__x: SupportsFloat, __y: SupportsFloat) -> float: ... + if sys.version_info >= (3, 8): @overload def prod(__iterable: Iterable[int], *, start: int = ...) -> int: ... # type: ignore @overload def prod(__iterable: Iterable[SupportsFloat], *, start: SupportsFloat = ...) -> float: ... + def radians(__x: SupportsFloat) -> float: ... + if sys.version_info >= (3, 7): def remainder(__x: SupportsFloat, __y: SupportsFloat) -> float: ... + def sin(__x: SupportsFloat) -> float: ... def sinh(__x: SupportsFloat) -> float: ... def sqrt(__x: SupportsFloat) -> float: ... def tan(__x: SupportsFloat) -> float: ... def tanh(__x: SupportsFloat) -> float: ... def trunc(__x: SupportsFloat) -> int: ... + +if sys.version_info >= (3, 9): + def ulp(__x: SupportsFloat) -> float: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/mimetypes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/mimetypes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/mimetypes.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/mimetypes.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,19 +1,15 @@ -# Stubs for mimetypes - -from typing import Dict, IO, List, Optional, Sequence, Text, Tuple, AnyStr, Union import sys +from typing import IO, Dict, List, Optional, Sequence, Text, Tuple, Union if sys.version_info >= (3, 8): from os import PathLike - def guess_type(url: Union[Text, PathLike[str]], - strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... + def guess_type(url: Union[Text, PathLike[str]], strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... + else: - def guess_type(url: Text, - strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... + def guess_type(url: Text, strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... def guess_all_extensions(type: str, strict: bool = ...) -> List[str]: ... def guess_extension(type: str, strict: bool = ...) -> Optional[str]: ... - def init(files: Optional[Sequence[str]] = ...) -> None: ... def read_mime_types(filename: str) -> Optional[Dict[str, str]]: ... def add_type(type: str, ext: str, strict: bool = ...) -> None: ... @@ -30,15 +26,11 @@ encodings_map: Dict[str, str] types_map: Tuple[Dict[str, str], Dict[str, str]] types_map_inv: Tuple[Dict[str, str], Dict[str, str]] - def __init__(self, filenames: Tuple[str, ...] = ..., - strict: bool = ...) -> None: ... - def guess_extension(self, type: str, - strict: bool = ...) -> Optional[str]: ... - def guess_type(self, url: str, - strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... - def guess_all_extensions(self, type: str, - strict: bool = ...) -> List[str]: ... + def __init__(self, filenames: Tuple[str, ...] = ..., strict: bool = ...) -> None: ... + def guess_extension(self, type: str, strict: bool = ...) -> Optional[str]: ... + def guess_type(self, url: str, strict: bool = ...) -> Tuple[Optional[str], Optional[str]]: ... + def guess_all_extensions(self, type: str, strict: bool = ...) -> List[str]: ... def read(self, filename: str, strict: bool = ...) -> None: ... def readfp(self, fp: IO[str], strict: bool = ...) -> None: ... - if sys.platform == 'win32': + if sys.platform == "win32": def read_windows_registry(self, strict: bool = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/mmap.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/mmap.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/mmap.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/mmap.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ import sys -from typing import (Optional, Sequence, Union, Generic, overload, - Iterable, Iterator, Sized, ContextManager, AnyStr) +from _typeshed import ReadableBuffer +from typing import AnyStr, ContextManager, Generic, Iterable, Iterator, Optional, Sequence, Sized, Union, overload ACCESS_DEFAULT: int ACCESS_READ: int @@ -9,7 +9,7 @@ ALLOCATIONGRANULARITY: int -if sys.platform != 'win32': +if sys.platform != "win32": MAP_ANON: int MAP_ANONYMOUS: int MAP_DENYWRITE: int @@ -23,31 +23,26 @@ PAGESIZE: int class _mmap(Generic[AnyStr]): - if sys.platform == 'win32': - def __init__(self, fileno: int, length: int, - tagname: Optional[str] = ..., access: int = ..., - offset: int = ...) -> None: ... + if sys.platform == "win32": + def __init__( + self, fileno: int, length: int, tagname: Optional[str] = ..., access: int = ..., offset: int = ... + ) -> None: ... else: - def __init__(self, - fileno: int, length: int, flags: int = ..., - prot: int = ..., access: int = ..., - offset: int = ...) -> None: ... + def __init__( + self, fileno: int, length: int, flags: int = ..., prot: int = ..., access: int = ..., offset: int = ... + ) -> None: ... def close(self) -> None: ... - def find(self, sub: AnyStr, - start: int = ..., end: int = ...) -> int: ... if sys.version_info >= (3, 8): def flush(self, offset: int = ..., size: int = ...) -> None: ... else: def flush(self, offset: int = ..., size: int = ...) -> int: ... def move(self, dest: int, src: int, count: int) -> None: ... - def read(self, n: int = ...) -> AnyStr: ... def read_byte(self) -> AnyStr: ... def readline(self) -> AnyStr: ... def resize(self, newsize: int) -> None: ... def seek(self, pos: int, whence: int = ...) -> None: ... def size(self) -> int: ... def tell(self) -> int: ... - def write(self, bytes: AnyStr) -> None: ... def write_byte(self, byte: AnyStr) -> None: ... def __len__(self) -> int: ... @@ -56,7 +51,13 @@ closed: bool if sys.version_info >= (3, 8) and sys.platform != "win32": def madvise(self, option: int, start: int = ..., length: int = ...) -> None: ... - def rfind(self, sub: bytes, start: int = ..., stop: int = ...) -> int: ... + def find(self, sub: ReadableBuffer, start: int = ..., stop: int = ...) -> int: ... + def rfind(self, sub: ReadableBuffer, start: int = ..., stop: int = ...) -> int: ... + def read(self, n: Optional[int] = ...) -> bytes: ... + if sys.version_info >= (3, 6): + def write(self, bytes: ReadableBuffer) -> int: ... + else: + def write(self, bytes: ReadableBuffer) -> None: ... @overload def __getitem__(self, index: int) -> int: ... @overload @@ -69,9 +70,13 @@ # Doesn't actually exist, but the object is actually iterable because it has __getitem__ and # __len__, so we claim that there is also an __iter__ to help type checkers. def __iter__(self) -> Iterator[bytes]: ... + else: class mmap(_mmap[bytes], Sequence[bytes]): + def find(self, string: bytes, start: int = ..., end: int = ...) -> int: ... def rfind(self, string: bytes, start: int = ..., stop: int = ...) -> int: ... + def read(self, num: int) -> bytes: ... + def write(self, string: bytes) -> None: ... def __getitem__(self, index: Union[int, slice]) -> bytes: ... def __getslice__(self, i: Optional[int], j: Optional[int]) -> bytes: ... def __delitem__(self, index: Union[int, slice]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/modulefinder.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/modulefinder.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/modulefinder.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/modulefinder.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ import sys -from typing import Optional, Container, Dict, Sequence, Tuple, List, Any, Iterator, IO, Iterable from types import CodeType +from typing import IO, Any, Container, Dict, Iterable, Iterator, List, Optional, Sequence, Tuple LOAD_CONST: int # undocumented IMPORT_NAME: int # undocumented @@ -10,12 +10,14 @@ EXTENDED_ARG: int # undocumented packagePathMap: Dict[str, List[str]] # undocumented + def AddPackagePath(packagename: str, path: str) -> None: ... + replacePackageMap: Dict[str, str] # undocumented + def ReplacePackage(oldname: str, newname: str) -> None: ... class Module: # undocumented - def __init__(self, name: str, file: Optional[str] = ..., path: Optional[str] = ...) -> None: ... def __repr__(self) -> str: ... @@ -30,15 +32,29 @@ replace_paths: Sequence[Tuple[str, str]] # undocumented if sys.version_info >= (3, 8): - def __init__(self, path: Optional[List[str]] = ..., debug: int = ..., excludes: Optional[Container[str]] = ..., replace_paths: Optional[Sequence[Tuple[str, str]]] = ...) -> None: ... + def __init__( + self, + path: Optional[List[str]] = ..., + debug: int = ..., + excludes: Optional[Container[str]] = ..., + replace_paths: Optional[Sequence[Tuple[str, str]]] = ..., + ) -> None: ... else: - def __init__(self, path: Optional[List[str]] = ..., debug: int = ..., excludes: Container[str] = ..., replace_paths: Sequence[Tuple[str, str]] = ...) -> None: ... + def __init__( + self, + path: Optional[List[str]] = ..., + debug: int = ..., + excludes: Container[str] = ..., + replace_paths: Sequence[Tuple[str, str]] = ..., + ) -> None: ... def msg(self, level: int, str: str, *args: Any) -> None: ... # undocumented def msgin(self, *args: Any) -> None: ... # undocumented def msgout(self, *args: Any) -> None: ... # undocumented def run_script(self, pathname: str) -> None: ... def load_file(self, pathname: str) -> None: ... # undocumented - def import_hook(self, name: str, caller: Optional[Module] = ..., fromlist: Optional[List[str]] = ..., level: int = ...) -> Optional[Module]: ... # undocumented + def import_hook( + self, name: str, caller: Optional[Module] = ..., fromlist: Optional[List[str]] = ..., level: int = ... + ) -> Optional[Module]: ... # undocumented def determine_parent(self, caller: Optional[Module], level: int = ...) -> Optional[Module]: ... # undocumented def find_head_package(self, parent: Module, name: str) -> Tuple[Module, str]: ... # undocumented def load_tail(self, q: Module, tail: str) -> Module: ... # undocumented @@ -51,7 +67,9 @@ def scan_code(self, co: CodeType, m: Module) -> None: ... # undocumented def load_package(self, fqname: str, pathname: str) -> Module: ... # undocumented def add_module(self, fqname: str) -> Module: ... # undocumented - def find_module(self, name: str, path: Optional[str], parent: Optional[Module] = ...) -> Tuple[Optional[IO[Any]], Optional[str], Tuple[str, str, int]]: ... # undocumented + def find_module( + self, name: str, path: Optional[str], parent: Optional[Module] = ... + ) -> Tuple[Optional[IO[Any]], Optional[str], Tuple[str, str, int]]: ... # undocumented def report(self) -> None: ... def any_missing(self) -> List[str]: ... # undocumented def any_missing_maybe(self) -> Tuple[List[str], List[str]]: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,9 @@ import sys -from typing import List, Tuple, Union, Set, Optional, Dict, Container, Any, Type, Iterable, Sequence from types import ModuleType +from typing import Any, Container, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Type, Union from typing_extensions import Literal -if sys.platform == 'win32': +if sys.platform == "win32": from _msi import _Database AMD64: bool @@ -11,52 +11,51 @@ Itanium: bool Win64: bool - datasizemask: Literal[0x00ff] + datasizemask: Literal[0x00FF] type_valid: Literal[0x0100] type_localizable: Literal[0x0200] - typemask: Literal[0x0c00] + typemask: Literal[0x0C00] type_long: Literal[0x0000] type_short: Literal[0x0400] - type_string: Literal[0x0c00] + type_string: Literal[0x0C00] type_binary: Literal[0x0800] type_nullable: Literal[0x1000] type_key: Literal[0x2000] - knownbits: Literal[0x3fff] - + knownbits: Literal[0x3FFF] class Table: name: str fields: List[Tuple[int, str, int]] - def __init__(self, name: str) -> None: ... def add_field(self, index: int, name: str, type: int) -> None: ... def sql(self) -> str: ... def create(self, db: _Database) -> None: ... - class _Unspecified: ... - - def change_sequence(seq: Sequence[Tuple[str, Optional[str], int]], action: str, seqno: Union[int, Type[_Unspecified]] = ..., cond: Union[str, Type[_Unspecified]] = ...) -> None: ... + def change_sequence( + seq: Sequence[Tuple[str, Optional[str], int]], + action: str, + seqno: Union[int, Type[_Unspecified]] = ..., + cond: Union[str, Type[_Unspecified]] = ..., + ) -> None: ... def add_data(db: _Database, table: str, values: Iterable[Tuple[Any, ...]]) -> None: ... def add_stream(db: _Database, name: str, path: str) -> None: ... - def init_database(name: str, schema: ModuleType, ProductName: str, ProductCode: str, ProductVersion: str, Manufacturer: str) -> _Database: ... + def init_database( + name: str, schema: ModuleType, ProductName: str, ProductCode: str, ProductVersion: str, Manufacturer: str + ) -> _Database: ... def add_tables(db: _Database, module: ModuleType) -> None: ... def make_id(str: str) -> str: ... def gen_uuid() -> str: ... - class CAB: name: str files: List[Tuple[str, str]] filenames: Set[str] index: int - def __init__(self, name: str) -> None: ... def gen_id(self, file: str) -> str: ... def append(self, full: str, file: str, logical: str) -> Tuple[int, str]: ... def commit(self, db: _Database) -> None: ... - _directories: Set[str] - class Directory: db: _Database @@ -70,46 +69,65 @@ keyfiles: Dict[str, str] componentflags: Optional[int] absolute: str - - def __init__(self, db: _Database, cab: CAB, basedir: str, physical: str, _logical: str, default: str, componentflags: Optional[int] = ...) -> None: ... - def start_component(self, component: Optional[str] = ..., feature: Optional[Feature] = ..., flags: Optional[int] = ..., keyfile: Optional[str] = ..., uuid: Optional[str] = ...) -> None: ... + def __init__( + self, + db: _Database, + cab: CAB, + basedir: str, + physical: str, + _logical: str, + default: str, + componentflags: Optional[int] = ..., + ) -> None: ... + def start_component( + self, + component: Optional[str] = ..., + feature: Optional[Feature] = ..., + flags: Optional[int] = ..., + keyfile: Optional[str] = ..., + uuid: Optional[str] = ..., + ) -> None: ... def make_short(self, file: str) -> str: ... - def add_file(self, file: str, src: Optional[str] = ..., version: Optional[str] = ..., language: Optional[str] = ...) -> str: ... + def add_file( + self, file: str, src: Optional[str] = ..., version: Optional[str] = ..., language: Optional[str] = ... + ) -> str: ... def glob(self, pattern: str, exclude: Optional[Container[str]] = ...) -> List[str]: ... def remove_pyc(self) -> None: ... - class Binary: name: str - def __init__(self, fname: str) -> None: ... def __repr__(self) -> str: ... - class Feature: id: str - - def __init__(self, db: _Database, id: str, title: str, desc: str, display: int, level: int = ..., parent: Optional[Feature] = ..., directory: Optional[str] = ..., attributes: int = ...) -> None: ... + def __init__( + self, + db: _Database, + id: str, + title: str, + desc: str, + display: int, + level: int = ..., + parent: Optional[Feature] = ..., + directory: Optional[str] = ..., + attributes: int = ..., + ) -> None: ... def set_current(self) -> None: ... - class Control: dlg: Dialog name: str - def __init__(self, dlg: Dialog, name: str) -> None: ... def event(self, event: str, argument: str, condition: str = ..., ordering: Optional[int] = ...) -> None: ... def mapping(self, event: str, attribute: str) -> None: ... def condition(self, action: str, condition: str) -> None: ... - class RadioButtonGroup(Control): property: str index: int - def __init__(self, dlg: Dialog, name: str, property: str) -> None: ... def add(self, name: str, x: int, y: int, w: int, h: int, text: str, value: Optional[str] = ...) -> None: ... - class Dialog: db: _Database @@ -118,12 +136,61 @@ y: int w: int h: int - - def __init__(self, db: _Database, name: str, x: int, y: int, w: int, h: int, attr: int, title: str, first: str, default: str, cancel: str) -> None: ... - def control(self, name: str, type: str, x: int, y: int, w: int, h: int, attr: int, prop: Optional[str], text: Optional[str], next: Optional[str], help: Optional[str]) -> Control: ... + def __init__( + self, + db: _Database, + name: str, + x: int, + y: int, + w: int, + h: int, + attr: int, + title: str, + first: str, + default: str, + cancel: str, + ) -> None: ... + def control( + self, + name: str, + type: str, + x: int, + y: int, + w: int, + h: int, + attr: int, + prop: Optional[str], + text: Optional[str], + next: Optional[str], + help: Optional[str], + ) -> Control: ... def text(self, name: str, x: int, y: int, w: int, h: int, attr: int, text: Optional[str]) -> Control: ... def bitmap(self, name: str, x: int, y: int, w: int, h: int, text: Optional[str]) -> Control: ... def line(self, name: str, x: int, y: int, w: int, h: int) -> Control: ... - def pushbutton(self, name: str, x: int, y: int, w: int, h: int, attr: int, text: Optional[str], next: Optional[str]) -> Control: ... - def radiogroup(self, name: str, x: int, y: int, w: int, h: int, attr: int, prop: Optional[str], text: Optional[str], next: Optional[str]) -> RadioButtonGroup: ... - def checkbox(self, name: str, x: int, y: int, w: int, h: int, attr: int, prop: Optional[str], text: Optional[str], next: Optional[str]) -> Control: ... + def pushbutton( + self, name: str, x: int, y: int, w: int, h: int, attr: int, text: Optional[str], next: Optional[str] + ) -> Control: ... + def radiogroup( + self, + name: str, + x: int, + y: int, + w: int, + h: int, + attr: int, + prop: Optional[str], + text: Optional[str], + next: Optional[str], + ) -> RadioButtonGroup: ... + def checkbox( + self, + name: str, + x: int, + y: int, + w: int, + h: int, + attr: int, + prop: Optional[str], + text: Optional[str], + next: Optional[str], + ) -> Control: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/schema.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/schema.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/schema.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/schema.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ - import sys -from typing import List, Tuple, Optional +from typing import List, Optional, Tuple -if sys.platform == 'win32': +if sys.platform == "win32": from . import Table _Validation: Table @@ -93,4 +92,6 @@ tables: List[Table] - _Validation_records: List[Tuple[str, str, str, Optional[int], Optional[int], Optional[str], Optional[int], Optional[str], Optional[str], str]] + _Validation_records: List[ + Tuple[str, str, str, Optional[int], Optional[int], Optional[str], Optional[int], Optional[str], Optional[str], str] + ] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/sequence.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/sequence.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/sequence.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/sequence.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ - import sys -from typing import List, Tuple, Optional +from typing import List, Optional, Tuple -if sys.platform == 'win32': +if sys.platform == "win32": _SequenceType = List[Tuple[str, Optional[str], int]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/text.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/text.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/text.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/msilib/text.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ - import sys -from typing import List, Tuple, Optional +from typing import List, Optional, Tuple -if sys.platform == 'win32': +if sys.platform == "win32": ActionText: List[Tuple[str, str, Optional[str]]] UIText: List[Tuple[str, Optional[str]]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_msi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_msi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_msi.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_msi.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,49 +1,38 @@ - import sys from typing import List, Optional, Union -if sys.platform == 'win32': +if sys.platform == "win32": # Actual typename View, not exposed by the implementation class _View: - def Execute(self, params: Optional[_Record] = ...) -> None: ... def GetColumnInfo(self, kind: int) -> _Record: ... def Fetch(self) -> _Record: ... def Modify(self, mode: int, record: _Record) -> None: ... def Close(self) -> None: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore - # Actual typename Summary, not exposed by the implementation class _Summary: - def GetProperty(self, propid: int) -> Optional[Union[str, bytes]]: ... def GetPropertyCount(self) -> int: ... def SetProperty(self, propid: int, value: Union[str, bytes]) -> None: ... def Persist(self) -> None: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore - # Actual typename Database, not exposed by the implementation class _Database: - def OpenView(self, sql: str) -> _View: ... def Commit(self) -> None: ... def GetSummaryInformation(self, updateCount: int) -> _Summary: ... def Close(self) -> None: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore - # Actual typename Record, not exposed by the implementation class _Record: - def GetFieldCount(self) -> int: ... def GetInteger(self, field: int) -> int: ... def GetString(self, field: int) -> str: ... @@ -51,11 +40,9 @@ def SetStream(self, field: int, stream: str) -> None: ... def SetInteger(self, field: int, int: int) -> None: ... def ClearData(self) -> None: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore - def UuidCreate() -> str: ... def FCICreate(cabname: str, files: List[str]) -> None: ... def OpenDatabase(name: str, flags: int) -> _Database: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ntpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ntpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ntpath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ntpath.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -# NB: path.pyi and stdlib/2 and stdlib/3 must remain consistent! -import os -import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Text, Callable, Optional -from genericpath import exists as exists -from _typeshed import StrPath, BytesPath, AnyPath - -_T = TypeVar('_T') - -if sys.version_info >= (3, 6): - from builtins import _PathLike - -# ----- os.path variables ----- -supports_unicode_filenames: bool -# aliases (also in os) -curdir: str -pardir: str -sep: str -if sys.platform == 'win32': - altsep: str -else: - altsep: Optional[str] -extsep: str -pathsep: str -defpath: str -devnull: str - -# ----- os.path function stubs ----- -if sys.version_info >= (3, 6): - # Overloads are necessary to work around python/mypy#3644. - @overload - def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def abspath(path: AnyStr) -> AnyStr: ... - @overload - def basename(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def basename(p: AnyStr) -> AnyStr: ... - @overload - def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def dirname(p: AnyStr) -> AnyStr: ... - @overload - def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expanduser(path: AnyStr) -> AnyStr: ... - @overload - def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expandvars(path: AnyStr) -> AnyStr: ... - @overload - def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normcase(s: AnyStr) -> AnyStr: ... - @overload - def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - @overload - def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(path: AnyStr) -> AnyStr: ... - else: - @overload - def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(filename: AnyStr) -> AnyStr: ... - -else: - def abspath(path: AnyStr) -> AnyStr: ... - def basename(p: AnyStr) -> AnyStr: ... - def dirname(p: AnyStr) -> AnyStr: ... - def expanduser(path: AnyStr) -> AnyStr: ... - def expandvars(path: AnyStr) -> AnyStr: ... - def normcase(s: AnyStr) -> AnyStr: ... - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - def realpath(path: AnyStr) -> AnyStr: ... - else: - def realpath(filename: AnyStr) -> AnyStr: ... - -if sys.version_info >= (3, 6): - # In reality it returns str for sequences of StrPath and bytes for sequences - # of BytesPath, but mypy does not accept such a signature. - def commonpath(paths: Sequence[AnyPath]) -> Any: ... -elif sys.version_info >= (3, 5): - def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... - -# NOTE: Empty lists results in '' (str) regardless of contained type. -# Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes -# So, fall back to Any -def commonprefix(m: Sequence[AnyPath]) -> Any: ... - -def lexists(path: AnyPath) -> bool: ... - -# These return float if os.stat_float_times() == True, -# but int is a subclass of float. -def getatime(filename: AnyPath) -> float: ... -def getmtime(filename: AnyPath) -> float: ... -def getctime(filename: AnyPath) -> float: ... - -def getsize(filename: AnyPath) -> int: ... -def isabs(s: AnyPath) -> bool: ... -def isfile(path: AnyPath) -> bool: ... -def isdir(s: AnyPath) -> bool: ... -def islink(path: AnyPath) -> bool: ... -def ismount(path: AnyPath) -> bool: ... - -if sys.version_info < (3, 0): - # Make sure signatures are disjunct, and allow combinations of bytes and unicode. - # (Since Python 2 allows that, too) - # Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in - # a type error. - @overload - def join(__p1: bytes, *p: bytes) -> bytes: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: Text, *p: AnyPath) -> Text: ... -elif sys.version_info >= (3, 6): - @overload - def join(a: StrPath, *paths: StrPath) -> Text: ... - @overload - def join(a: BytesPath, *paths: BytesPath) -> bytes: ... -else: - def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... - -@overload -def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... -@overload -def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... - -def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... -def sameopenfile(fp1: int, fp2: int) -> bool: ... -def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... - -if sys.version_info >= (3, 6): - @overload - def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -else: - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - -if sys.version_info < (3, 7) and sys.platform == 'win32': - def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated - -if sys.version_info < (3,): - def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/numbers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/numbers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/numbers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/numbers.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,13 +1,9 @@ -# Stubs for numbers (Python 3.5) -# See https://docs.python.org/2.7/library/numbers.html -# and https://docs.python.org/3/library/numbers.html -# # Note: these stubs are incomplete. The more complex type # signatures are currently omitted. -from typing import Any, Optional, SupportsFloat, overload -from abc import ABCMeta, abstractmethod import sys +from abc import ABCMeta, abstractmethod +from typing import Any, Optional, SupportsFloat, overload class Number(metaclass=ABCMeta): @abstractmethod @@ -22,42 +18,42 @@ def __nonzero__(self) -> bool: ... @property @abstractmethod - def real(self): ... + def real(self) -> Any: ... @property @abstractmethod - def imag(self): ... + def imag(self) -> Any: ... @abstractmethod - def __add__(self, other): ... + def __add__(self, other: Any) -> Any: ... @abstractmethod - def __radd__(self, other): ... + def __radd__(self, other: Any) -> Any: ... @abstractmethod - def __neg__(self): ... + def __neg__(self) -> Any: ... @abstractmethod - def __pos__(self): ... - def __sub__(self, other): ... - def __rsub__(self, other): ... + def __pos__(self) -> Any: ... + def __sub__(self, other: Any) -> Any: ... + def __rsub__(self, other: Any) -> Any: ... @abstractmethod - def __mul__(self, other): ... + def __mul__(self, other: Any) -> Any: ... @abstractmethod - def __rmul__(self, other): ... + def __rmul__(self, other: Any) -> Any: ... if sys.version_info < (3, 0): @abstractmethod def __div__(self, other): ... @abstractmethod def __rdiv__(self, other): ... @abstractmethod - def __truediv__(self, other): ... + def __truediv__(self, other: Any) -> Any: ... @abstractmethod - def __rtruediv__(self, other): ... + def __rtruediv__(self, other: Any) -> Any: ... @abstractmethod - def __pow__(self, exponent): ... + def __pow__(self, exponent: Any) -> Any: ... @abstractmethod - def __rpow__(self, base): ... - def __abs__(self): ... - def conjugate(self): ... - def __eq__(self, other: object) -> bool: ... + def __rpow__(self, base: Any) -> Any: ... + def __abs__(self) -> Real: ... + def conjugate(self) -> Any: ... + def __eq__(self, other: Any) -> bool: ... if sys.version_info < (3, 0): - def __ne__(self, other: object) -> bool: ... + def __ne__(self, other: Any) -> bool: ... class Real(Complex, SupportsFloat): @abstractmethod @@ -71,30 +67,30 @@ def __ceil__(self) -> int: ... @abstractmethod @overload - def __round__(self, ndigits: None = ...): ... + def __round__(self, ndigits: None = ...) -> int: ... @abstractmethod @overload - def __round__(self, ndigits: int): ... - def __divmod__(self, other): ... - def __rdivmod__(self, other): ... + def __round__(self, ndigits: int) -> Any: ... + def __divmod__(self, other: Any) -> Any: ... + def __rdivmod__(self, other: Any) -> Any: ... @abstractmethod - def __floordiv__(self, other): ... + def __floordiv__(self, other: Any) -> int: ... @abstractmethod - def __rfloordiv__(self, other): ... + def __rfloordiv__(self, other: Any) -> int: ... @abstractmethod - def __mod__(self, other): ... + def __mod__(self, other: Any) -> Any: ... @abstractmethod - def __rmod__(self, other): ... + def __rmod__(self, other: Any) -> Any: ... @abstractmethod - def __lt__(self, other) -> bool: ... + def __lt__(self, other: Any) -> bool: ... @abstractmethod - def __le__(self, other) -> bool: ... + def __le__(self, other: Any) -> bool: ... def __complex__(self) -> complex: ... @property - def real(self): ... + def real(self) -> Any: ... @property - def imag(self): ... - def conjugate(self): ... + def imag(self) -> Any: ... + def conjugate(self) -> Any: ... class Rational(Real): @property @@ -114,29 +110,29 @@ def __long__(self) -> long: ... def __index__(self) -> int: ... @abstractmethod - def __pow__(self, exponent, modulus: Optional[Any] = ...): ... + def __pow__(self, exponent: Any, modulus: Optional[Any] = ...) -> Any: ... @abstractmethod - def __lshift__(self, other): ... + def __lshift__(self, other: Any) -> Any: ... @abstractmethod - def __rlshift__(self, other): ... + def __rlshift__(self, other: Any) -> Any: ... @abstractmethod - def __rshift__(self, other): ... + def __rshift__(self, other: Any) -> Any: ... @abstractmethod - def __rrshift__(self, other): ... + def __rrshift__(self, other: Any) -> Any: ... @abstractmethod - def __and__(self, other): ... + def __and__(self, other: Any) -> Any: ... @abstractmethod - def __rand__(self, other): ... + def __rand__(self, other: Any) -> Any: ... @abstractmethod - def __xor__(self, other): ... + def __xor__(self, other: Any) -> Any: ... @abstractmethod - def __rxor__(self, other): ... + def __rxor__(self, other: Any) -> Any: ... @abstractmethod - def __or__(self, other): ... + def __or__(self, other: Any) -> Any: ... @abstractmethod - def __ror__(self, other): ... + def __ror__(self, other: Any) -> Any: ... @abstractmethod - def __invert__(self): ... + def __invert__(self) -> Any: ... def __float__(self) -> float: ... @property def numerator(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/opcode.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/opcode.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/opcode.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/opcode.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,5 @@ -from typing import List, Dict, Optional, Sequence - import sys +from typing import Dict, List, Optional, Sequence cmp_op: Sequence[str] hasconst: List[int] @@ -18,6 +17,7 @@ if sys.version_info >= (3, 8): def stack_effect(__opcode: int, __oparg: Optional[int] = ..., *, jump: Optional[bool] = ...) -> int: ... + elif sys.version_info >= (3, 4): def stack_effect(__opcode: int, __oparg: Optional[int] = ...) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/operator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/operator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/operator.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/operator.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,21 @@ -# Stubs for operator - +import sys from typing import ( - Any, Callable, Container, Mapping, MutableMapping, MutableSequence, Sequence, SupportsAbs, Tuple, - TypeVar, overload, + Any, + Callable, + Container, + Mapping, + MutableMapping, + MutableSequence, + Sequence, + SupportsAbs, + Tuple, + TypeVar, + overload, ) -import sys - - -_T = TypeVar('_T') -_K = TypeVar('_K') -_V = TypeVar('_V') +_T = TypeVar("_T") +_K = TypeVar("_K") +_V = TypeVar("_V") def lt(__a: Any, __b: Any) -> Any: ... def le(__a: Any, __b: Any) -> Any: ... @@ -24,46 +29,34 @@ def __ne__(a: Any, b: Any) -> Any: ... def __ge__(a: Any, b: Any) -> Any: ... def __gt__(a: Any, b: Any) -> Any: ... - def not_(__a: Any) -> bool: ... def __not__(a: Any) -> bool: ... - def truth(__a: Any) -> bool: ... - def is_(__a: Any, __b: Any) -> bool: ... - def is_not(__a: Any, __b: Any) -> bool: ... - def abs(__a: SupportsAbs[_T]) -> _T: ... def __abs__(a: SupportsAbs[_T]) -> _T: ... - def add(__a: Any, __b: Any) -> Any: ... def __add__(a: Any, b: Any) -> Any: ... - def and_(__a: Any, __b: Any) -> Any: ... def __and__(a: Any, b: Any) -> Any: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def div(a: Any, b: Any) -> Any: ... def __div__(a: Any, b: Any) -> Any: ... def floordiv(__a: Any, __b: Any) -> Any: ... def __floordiv__(a: Any, b: Any) -> Any: ... - def index(__a: Any) -> int: ... def __index__(a: Any) -> int: ... - def inv(__a: Any) -> Any: ... def invert(__a: Any) -> Any: ... def __inv__(a: Any) -> Any: ... def __invert__(a: Any) -> Any: ... - def lshift(__a: Any, __b: Any) -> Any: ... def __lshift__(a: Any, b: Any) -> Any: ... - def mod(__a: Any, __b: Any) -> Any: ... def __mod__(a: Any, b: Any) -> Any: ... - def mul(__a: Any, __b: Any) -> Any: ... def __mul__(a: Any, b: Any) -> Any: ... @@ -73,85 +66,85 @@ def neg(__a: Any) -> Any: ... def __neg__(a: Any) -> Any: ... - def or_(__a: Any, __b: Any) -> Any: ... def __or__(a: Any, b: Any) -> Any: ... - def pos(__a: Any) -> Any: ... def __pos__(a: Any) -> Any: ... - def pow(__a: Any, __b: Any) -> Any: ... def __pow__(a: Any, b: Any) -> Any: ... - def rshift(__a: Any, __b: Any) -> Any: ... def __rshift__(a: Any, b: Any) -> Any: ... - def sub(__a: Any, __b: Any) -> Any: ... def __sub__(a: Any, b: Any) -> Any: ... - def truediv(__a: Any, __b: Any) -> Any: ... def __truediv__(a: Any, b: Any) -> Any: ... - def xor(__a: Any, __b: Any) -> Any: ... def __xor__(a: Any, b: Any) -> Any: ... - def concat(__a: Sequence[_T], __b: Sequence[_T]) -> Sequence[_T]: ... def __concat__(a: Sequence[_T], b: Sequence[_T]) -> Sequence[_T]: ... - def contains(__a: Container[Any], __b: Any) -> bool: ... def __contains__(a: Container[Any], b: Any) -> bool: ... - def countOf(__a: Container[Any], __b: Any) -> int: ... - @overload def delitem(__a: MutableSequence[_T], __b: int) -> None: ... @overload +def delitem(__a: MutableSequence[_T], __b: slice) -> None: ... +@overload def delitem(__a: MutableMapping[_K, _V], __b: _K) -> None: ... @overload def __delitem__(a: MutableSequence[_T], b: int) -> None: ... @overload +def __delitem__(a: MutableSequence[_T], b: slice) -> None: ... +@overload def __delitem__(a: MutableMapping[_K, _V], b: _K) -> None: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def delslice(a: MutableSequence[Any], b: int, c: int) -> None: ... def __delslice__(a: MutableSequence[Any], b: int, c: int) -> None: ... @overload def getitem(__a: Sequence[_T], __b: int) -> _T: ... @overload +def getitem(__a: Sequence[_T], __b: slice) -> Sequence[_T]: ... +@overload def getitem(__a: Mapping[_K, _V], __b: _K) -> _V: ... @overload def __getitem__(a: Sequence[_T], b: int) -> _T: ... @overload +def __getitem__(a: Sequence[_T], b: slice) -> Sequence[_T]: ... +@overload def __getitem__(a: Mapping[_K, _V], b: _K) -> _V: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def getslice(a: Sequence[_T], b: int, c: int) -> Sequence[_T]: ... def __getslice__(a: Sequence[_T], b: int, c: int) -> Sequence[_T]: ... def indexOf(__a: Sequence[_T], __b: _T) -> int: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def repeat(a: Any, b: int) -> Any: ... def __repeat__(a: Any, b: int) -> Any: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def sequenceIncludes(a: Container[Any], b: Any) -> bool: ... @overload def setitem(__a: MutableSequence[_T], __b: int, __c: _T) -> None: ... @overload +def setitem(__a: MutableSequence[_T], __b: slice, __c: Sequence[_T]) -> None: ... +@overload def setitem(__a: MutableMapping[_K, _V], __b: _K, __c: _V) -> None: ... @overload def __setitem__(a: MutableSequence[_T], b: int, c: _T) -> None: ... @overload +def __setitem__(a: MutableSequence[_T], b: slice, c: Sequence[_T]) -> None: ... +@overload def __setitem__(a: MutableMapping[_K, _V], b: _K, c: _V) -> None: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def setslice(a: MutableSequence[_T], b: int, c: int, v: Sequence[_T]) -> None: ... def __setslice__(a: MutableSequence[_T], b: int, c: int, v: Sequence[_T]) -> None: ... - if sys.version_info >= (3, 4): def length_hint(__obj: Any, __default: int = ...) -> int: ... @@ -159,37 +152,28 @@ def attrgetter(attr: str) -> Callable[[Any], Any]: ... @overload def attrgetter(*attrs: str) -> Callable[[Any], Tuple[Any, ...]]: ... - @overload def itemgetter(item: Any) -> Callable[[Any], Any]: ... @overload def itemgetter(*items: Any) -> Callable[[Any], Tuple[Any, ...]]: ... - -def methodcaller(name: str, *args: Any, **kwargs: Any) -> Callable[..., Any]: ... - - +def methodcaller(__name: str, *args: Any, **kwargs: Any) -> Callable[..., Any]: ... def iadd(__a: Any, __b: Any) -> Any: ... def __iadd__(a: Any, b: Any) -> Any: ... - def iand(__a: Any, __b: Any) -> Any: ... def __iand__(a: Any, b: Any) -> Any: ... - def iconcat(__a: Any, __b: Any) -> Any: ... def __iconcat__(a: Any, b: Any) -> Any: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def idiv(a: Any, b: Any) -> Any: ... def __idiv__(a: Any, b: Any) -> Any: ... def ifloordiv(__a: Any, __b: Any) -> Any: ... def __ifloordiv__(a: Any, b: Any) -> Any: ... - def ilshift(__a: Any, __b: Any) -> Any: ... def __ilshift__(a: Any, b: Any) -> Any: ... - def imod(__a: Any, __b: Any) -> Any: ... def __imod__(a: Any, b: Any) -> Any: ... - def imul(__a: Any, __b: Any) -> Any: ... def __imul__(a: Any, b: Any) -> Any: ... @@ -199,28 +183,23 @@ def ior(__a: Any, __b: Any) -> Any: ... def __ior__(a: Any, b: Any) -> Any: ... - def ipow(__a: Any, __b: Any) -> Any: ... def __ipow__(a: Any, b: Any) -> Any: ... -if sys.version_info < (3, ): +if sys.version_info < (3,): def irepeat(a: Any, b: int) -> Any: ... def __irepeat__(a: Any, b: int) -> Any: ... def irshift(__a: Any, __b: Any) -> Any: ... def __irshift__(a: Any, b: Any) -> Any: ... - def isub(__a: Any, __b: Any) -> Any: ... def __isub__(a: Any, b: Any) -> Any: ... - def itruediv(__a: Any, __b: Any) -> Any: ... def __itruediv__(a: Any, b: Any) -> Any: ... - def ixor(__a: Any, __b: Any) -> Any: ... def __ixor__(a: Any, b: Any) -> Any: ... - -if sys.version_info < (3, ): +if sys.version_info < (3,): def isCallable(x: Any) -> bool: ... def isMappingType(x: Any) -> bool: ... def isNumberType(x: Any) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/parser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/parser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/parser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/parser.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ -from typing import Any, List, Sequence, Text, Tuple -from types import CodeType from _typeshed import AnyPath +from types import CodeType +from typing import Any, List, Sequence, Text, Tuple def expr(source: Text) -> STType: ... def suite(source: Text) -> STType: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pdb.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pdb.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pdb.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pdb.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,26 +1,25 @@ +import signal +import sys from bdb import Bdb from cmd import Cmd from inspect import _SourceObjectType -import signal -import sys from types import CodeType, FrameType, TracebackType -from typing import Any, Callable, ClassVar, Dict, IO, Iterable, List, Mapping, Optional, Sequence, Tuple, TypeVar, Union +from typing import IO, Any, Callable, ClassVar, Dict, Iterable, List, Mapping, Optional, Sequence, Tuple, TypeVar, Union -_T = TypeVar('_T') +_T = TypeVar("_T") line_prefix: str # undocumented class Restart(Exception): ... -def run(statement: str, globals: Optional[Dict[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ...) -> None: ... -def runeval(expression: str, globals: Optional[Dict[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ...) -> Any: ... +def run(statement: str, globals: Optional[Dict[str, Any]] = ..., locals: Optional[Mapping[str, Any]] = ...) -> None: ... +def runeval(expression: str, globals: Optional[Dict[str, Any]] = ..., locals: Optional[Mapping[str, Any]] = ...) -> Any: ... def runctx(statement: str, globals: Dict[str, Any], locals: Mapping[str, Any]) -> None: ... def runcall(func: Callable[..., _T], *args: Any, **kwds: Any) -> Optional[_T]: ... if sys.version_info >= (3, 7): def set_trace(*, header: Optional[str] = ...) -> None: ... + else: def set_trace() -> None: ... @@ -234,7 +233,6 @@ if sys.version_info >= (3, 7): def _runmodule(self, module_name: str) -> None: ... - if sys.version_info >= (3,) and sys.version_info < (3, 4): do_print = do_p diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pickle.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pickle.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pickle.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pickle.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,49 +1,49 @@ import sys -from typing import Any, IO, Mapping, Union, Tuple, Callable, Optional, Iterable, Iterator +from typing import IO, Any, Callable, Iterable, Iterator, Mapping, Optional, Tuple, Type, Union HIGHEST_PROTOCOL: int if sys.version_info >= (3, 0): DEFAULT_PROTOCOL: int +bytes_types: Tuple[Type[Any], ...] # undocumented if sys.version_info >= (3, 8): # TODO: holistic design for buffer interface (typing.Buffer?) - class PickleBuffer: # buffer must be a buffer-providing object def __init__(self, buffer: Any) -> None: ... def raw(self) -> memoryview: ... def release(self) -> None: ... - _BufferCallback = Optional[Callable[[PickleBuffer], Any]] - def dump( - obj: Any, file: IO[bytes], protocol: Optional[int] = ..., *, + obj: Any, + file: IO[bytes], + protocol: Optional[int] = ..., + *, fix_imports: bool = ..., - buffer_callback: _BufferCallback = ... + buffer_callback: _BufferCallback = ..., ) -> None: ... def dumps( - obj: Any, protocol: Optional[int] = ..., *, - fix_imports: bool = ..., - buffer_callback: _BufferCallback = ... + obj: Any, protocol: Optional[int] = ..., *, fix_imports: bool = ..., buffer_callback: _BufferCallback = ... ) -> bytes: ... def load( - file: IO[bytes], *, fix_imports: bool = ..., encoding: str = ..., - errors: str = ..., buffers: Optional[Iterable[Any]] = ... + file: IO[bytes], + *, + fix_imports: bool = ..., + encoding: str = ..., + errors: str = ..., + buffers: Optional[Iterable[Any]] = ..., ) -> Any: ... def loads( - data: bytes, *, fix_imports: bool = ..., encoding: str = ..., - errors: str = ..., buffers: Optional[Iterable[Any]] = ... + __data: bytes, *, fix_imports: bool = ..., encoding: str = ..., errors: str = ..., buffers: Optional[Iterable[Any]] = ... ) -> Any: ... + elif sys.version_info >= (3, 0): - def dump(obj: Any, file: IO[bytes], protocol: Optional[int] = ..., *, - fix_imports: bool = ...) -> None: ... - def dumps(obj: Any, protocol: Optional[int] = ..., *, - fix_imports: bool = ...) -> bytes: ... - def load(file: IO[bytes], *, fix_imports: bool = ..., encoding: str = ..., - errors: str = ...) -> Any: ... - def loads(data: bytes, *, fix_imports: bool = ..., - encoding: str = ..., errors: str = ...) -> Any: ... + def dump(obj: Any, file: IO[bytes], protocol: Optional[int] = ..., *, fix_imports: bool = ...) -> None: ... + def dumps(obj: Any, protocol: Optional[int] = ..., *, fix_imports: bool = ...) -> bytes: ... + def load(file: IO[bytes], *, fix_imports: bool = ..., encoding: str = ..., errors: str = ...) -> Any: ... + def loads(data: bytes, *, fix_imports: bool = ..., encoding: str = ..., errors: str = ...) -> Any: ... + else: def dump(obj: Any, file: IO[bytes], protocol: Optional[int] = ...) -> None: ... def dumps(obj: Any, protocol: Optional[int] = ...) -> bytes: ... @@ -54,14 +54,13 @@ class PicklingError(PickleError): ... class UnpicklingError(PickleError): ... -_reducedtype = Union[str, - Tuple[Callable[..., Any], Tuple[Any, ...]], - Tuple[Callable[..., Any], Tuple[Any, ...], Any], - Tuple[Callable[..., Any], Tuple[Any, ...], Any, - Optional[Iterator]], - Tuple[Callable[..., Any], Tuple[Any, ...], Any, - Optional[Iterator], Optional[Iterator]]] - +_reducedtype = Union[ + str, + Tuple[Callable[..., Any], Tuple[Any, ...]], + Tuple[Callable[..., Any], Tuple[Any, ...], Any], + Tuple[Callable[..., Any], Tuple[Any, ...], Any, Optional[Iterator[Any]]], + Tuple[Callable[..., Any], Tuple[Any, ...], Any, Optional[Iterator[Any]], Optional[Iterator[Any]]], +] class Pickler: fast: bool @@ -69,33 +68,40 @@ dispatch_table: Mapping[type, Callable[[Any], _reducedtype]] if sys.version_info >= (3, 8): - def __init__(self, file: IO[bytes], protocol: Optional[int] = ..., *, - fix_imports: bool = ..., buffer_callback: _BufferCallback = ... - ) -> None: ... + def __init__( + self, + file: IO[bytes], + protocol: Optional[int] = ..., + *, + fix_imports: bool = ..., + buffer_callback: _BufferCallback = ..., + ) -> None: ... def reducer_override(self, obj: Any) -> Any: ... elif sys.version_info >= (3, 0): - def __init__(self, file: IO[bytes], protocol: Optional[int] = ..., *, - fix_imports: bool = ...) -> None: ... + def __init__(self, file: IO[bytes], protocol: Optional[int] = ..., *, fix_imports: bool = ...) -> None: ... else: def __init__(self, file: IO[bytes], protocol: Optional[int] = ...) -> None: ... - - def dump(self, obj: Any) -> None: ... + def dump(self, __obj: Any) -> None: ... def clear_memo(self) -> None: ... def persistent_id(self, obj: Any) -> Any: ... class Unpickler: if sys.version_info >= (3, 8): - def __init__(self, file: IO[bytes], *, fix_imports: bool = ..., - encoding: str = ..., errors: str = ..., - buffers: Optional[Iterable[Any]] = ...) -> None: ... + def __init__( + self, + file: IO[bytes], + *, + fix_imports: bool = ..., + encoding: str = ..., + errors: str = ..., + buffers: Optional[Iterable[Any]] = ..., + ) -> None: ... elif sys.version_info >= (3, 0): - def __init__(self, file: IO[bytes], *, fix_imports: bool = ..., - encoding: str = ..., errors: str = ...) -> None: ... + def __init__(self, file: IO[bytes], *, fix_imports: bool = ..., encoding: str = ..., errors: str = ...) -> None: ... else: def __init__(self, file: IO[bytes]) -> None: ... - def load(self) -> Any: ... - def find_class(self, module: str, name: str) -> Any: ... + def find_class(self, __module_name: str, __global_name: str) -> Any: ... if sys.version_info >= (3, 0): def persistent_load(self, pid: Any) -> Any: ... @@ -175,3 +181,6 @@ STACK_GLOBAL: bytes MEMOIZE: bytes FRAME: bytes + +def encode_long(x: int) -> bytes: ... # undocumented +def decode_long(data: bytes) -> int: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pkgutil.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pkgutil.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pkgutil.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pkgutil.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,38 @@ +import sys +from _typeshed import SupportsRead +from typing import IO, Any, Callable, Iterable, Iterator, NamedTuple, Optional, Tuple, Union + +if sys.version_info >= (3,): + from importlib.abc import Loader, MetaPathFinder, PathEntryFinder +else: + Loader = Any + MetaPathFinder = Any + PathEntryFinder = Any + +if sys.version_info >= (3, 6): + class ModuleInfo(NamedTuple): + module_finder: Union[MetaPathFinder, PathEntryFinder] + name: str + ispkg: bool + _ModuleInfoLike = ModuleInfo +else: + _ModuleInfoLike = Tuple[Union[MetaPathFinder, PathEntryFinder], str, bool] + +def extend_path(path: Iterable[str], name: str) -> Iterable[str]: ... + +class ImpImporter: + def __init__(self, dirname: Optional[str] = ...) -> None: ... + +class ImpLoader: + def __init__(self, fullname: str, file: IO[str], filename: str, etc: Tuple[str, str, int]) -> None: ... + +def find_loader(fullname: str) -> Optional[Loader]: ... +def get_importer(path_item: str) -> Optional[PathEntryFinder]: ... +def get_loader(module_or_name: str) -> Loader: ... +def iter_importers(fullname: str = ...) -> Iterator[Union[MetaPathFinder, PathEntryFinder]]: ... +def iter_modules(path: Optional[Iterable[str]] = ..., prefix: str = ...) -> Iterator[_ModuleInfoLike]: ... +def read_code(stream: SupportsRead[bytes]) -> Any: ... # undocumented +def walk_packages( + path: Optional[Iterable[str]] = ..., prefix: str = ..., onerror: Optional[Callable[[str], None]] = ... +) -> Iterator[_ModuleInfoLike]: ... +def get_data(package: str, resource: str) -> Optional[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/plistlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/plistlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/plistlib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/plistlib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,64 +1,52 @@ -from typing import ( - Any, IO, Mapping, MutableMapping, Optional, overload, Union, - Type, TypeVar, Text -) -from typing import Dict as DictT import sys +from typing import IO, Any, Dict as DictT, Mapping, MutableMapping, Optional, Text, Type, TypeVar, Union, overload + if sys.version_info >= (3,): from enum import Enum - class PlistFormat(Enum): FMT_XML: int FMT_BINARY: int FMT_XML = PlistFormat.FMT_XML FMT_BINARY = PlistFormat.FMT_BINARY -mm = MutableMapping[str, Any] -_D = TypeVar('_D', bound=mm) _Path = Union[str, Text] if sys.version_info >= (3, 9): - @overload - def load(fp: IO[bytes], *, fmt: Optional[PlistFormat] = ...) -> DictT[str, Any]: ... - @overload - def load(fp: IO[bytes], *, fmt: Optional[PlistFormat] = ..., dict_type: Type[_D]) -> _D: ... - @overload - def loads(value: bytes, *, fmt: Optional[PlistFormat] = ...) -> DictT[str, Any]: ... - @overload - def loads(value: bytes, *, fmt: Optional[PlistFormat] = ..., dict_type: Type[_D]) -> _D: ... + def load(fp: IO[bytes], *, fmt: Optional[PlistFormat] = ..., dict_type: Type[MutableMapping[str, Any]] = ...) -> Any: ... + def loads(value: bytes, *, fmt: Optional[PlistFormat] = ..., dict_type: Type[MutableMapping[str, Any]] = ...) -> Any: ... + elif sys.version_info >= (3, 4): - @overload - def load(fp: IO[bytes], *, fmt: Optional[PlistFormat] = ..., - use_builtin_types: bool = ...) -> DictT[str, Any]: ... - @overload - def load(fp: IO[bytes], *, fmt: Optional[PlistFormat] = ..., - use_builtin_types: bool = ..., dict_type: Type[_D]) -> _D: ... - @overload - def loads(value: bytes, *, fmt: Optional[PlistFormat] = ..., - use_builtin_types: bool = ...) -> DictT[str, Any]: ... - @overload - def loads(value: bytes, *, fmt: Optional[PlistFormat] = ..., - use_builtin_types: bool = ..., dict_type: Type[_D]) -> _D: ... + def load( + fp: IO[bytes], + *, + fmt: Optional[PlistFormat] = ..., + use_builtin_types: bool = ..., + dict_type: Type[MutableMapping[str, Any]] = ..., + ) -> Any: ... + def loads( + value: bytes, + *, + fmt: Optional[PlistFormat] = ..., + use_builtin_types: bool = ..., + dict_type: Type[MutableMapping[str, Any]] = ..., + ) -> Any: ... if sys.version_info >= (3, 4): - def dump(value: Mapping[str, Any], fp: IO[bytes], *, - fmt: PlistFormat = ..., sort_keys: bool = ..., - skipkeys: bool = ...) -> None: ... - def dumps(value: Mapping[str, Any], *, fmt: PlistFormat = ..., - skipkeys: bool = ..., sort_keys: bool = ...) -> bytes: ... + def dump( + value: Mapping[str, Any], fp: IO[bytes], *, fmt: PlistFormat = ..., sort_keys: bool = ..., skipkeys: bool = ... + ) -> None: ... + def dumps(value: Mapping[str, Any], *, fmt: PlistFormat = ..., skipkeys: bool = ..., sort_keys: bool = ...) -> bytes: ... if sys.version_info < (3, 9): - def readPlist(pathOrFile: Union[_Path, IO[bytes]]) -> DictT[str, Any]: ... + def readPlist(pathOrFile: Union[_Path, IO[bytes]]) -> Any: ... def writePlist(value: Mapping[str, Any], pathOrFile: Union[_Path, IO[bytes]]) -> None: ... - def readPlistFromBytes(data: bytes) -> DictT[str, Any]: ... + def readPlistFromBytes(data: bytes) -> Any: ... def writePlistToBytes(value: Mapping[str, Any]) -> bytes: ... + if sys.version_info < (3,): - def readPlistFromResource(path: _Path, restype: str = ..., - resid: int = ...) -> DictT[str, Any]: ... - def writePlistToResource(rootObject: Mapping[str, Any], path: _Path, - restype: str = ..., - resid: int = ...) -> None: ... - def readPlistFromString(data: str) -> DictT[str, Any]: ... + def readPlistFromResource(path: _Path, restype: str = ..., resid: int = ...) -> Any: ... + def writePlistToResource(rootObject: Mapping[str, Any], path: _Path, restype: str = ..., resid: int = ...) -> None: ... + def readPlistFromString(data: str) -> Any: ... def writePlistToString(rootObject: Mapping[str, Any]) -> str: ... if sys.version_info < (3, 7): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/posixpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/posixpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/posixpath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/posixpath.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -# NB: path.pyi and stdlib/2 and stdlib/3 must remain consistent! -import os -import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Text, Callable, Optional -from genericpath import exists as exists -from _typeshed import StrPath, BytesPath, AnyPath - -_T = TypeVar('_T') - -if sys.version_info >= (3, 6): - from builtins import _PathLike - -# ----- os.path variables ----- -supports_unicode_filenames: bool -# aliases (also in os) -curdir: str -pardir: str -sep: str -if sys.platform == 'win32': - altsep: str -else: - altsep: Optional[str] -extsep: str -pathsep: str -defpath: str -devnull: str - -# ----- os.path function stubs ----- -if sys.version_info >= (3, 6): - # Overloads are necessary to work around python/mypy#3644. - @overload - def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def abspath(path: AnyStr) -> AnyStr: ... - @overload - def basename(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def basename(p: AnyStr) -> AnyStr: ... - @overload - def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def dirname(p: AnyStr) -> AnyStr: ... - @overload - def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expanduser(path: AnyStr) -> AnyStr: ... - @overload - def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def expandvars(path: AnyStr) -> AnyStr: ... - @overload - def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normcase(s: AnyStr) -> AnyStr: ... - @overload - def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - @overload - def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(path: AnyStr) -> AnyStr: ... - else: - @overload - def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... - @overload - def realpath(filename: AnyStr) -> AnyStr: ... - -else: - def abspath(path: AnyStr) -> AnyStr: ... - def basename(p: AnyStr) -> AnyStr: ... - def dirname(p: AnyStr) -> AnyStr: ... - def expanduser(path: AnyStr) -> AnyStr: ... - def expandvars(path: AnyStr) -> AnyStr: ... - def normcase(s: AnyStr) -> AnyStr: ... - def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': - def realpath(path: AnyStr) -> AnyStr: ... - else: - def realpath(filename: AnyStr) -> AnyStr: ... - -if sys.version_info >= (3, 6): - # In reality it returns str for sequences of StrPath and bytes for sequences - # of BytesPath, but mypy does not accept such a signature. - def commonpath(paths: Sequence[AnyPath]) -> Any: ... -elif sys.version_info >= (3, 5): - def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... - -# NOTE: Empty lists results in '' (str) regardless of contained type. -# Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes -# So, fall back to Any -def commonprefix(m: Sequence[AnyPath]) -> Any: ... - -def lexists(path: AnyPath) -> bool: ... - -# These return float if os.stat_float_times() == True, -# but int is a subclass of float. -def getatime(filename: AnyPath) -> float: ... -def getmtime(filename: AnyPath) -> float: ... -def getctime(filename: AnyPath) -> float: ... - -def getsize(filename: AnyPath) -> int: ... -def isabs(s: AnyPath) -> bool: ... -def isfile(path: AnyPath) -> bool: ... -def isdir(s: AnyPath) -> bool: ... -def islink(path: AnyPath) -> bool: ... -def ismount(path: AnyPath) -> bool: ... - -if sys.version_info < (3, 0): - # Make sure signatures are disjunct, and allow combinations of bytes and unicode. - # (Since Python 2 allows that, too) - # Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in - # a type error. - @overload - def join(__p1: bytes, *p: bytes) -> bytes: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: Text, *p: AnyPath) -> Text: ... -elif sys.version_info >= (3, 6): - @overload - def join(a: StrPath, *paths: StrPath) -> Text: ... - @overload - def join(a: BytesPath, *paths: BytesPath) -> bytes: ... -else: - def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... - -@overload -def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... -@overload -def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... - -def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... -def sameopenfile(fp1: int, fp2: int) -> bool: ... -def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... - -if sys.version_info >= (3, 6): - @overload - def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... - @overload - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -else: - def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... - -if sys.version_info < (3, 7) and sys.platform == 'win32': - def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated - -if sys.version_info < (3,): - def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pprint.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pprint.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pprint.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pprint.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,22 +1,24 @@ -# Stubs for pprint - -# Based on http://docs.python.org/2/library/pprint.html -# Based on http://docs.python.org/3/library/pprint.html - import sys -from typing import Any, Dict, Tuple, IO, Optional +from typing import IO, Any, Dict, Optional, Tuple if sys.version_info >= (3, 8): def pformat( - object: object, indent: int = ..., width: int = ..., depth: Optional[int] = ..., *, compact: bool = ..., sort_dicts: bool = ... + object: object, + indent: int = ..., + width: int = ..., + depth: Optional[int] = ..., + *, + compact: bool = ..., + sort_dicts: bool = ..., ) -> str: ... elif sys.version_info >= (3, 4): - def pformat(object: object, indent: int = ..., width: int = ..., - depth: Optional[int] = ..., *, compact: bool = ...) -> str: ... + def pformat( + object: object, indent: int = ..., width: int = ..., depth: Optional[int] = ..., *, compact: bool = ... + ) -> str: ... + else: - def pformat(object: object, indent: int = ..., width: int = ..., - depth: Optional[int] = ...) -> str: ... + def pformat(object: object, indent: int = ..., width: int = ..., depth: Optional[int] = ...) -> str: ... if sys.version_info >= (3, 8): def pp( @@ -43,11 +45,20 @@ ) -> None: ... elif sys.version_info >= (3, 4): - def pprint(object: object, stream: Optional[IO[str]] = ..., indent: int = ..., width: int = ..., - depth: Optional[int] = ..., *, compact: bool = ...) -> None: ... + def pprint( + object: object, + stream: Optional[IO[str]] = ..., + indent: int = ..., + width: int = ..., + depth: Optional[int] = ..., + *, + compact: bool = ..., + ) -> None: ... + else: - def pprint(object: object, stream: Optional[IO[str]] = ..., indent: int = ..., width: int = ..., - depth: Optional[int] = ...) -> None: ... + def pprint( + object: object, stream: Optional[IO[str]] = ..., indent: int = ..., width: int = ..., depth: Optional[int] = ... + ) -> None: ... def isreadable(object: object) -> bool: ... def isrecursive(object: object) -> bool: ... @@ -66,15 +77,21 @@ sort_dicts: bool = ..., ) -> None: ... elif sys.version_info >= (3, 4): - def __init__(self, indent: int = ..., width: int = ..., depth: Optional[int] = ..., - stream: Optional[IO[str]] = ..., *, compact: bool = ...) -> None: ... + def __init__( + self, + indent: int = ..., + width: int = ..., + depth: Optional[int] = ..., + stream: Optional[IO[str]] = ..., + *, + compact: bool = ..., + ) -> None: ... else: - def __init__(self, indent: int = ..., width: int = ..., depth: Optional[int] = ..., - stream: Optional[IO[str]] = ...) -> None: ... - + def __init__( + self, indent: int = ..., width: int = ..., depth: Optional[int] = ..., stream: Optional[IO[str]] = ... + ) -> None: ... def pformat(self, object: object) -> str: ... def pprint(self, object: object) -> None: ... def isreadable(self, object: object) -> bool: ... def isrecursive(self, object: object) -> bool: ... - def format(self, object: object, context: Dict[int, Any], maxlevels: int, - level: int) -> Tuple[str, bool, bool]: ... + def format(self, object: object, context: Dict[int, Any], maxlevels: int, level: int) -> Tuple[str, bool, bool]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pstats.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pstats.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pstats.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pstats.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,33 @@ -from profile import Profile -from cProfile import Profile as _cProfile +import sys from _typeshed import AnyPath -from typing import Any, Dict, IO, Iterable, List, Optional, Text, Tuple, TypeVar, Union, overload +from cProfile import Profile as _cProfile +from profile import Profile +from typing import IO, Any, Dict, Iterable, List, Optional, Text, Tuple, TypeVar, Union, overload _Selector = Union[str, float, int] -_T = TypeVar('_T', bound=Stats) +_T = TypeVar("_T", bound=Stats) + +if sys.version_info >= (3, 7): + from enum import Enum + class SortKey(str, Enum): + CALLS: str + CUMULATIVE: str + FILENAME: str + LINE: str + NAME: str + NFL: str + PCALLS: str + STDNAME: str + TIME: str class Stats: sort_arg_dict_default: Dict[str, Tuple[Any, str]] - def __init__(self: _T, __arg: Union[None, str, Text, Profile, _cProfile] = ..., - *args: Union[None, str, Text, Profile, _cProfile, _T], - stream: Optional[IO[Any]] = ...) -> None: ... + def __init__( + self: _T, + __arg: Union[None, str, Text, Profile, _cProfile] = ..., + *args: Union[None, str, Text, Profile, _cProfile, _T], + stream: Optional[IO[Any]] = ..., + ) -> None: ... def init(self, arg: Union[None, str, Text, Profile, _cProfile]) -> None: ... def load_stats(self, arg: Union[None, str, Text, Profile, _cProfile]) -> None: ... def get_top_level_stats(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/py_compile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/py_compile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/py_compile.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/py_compile.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,6 @@ -# Stubs for py_compile (Python 2 and 3) import enum import sys - -from typing import Optional, List, Text, AnyStr, Union, Type +from typing import AnyStr, List, Optional, Text, Type, Union _EitherStr = Union[bytes, Text] @@ -21,12 +19,34 @@ def _get_default_invalidation_mode() -> PycInvalidationMode: ... if sys.version_info >= (3, 8): - def compile(file: AnyStr, cfile: Optional[AnyStr] = ..., dfile: Optional[AnyStr] = ..., doraise: bool = ..., optimize: int = ..., invalidation_mode: Optional[PycInvalidationMode] = ..., quiet: int = ...) -> Optional[AnyStr]: ... + def compile( + file: AnyStr, + cfile: Optional[AnyStr] = ..., + dfile: Optional[AnyStr] = ..., + doraise: bool = ..., + optimize: int = ..., + invalidation_mode: Optional[PycInvalidationMode] = ..., + quiet: int = ..., + ) -> Optional[AnyStr]: ... + elif sys.version_info >= (3, 7): - def compile(file: AnyStr, cfile: Optional[AnyStr] = ..., dfile: Optional[AnyStr] = ..., doraise: bool = ..., optimize: int = ..., invalidation_mode: Optional[PycInvalidationMode] = ...) -> Optional[AnyStr]: ... + def compile( + file: AnyStr, + cfile: Optional[AnyStr] = ..., + dfile: Optional[AnyStr] = ..., + doraise: bool = ..., + optimize: int = ..., + invalidation_mode: Optional[PycInvalidationMode] = ..., + ) -> Optional[AnyStr]: ... + elif sys.version_info >= (3, 2): - def compile(file: AnyStr, cfile: Optional[AnyStr] = ..., dfile: Optional[AnyStr] = ..., doraise: bool = ..., optimize: int = ...) -> Optional[AnyStr]: ... + def compile( + file: AnyStr, cfile: Optional[AnyStr] = ..., dfile: Optional[AnyStr] = ..., doraise: bool = ..., optimize: int = ... + ) -> Optional[AnyStr]: ... + else: - def compile(file: _EitherStr, cfile: Optional[_EitherStr] = ..., dfile: Optional[_EitherStr] = ..., doraise: bool = ...) -> None: ... + def compile( + file: _EitherStr, cfile: Optional[_EitherStr] = ..., dfile: Optional[_EitherStr] = ..., doraise: bool = ... + ) -> None: ... def main(args: Optional[List[Text]] = ...) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc_data/topics.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc_data/topics.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc_data/topics.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc_data/topics.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,3 @@ +from typing import Dict + +topics: Dict[str, str] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pydoc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,24 @@ import sys -from typing import Any, AnyStr, Callable, Container, Dict, IO, List, Mapping, MutableMapping, NoReturn, Optional, Text, Tuple, Type, Union -from types import FunctionType, MethodType, ModuleType, TracebackType from _typeshed import SupportsWrite +from types import MethodType, ModuleType, TracebackType +from typing import ( + IO, + Any, + AnyStr, + Callable, + Container, + Dict, + List, + Mapping, + MutableMapping, + NoReturn, + Optional, + Text, + Tuple, + Type, + Union, +) + if sys.version_info >= (3,): from reprlib import Repr else: @@ -26,7 +43,6 @@ def allmethods(cl: type) -> MutableMapping[str, MethodType]: ... def visiblename(name: str, all: Optional[Container[str]] = ..., obj: Optional[object] = ...) -> bool: ... def classify_class_attrs(object: object) -> List[Tuple[str, str, type, str]]: ... - def ispackage(path: str) -> bool: ... def source_synopsis(file: IO[AnyStr]) -> Optional[AnyStr]: ... def synopsis(filename: str, cache: MutableMapping[str, Tuple[int, str]] = ...) -> Optional[str]: ... @@ -73,8 +89,18 @@ escape: Callable[[str], str] def page(self, title: str, contents: str) -> str: ... def heading(self, title: str, fgcol: str, bgcol: str, extras: str = ...) -> str: ... - def section(self, title: str, fgcol: str, bgcol: str, contents: str, width: int = ..., prelude: str = ..., marginalia: Optional[str] = ..., gap: str = ...) -> str: ... - def bigsection(self, title: str, *args) -> str: ... + def section( + self, + title: str, + fgcol: str, + bgcol: str, + contents: str, + width: int = ..., + prelude: str = ..., + marginalia: Optional[str] = ..., + gap: str = ..., + ) -> str: ... + def bigsection(self, title: str, *args: Any) -> str: ... def preformat(self, text: str) -> str: ... def multicolumn(self, list: List[Any], format: Callable[[Any], str], cols: int = ...) -> str: ... def grey(self, text: str) -> str: ... @@ -82,15 +108,46 @@ def classlink(self, object: object, modname: str) -> str: ... def modulelink(self, object: object) -> str: ... def modpkglink(self, modpkginfo: Tuple[str, str, bool, bool]) -> str: ... - def markup(self, text: str, escape: Optional[Callable[[str], str]] = ..., funcs: Mapping[str, str] = ..., classes: Mapping[str, str] = ..., methods: Mapping[str, str] = ...) -> str: ... - def formattree(self, tree: List[Union[Tuple[type, Tuple[type, ...]], List[Any]]], modname: str, parent: Optional[type] = ...) -> str: ... - def docmodule(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., *ignored) -> str: ... - def docclass(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., funcs: Mapping[str, str] = ..., classes: Mapping[str, str] = ..., *ignored) -> str: ... + def markup( + self, + text: str, + escape: Optional[Callable[[str], str]] = ..., + funcs: Mapping[str, str] = ..., + classes: Mapping[str, str] = ..., + methods: Mapping[str, str] = ..., + ) -> str: ... + def formattree( + self, tree: List[Union[Tuple[type, Tuple[type, ...]], List[Any]]], modname: str, parent: Optional[type] = ... + ) -> str: ... + def docmodule(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., *ignored: Any) -> str: ... + def docclass( + self, + object: object, + name: Optional[str] = ..., + mod: Optional[str] = ..., + funcs: Mapping[str, str] = ..., + classes: Mapping[str, str] = ..., + *ignored: Any, + ) -> str: ... def formatvalue(self, object: object) -> str: ... - def docroutine(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., funcs: Mapping[str, str] = ..., classes: Mapping[str, str] = ..., methods: Mapping[str, str] = ..., cl: Optional[type] = ..., *ignored) -> str: ... - def docproperty(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored) -> str: ... - def docother(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., *ignored) -> str: ... - def docdata(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., cl: Optional[Any] = ..., *ignored) -> str: ... + def docroutine( + self, + object: object, + name: Optional[str] = ..., + mod: Optional[str] = ..., + funcs: Mapping[str, str] = ..., + classes: Mapping[str, str] = ..., + methods: Mapping[str, str] = ..., + cl: Optional[type] = ..., + *ignored: Any, + ) -> str: ... + def docproperty( + self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored: Any + ) -> str: ... + def docother(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., *ignored: Any) -> str: ... + def docdata( + self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., cl: Optional[Any] = ..., *ignored: Any + ) -> str: ... def index(self, dir: str, shadowed: Optional[MutableMapping[str, bool]] = ...) -> str: ... def filelink(self, url: str, path: str) -> str: ... @@ -111,14 +168,35 @@ def bold(self, text: str) -> str: ... def indent(self, text: str, prefix: str = ...) -> str: ... def section(self, title: str, contents: str) -> str: ... - def formattree(self, tree: List[Union[Tuple[type, Tuple[type, ...]], List[Any]]], modname: str, parent: Optional[type] = ..., prefix: str = ...) -> str: ... - def docmodule(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., *ignored) -> str: ... - def docclass(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., *ignored) -> str: ... + def formattree( + self, + tree: List[Union[Tuple[type, Tuple[type, ...]], List[Any]]], + modname: str, + parent: Optional[type] = ..., + prefix: str = ..., + ) -> str: ... + def docmodule(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., *ignored: Any) -> str: ... + def docclass(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., *ignored: Any) -> str: ... def formatvalue(self, object: object) -> str: ... - def docroutine(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored) -> str: ... - def docproperty(self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., cl: Optional[Any] = ..., *ignored) -> str: ... - def docdata(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored) -> str: ... - def docother(self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., parent: Optional[str] = ..., maxlen: Optional[int] = ..., doc: Optional[Any] = ..., *ignored) -> str: ... + def docroutine( + self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored: Any + ) -> str: ... + def docproperty( + self, object: object, name: Optional[str] = ..., mod: Optional[Any] = ..., cl: Optional[Any] = ..., *ignored: Any + ) -> str: ... + def docdata( + self, object: object, name: Optional[str] = ..., mod: Optional[str] = ..., cl: Optional[Any] = ..., *ignored: Any + ) -> str: ... + def docother( + self, + object: object, + name: Optional[str] = ..., + mod: Optional[str] = ..., + parent: Optional[str] = ..., + maxlen: Optional[int] = ..., + doc: Optional[Any] = ..., + *ignored: Any, + ) -> str: ... def pager(text: str) -> None: ... def getpager() -> Callable[[str], None]: ... @@ -137,7 +215,9 @@ def resolve(thing: Union[str, object], forceload: bool = ...) -> Optional[Tuple[object, str]]: ... def render_doc(thing: Union[str, object], title: str = ..., forceload: bool = ..., renderer: Optional[Doc] = ...) -> str: ... -def doc(thing: Union[str, object], title: str = ..., forceload: bool = ..., output: Optional[SupportsWrite[str]] = ...) -> None: ... +def doc( + thing: Union[str, object], title: str = ..., forceload: bool = ..., output: Optional[SupportsWrite[str]] = ... +) -> None: ... def writedoc(thing: Union[str, object], forceload: bool = ...) -> None: ... def writedocs(dir: str, pkgpath: str = ..., done: Optional[Any] = ...) -> None: ... @@ -174,12 +254,20 @@ class ModuleScanner: quit: bool - def run(self, callback: Callable[[Optional[str], str, str], None], key: Optional[Any] = ..., completer: Optional[Callable[[], None]] = ..., onerror: Optional[Callable[[str], None]] = ...) -> None: ... + def run( + self, + callback: Callable[[Optional[str], str, str], None], + key: Optional[Any] = ..., + completer: Optional[Callable[[], None]] = ..., + onerror: Optional[Callable[[str], None]] = ..., + ) -> None: ... def apropos(key: str) -> None: ... def ispath(x: Any) -> bool: ... def cli() -> None: ... if sys.version_info < (3,): - def serve(port: int, callback: Optional[Callable[[Any], None]] = ..., completer: Optional[Callable[[], None]] = ...) -> None: ... + def serve( + port: int, callback: Optional[Callable[[Any], None]] = ..., completer: Optional[Callable[[], None]] = ... + ) -> None: ... def gui() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pyexpat/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pyexpat/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/pyexpat/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/pyexpat/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ -from typing import List, Tuple, Optional, Callable, Any, Union, Dict, Text -from _typeshed import SupportsRead - import pyexpat.errors as errors import pyexpat.model as model +from _typeshed import SupportsRead +from typing import Any, Callable, Dict, List, Optional, Text, Tuple, Union EXPAT_VERSION: str # undocumented version_info: Tuple[int, int, int] # undocumented @@ -49,10 +48,13 @@ EndDoctypeDeclHandler: Optional[Callable[[], Any]] ElementDeclHandler: Optional[Callable[[str, _Model], Any]] AttlistDeclHandler: Optional[Callable[[str, str, str, Optional[str], bool], Any]] - StartElementHandler: Optional[Union[ - Callable[[str, Dict[str, str]], Any], - Callable[[str, List[str]], Any], - Callable[[str, Union[Dict[str, str]], List[str]], Any]]] + StartElementHandler: Optional[ + Union[ + Callable[[str, Dict[str, str]], Any], + Callable[[str, List[str]], Any], + Callable[[str, Union[Dict[str, str]], List[str]], Any], + ] + ] EndElementHandler: Optional[Callable[[str], Any]] ProcessingInstructionHandler: Optional[Callable[[str, str], Any]] CharacterDataHandler: Optional[Callable[[str], Any]] @@ -70,5 +72,8 @@ ExternalEntityRefHandler: Optional[Callable[[str, Optional[str], Optional[str], Optional[str]], int]] def ErrorString(__code: int) -> str: ... + # intern is undocumented -def ParserCreate(encoding: Optional[Text] = ..., namespace_separator: Optional[Text] = ..., intern: Optional[Dict[str, Any]] = ...) -> XMLParserType: ... +def ParserCreate( + encoding: Optional[Text] = ..., namespace_separator: Optional[Text] = ..., intern: Optional[Dict[str, Any]] = ... +) -> XMLParserType: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_random.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_random.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_random.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_random.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for _random - import sys from typing import Tuple diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/select.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/select.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/select.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/select.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,7 @@ import sys -from typing import Any, Iterable, List, Optional, Tuple, Type -from types import TracebackType from _typeshed import FileDescriptorLike - +from types import TracebackType +from typing import Any, Iterable, List, Optional, Tuple, Type if sys.platform != "win32": PIPE_BUF: int @@ -25,8 +24,9 @@ def unregister(self, fd: FileDescriptorLike) -> None: ... def poll(self, timeout: Optional[float] = ...) -> List[Tuple[int, int]]: ... -def select(__rlist: Iterable[Any], __wlist: Iterable[Any], __xlist: Iterable[Any], - __timeout: Optional[float] = ...) -> Tuple[List[Any], List[Any], List[Any]]: ... +def select( + __rlist: Iterable[Any], __wlist: Iterable[Any], __xlist: Iterable[Any], __timeout: Optional[float] = ... +) -> Tuple[List[Any], List[Any], List[Any]]: ... if sys.version_info >= (3, 3): error = OSError @@ -42,18 +42,26 @@ flags: int ident: int udata: Any - def __init__(self, ident: FileDescriptorLike, filter: int = ..., flags: int = ..., fflags: int = ..., data: Any = ..., udata: Any = ...) -> None: ... - + def __init__( + self, + ident: FileDescriptorLike, + filter: int = ..., + flags: int = ..., + fflags: int = ..., + data: Any = ..., + udata: Any = ..., + ) -> None: ... # BSD only class kqueue(object): closed: bool def __init__(self) -> None: ... def close(self) -> None: ... - def control(self, __changelist: Optional[Iterable[kevent]], __maxevents: int, __timeout: Optional[float] = ...) -> List[kevent]: ... + def control( + self, __changelist: Optional[Iterable[kevent]], __maxevents: int, __timeout: Optional[float] = ... + ) -> List[kevent]: ... def fileno(self) -> int: ... @classmethod def fromfd(cls, __fd: FileDescriptorLike) -> kqueue: ... - KQ_EV_ADD: int KQ_EV_CLEAR: int KQ_EV_DELETE: int @@ -101,7 +109,12 @@ def __init__(self, sizehint: int = ...) -> None: ... if sys.version_info >= (3, 4): def __enter__(self) -> epoll: ... - def __exit__(self, exc_type: Optional[Type[BaseException]] = ..., exc_val: Optional[BaseException] = ..., exc_tb: Optional[TracebackType] = ...) -> None: ... + def __exit__( + self, + exc_type: Optional[Type[BaseException]] = ..., + exc_val: Optional[BaseException] = ..., + exc_tb: Optional[TracebackType] = ..., + ) -> None: ... def close(self) -> None: ... closed: bool def fileno(self) -> int: ... @@ -111,7 +124,6 @@ def poll(self, timeout: Optional[float] = ..., maxevents: int = ...) -> List[Tuple[int, int]]: ... @classmethod def fromfd(cls, __fd: FileDescriptorLike) -> epoll: ... - EPOLLERR: int EPOLLET: int EPOLLHUP: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/shutil.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/shutil.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/shutil.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/shutil.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,22 @@ import os import sys - +from _typeshed import StrPath, SupportsRead, SupportsWrite from typing import ( - List, Iterable, Callable, Any, Tuple, Sequence, NamedTuple, - AnyStr, Optional, Union, Set, TypeVar, overload, Type, Text + Any, + AnyStr, + Callable, + Iterable, + List, + NamedTuple, + Optional, + Sequence, + Set, + Tuple, + Type, + TypeVar, + Union, + overload, ) -from _typeshed import StrPath, SupportsRead, SupportsWrite if sys.version_info >= (3, 6): _AnyStr = str @@ -29,25 +40,21 @@ class ExecError(OSError): ... class ReadError(OSError): ... class RegistryError(Exception): ... + else: class Error(EnvironmentError): ... class SpecialFileError(EnvironmentError): ... class ExecError(EnvironmentError): ... -def copyfileobj(fsrc: SupportsRead[AnyStr], fdst: SupportsWrite[AnyStr], - length: int = ...) -> None: ... +def copyfileobj(fsrc: SupportsRead[AnyStr], fdst: SupportsWrite[AnyStr], length: int = ...) -> None: ... if sys.version_info >= (3,): - def copyfile(src: StrPath, dst: _AnyPath, *, - follow_symlinks: bool = ...) -> _AnyPath: ... - def copymode(src: StrPath, dst: StrPath, *, - follow_symlinks: bool = ...) -> None: ... - def copystat(src: StrPath, dst: StrPath, *, - follow_symlinks: bool = ...) -> None: ... - def copy(src: StrPath, dst: StrPath, *, - follow_symlinks: bool = ...) -> _PathReturn: ... - def copy2(src: StrPath, dst: StrPath, *, - follow_symlinks: bool = ...) -> _PathReturn: ... + def copyfile(src: StrPath, dst: _AnyPath, *, follow_symlinks: bool = ...) -> _AnyPath: ... + def copymode(src: StrPath, dst: StrPath, *, follow_symlinks: bool = ...) -> None: ... + def copystat(src: StrPath, dst: StrPath, *, follow_symlinks: bool = ...) -> None: ... + def copy(src: StrPath, dst: StrPath, *, follow_symlinks: bool = ...) -> _PathReturn: ... + def copy2(src: StrPath, dst: StrPath, *, follow_symlinks: bool = ...) -> _PathReturn: ... + else: def copyfile(src: StrPath, dst: StrPath) -> None: ... def copymode(src: StrPath, dst: StrPath) -> None: ... @@ -67,35 +74,44 @@ ignore_dangling_symlinks: bool = ..., dirs_exist_ok: bool = ..., ) -> _PathReturn: ... + elif sys.version_info >= (3,): - def copytree(src: StrPath, dst: StrPath, symlinks: bool = ..., - ignore: Union[None, - Callable[[str, List[str]], Iterable[str]], - Callable[[StrPath, List[str]], Iterable[str]]] = ..., - copy_function: Callable[[str, str], None] = ..., - ignore_dangling_symlinks: bool = ...) -> _PathReturn: ... -else: - def copytree(src: AnyStr, dst: AnyStr, symlinks: bool = ..., - ignore: Union[None, - Callable[[AnyStr, List[AnyStr]], - Iterable[AnyStr]]] = ...) -> _PathReturn: ... + def copytree( + src: StrPath, + dst: StrPath, + symlinks: bool = ..., + ignore: Union[None, Callable[[str, List[str]], Iterable[str]], Callable[[StrPath, List[str]], Iterable[str]]] = ..., + copy_function: Callable[[str, str], None] = ..., + ignore_dangling_symlinks: bool = ..., + ) -> _PathReturn: ... + +else: + def copytree( + src: AnyStr, + dst: AnyStr, + symlinks: bool = ..., + ignore: Union[None, Callable[[AnyStr, List[AnyStr]], Iterable[AnyStr]]] = ..., + ) -> _PathReturn: ... if sys.version_info >= (3,): - def rmtree(path: Union[bytes, StrPath], ignore_errors: bool = ..., - onerror: Optional[Callable[[Any, Any, Any], Any]] = ...) -> None: ... + def rmtree( + path: Union[bytes, StrPath], ignore_errors: bool = ..., onerror: Optional[Callable[[Any, Any, Any], Any]] = ... + ) -> None: ... + else: - def rmtree(path: _AnyPath, ignore_errors: bool = ..., - onerror: Optional[Callable[[Any, _AnyPath, Any], Any]] = ...) -> None: ... + def rmtree( + path: _AnyPath, ignore_errors: bool = ..., onerror: Optional[Callable[[Any, _AnyPath, Any], Any]] = ... + ) -> None: ... _CopyFn = Union[Callable[[str, str], None], Callable[[StrPath, StrPath], None]] if sys.version_info >= (3, 9): - def move(src: StrPath, dst: StrPath, - copy_function: _CopyFn = ...) -> _PathReturn: ... + def move(src: StrPath, dst: StrPath, copy_function: _CopyFn = ...) -> _PathReturn: ... + elif sys.version_info >= (3, 5): # See https://bugs.python.org/issue32689 - def move(src: str, dst: StrPath, - copy_function: _CopyFn = ...) -> _PathReturn: ... + def move(src: str, dst: StrPath, copy_function: _CopyFn = ...) -> _PathReturn: ... + else: def move(src: StrPath, dst: StrPath) -> _PathReturn: ... @@ -105,39 +121,46 @@ used: int free: int def disk_usage(path: StrPath) -> _ntuple_diskusage: ... - def chown(path: StrPath, user: Optional[str] = ..., - group: Optional[str] = ...) -> None: ... + def chown(path: StrPath, user: Optional[Union[str, int]] = ..., group: Optional[Union[str, int]] = ...) -> None: ... + if sys.version_info >= (3, 8): @overload def which(cmd: StrPath, mode: int = ..., path: Optional[StrPath] = ...) -> Optional[str]: ... @overload def which(cmd: bytes, mode: int = ..., path: Optional[StrPath] = ...) -> Optional[bytes]: ... + elif sys.version_info >= (3,): def which(cmd: StrPath, mode: int = ..., path: Optional[StrPath] = ...) -> Optional[str]: ... -def make_archive(base_name: _AnyStr, format: str, root_dir: Optional[StrPath] = ..., - base_dir: Optional[StrPath] = ..., verbose: bool = ..., - dry_run: bool = ..., owner: Optional[str] = ..., group: Optional[str] = ..., - logger: Optional[Any] = ...) -> _AnyStr: ... +def make_archive( + base_name: _AnyStr, + format: str, + root_dir: Optional[StrPath] = ..., + base_dir: Optional[StrPath] = ..., + verbose: bool = ..., + dry_run: bool = ..., + owner: Optional[str] = ..., + group: Optional[str] = ..., + logger: Optional[Any] = ..., +) -> _AnyStr: ... def get_archive_formats() -> List[Tuple[str, str]]: ... - -def register_archive_format(name: str, function: Callable[..., Any], - extra_args: Optional[Sequence[Union[Tuple[str, Any], List[Any]]]] = ..., - description: str = ...) -> None: ... +def register_archive_format( + name: str, + function: Callable[..., Any], + extra_args: Optional[Sequence[Union[Tuple[str, Any], List[Any]]]] = ..., + description: str = ..., +) -> None: ... def unregister_archive_format(name: str) -> None: ... if sys.version_info >= (3,): if sys.version_info >= (3, 7): - def unpack_archive(filename: StrPath, extract_dir: Optional[StrPath] = ..., - format: Optional[str] = ...) -> None: ... + def unpack_archive(filename: StrPath, extract_dir: Optional[StrPath] = ..., format: Optional[str] = ...) -> None: ... else: # See http://bugs.python.org/issue30218 - def unpack_archive(filename: str, extract_dir: Optional[StrPath] = ..., - format: Optional[str] = ...) -> None: ... - def register_unpack_format(name: str, extensions: List[str], function: Any, - extra_args: Sequence[Tuple[str, Any]] = ..., - description: str = ...) -> None: ... + def unpack_archive(filename: str, extract_dir: Optional[StrPath] = ..., format: Optional[str] = ...) -> None: ... + def register_unpack_format( + name: str, extensions: List[str], function: Any, extra_args: Sequence[Tuple[str, Any]] = ..., description: str = ... + ) -> None: ... def unregister_unpack_format(name: str) -> None: ... def get_unpack_formats() -> List[Tuple[str, List[str], str]]: ... - def get_terminal_size(fallback: Tuple[int, int] = ...) -> os.terminal_size: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/socket.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/socket.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/socket.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/socket.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,24 +1,7 @@ -"""Stub for the socket module - -This file is organized to mirror the module's documentation, with a very small -number of exceptions. - -To avoid requiring tests on all platforms, platform checks are included only -where the documentation notes platform availability (as opposed to following -actual availability), with one or two exceptions. - -Module documentation: https://docs.python.org/3/library/socket.html -CPython module source: https://github.com/python/cpython/blob/master/Lib/socket.py -CPython C source: https://github.com/python/cpython/blob/master/Modules/socketmodule.c -""" -# Authorship from original mypy stubs (not in typeshed git history): -# Ron Murawski -# adapted for Python 2.7 by Michal Pokorny import sys -from typing import Any, BinaryIO, Iterable, List, Optional, Text, TextIO, Tuple, TypeVar, Union, overload +from typing import Any, BinaryIO, Iterable, List, Optional, Sequence, Text, TextIO, Tuple, TypeVar, Union, overload from typing_extensions import Literal - # ----- Constants ----- # Some socket families are listed in the "Socket families" section of the docs, # but not the "Constants" section. These are listed at the end of the list of @@ -52,7 +35,7 @@ SOCK_RDM: SocketKind SOCK_SEQPACKET: SocketKind -if sys.platform == 'linux' and sys.version_info >= (3,): +if sys.platform == "linux" and sys.version_info >= (3,): SOCK_CLOEXEC: SocketKind SOCK_NONBLOCK: SocketKind @@ -94,7 +77,7 @@ AI_PASSIVE: AddressInfo AI_V4MAPPED: AddressInfo AI_V4MAPPED_CFG: AddressInfo -EAIEAI_ADDRFAMILY: int +EAI_ADDRFAMILY: int EAI_AGAIN: int EAI_BADFLAGS: int EAI_BADHINTS: int @@ -285,7 +268,7 @@ # Specifically-documented constants -if sys.platform == 'linux' and sys.version_info >= (3,): +if sys.platform == "linux" and sys.version_info >= (3,): AF_CAN: AddressFamily PF_CAN: int SOL_CAN_BASE: int @@ -318,7 +301,7 @@ CAN_RAW_FD_FRAMES: int -if sys.platform == 'linux' and sys.version_info >= (3, 8): +if sys.platform == "linux" and sys.version_info >= (3, 8): CAN_BCM_SETTIMER: int CAN_BCM_STARTTIMER: int CAN_BCM_TX_COUNTEVT: int @@ -332,10 +315,10 @@ CAN_BCM_RX_RTR_FRAME: int CAN_BCM_CAN_FD_FRAME: int -if sys.platform == 'linux' and sys.version_info >= (3, 7): +if sys.platform == "linux" and sys.version_info >= (3, 7): CAN_ISOTP: int -if sys.platform == 'linux' and sys.version_info >= (3, 9): +if sys.platform == "linux" and sys.version_info >= (3, 9): CAN_J1939: int J1939_MAX_UNICAST_ADDR: int @@ -367,7 +350,7 @@ J1939_FILTER_MAX: int -if sys.platform == 'linux': +if sys.platform == "linux": AF_PACKET: AddressFamily PF_PACKET: int PACKET_BROADCAST: int @@ -378,7 +361,7 @@ PACKET_OTHERHOST: int PACKET_OUTGOING: int -if sys.platform == 'linux' and sys.version_info >= (3,): +if sys.platform == "linux" and sys.version_info >= (3,): AF_RDS: AddressFamily PF_RDS: int SOL_RDS: int @@ -401,7 +384,7 @@ RDS_RDMA_USE_ONCE: int RDS_RECVERR: int -if sys.platform == 'win32': +if sys.platform == "win32": SIO_RCVALL: int SIO_KEEPALIVE_VALS: int if sys.version_info >= (3, 6): @@ -412,7 +395,7 @@ RCVALL_ON: int RCVALL_SOCKETLEVELONLY: int -if sys.platform == 'linux': +if sys.platform == "linux": AF_TIPC: AddressFamily SOL_TIPC: int TIPC_ADDR_ID: int @@ -439,7 +422,7 @@ TIPC_WITHDRAWN: int TIPC_ZONE_SCOPE: int -if sys.platform == 'linux' and sys.version_info >= (3, 6): +if sys.platform == "linux" and sys.version_info >= (3, 6): AF_ALG: AddressFamily SOL_ALG: int ALG_OP_DECRYPT: int @@ -453,7 +436,7 @@ ALG_SET_OP: int ALG_SET_PUBKEY: int -if sys.platform == 'linux' and sys.version_info >= (3, 7): +if sys.platform == "linux" and sys.version_info >= (3, 7): AF_VSOCK: AddressFamily IOCTL_VM_SOCKETS_GET_LOCAL_CID: int VMADDR_CID_ANY: int @@ -476,14 +459,13 @@ TCP_CONGESTION: int TCP_USER_TIMEOUT: int -if sys.platform == 'linux' and sys.version_info >= (3, 8): +if sys.platform == "linux" and sys.version_info >= (3, 8): AF_QIPCRTR: AddressFamily - # Semi-documented constants # (Listed under "Socket families" in the docs, but not "Constants") -if sys.platform == 'linux': +if sys.platform == "linux": # Netlink is defined by Linux AF_NETLINK: AddressFamily NETLINK_ARPD: int @@ -501,7 +483,7 @@ NETLINK_W1: int NETLINK_XFRM: int -if sys.platform != 'win32' and sys.platform != 'darwin': +if sys.platform != "win32" and sys.platform != "darwin": # Linux and some BSD support is explicit in the docs # Windows and macOS do not support in practice AF_BLUETOOTH: AddressFamily @@ -518,16 +500,14 @@ HCI_TIME_STAMP: int HCI_DATA_DIR: int -if sys.platform == 'darwin': +if sys.platform == "darwin": # PF_SYSTEM is defined by macOS PF_SYSTEM: int SYSPROTO_CONTROL: int - # enum versions of above flags if sys.version_info >= (3, 4): from enum import IntEnum - class AddressFamily(IntEnum): AF_UNIX: int AF_INET: int @@ -566,7 +546,6 @@ AF_VSOCK: int AF_WANPIPE: int AF_X25: int - class SocketKind(IntEnum): SOCK_STREAM: int SOCK_DGRAM: int @@ -575,13 +554,13 @@ SOCK_SEQPACKET: int SOCK_CLOEXEC: int SOCK_NONBLOCK: int + else: AddressFamily = int SocketKind = int if sys.version_info >= (3, 6): from enum import IntFlag - class AddressInfo(IntFlag): AI_ADDRCONFIG: int AI_ALL: int @@ -590,7 +569,6 @@ AI_NUMERICSERV: int AI_PASSIVE: int AI_V4MAPPED: int - class MsgFlag(IntFlag): MSG_CTRUNC: int MSG_DONTROUTE: int @@ -600,15 +578,16 @@ MSG_PEEK: int MSG_TRUNC: int MSG_WAITALL: int + else: AddressInfo = int MsgFlag = int - # ----- Exceptions ----- if sys.version_info < (3,): class error(IOError): ... + else: error = OSError @@ -621,7 +600,6 @@ class timeout(error): def __init__(self, error: int = ..., string: str = ...) -> None: ... - # ----- Classes ----- # Addresses can be either tuples of varying lengths (AF_INET, AF_INET6, @@ -633,7 +611,7 @@ _WriteBuffer = Union[bytearray, memoryview] _CMSG = Tuple[int, int, bytes] -_SelfT = TypeVar('_SelfT', bound=socket) +_SelfT = TypeVar("_SelfT", bound=socket) class socket: family: int @@ -646,7 +624,6 @@ def __init__(self, family: int = ..., type: int = ..., proto: int = ..., fileno: Optional[int] = ...) -> None: ... def __enter__(self: _SelfT) -> _SelfT: ... def __exit__(self, *args: Any) -> None: ... - # --- methods --- def accept(self) -> Tuple[socket, _RetAddress]: ... def bind(self, address: Union[_Address, bytes]) -> None: ... @@ -660,21 +637,17 @@ def get_inheritable(self) -> bool: ... def getpeername(self) -> _RetAddress: ... def getsockname(self) -> _RetAddress: ... - @overload def getsockopt(self, level: int, optname: int) -> int: ... @overload def getsockopt(self, level: int, optname: int, buflen: int) -> bytes: ... - if sys.version_info >= (3, 7): def getblocking(self) -> bool: ... def gettimeout(self) -> Optional[float]: ... - - if sys.platform == 'win32' and sys.version_info >= (3, 6): + if sys.platform == "win32" and sys.version_info >= (3, 6): def ioctl(self, control: int, option: Union[int, Tuple[int, int, int], bool]) -> None: ... - elif sys.platform == 'win32': + elif sys.platform == "win32": def ioctl(self, control: int, option: Union[int, Tuple[int, int, int]]) -> None: ... - if sys.version_info >= (3, 5): def listen(self, __backlog: int = ...) -> None: ... else: @@ -683,32 +656,34 @@ if sys.version_info >= (3,): # mode strings with duplicates are intentionally excluded @overload - def makefile(self, - mode: Literal['r', 'w', 'rw', 'wr', ''] = ..., - buffering: Optional[int] = ..., - *, - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - newline: Optional[str] = ...) -> TextIO: ... + def makefile( + self, + mode: Literal["r", "w", "rw", "wr", ""] = ..., + buffering: Optional[int] = ..., + *, + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + ) -> TextIO: ... @overload - def makefile(self, - mode: Literal['b', 'rb', 'br', 'wb', 'bw', 'rwb', 'rbw', 'wrb', 'wbr', 'brw', 'bwr'], - buffering: Optional[int] = ..., - *, - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - newline: Optional[str] = ...) -> BinaryIO: ... + def makefile( + self, + mode: Literal["b", "rb", "br", "wb", "bw", "rwb", "rbw", "wrb", "wbr", "brw", "bwr"], + buffering: Optional[int] = ..., + *, + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + ) -> BinaryIO: ... else: def makefile(self, mode: unicode = ..., buffering: int = ...) -> BinaryIO: ... def recv(self, bufsize: int, flags: int = ...) -> bytes: ... def recvfrom(self, bufsize: int, flags: int = ...) -> Tuple[bytes, _RetAddress]: ... - if sys.version_info >= (3, 3) and sys.platform != "win32": def recvmsg(self, __bufsize: int, __ancbufsize: int = ..., __flags: int = ...) -> Tuple[bytes, List[_CMSG], int, Any]: ... - def recvmsg_into(self, - __buffers: Iterable[_WriteBuffer], - __ancbufsize: int = ..., - __flags: int = ...) -> Tuple[int, List[_CMSG], int, Any]: ... + def recvmsg_into( + self, __buffers: Iterable[_WriteBuffer], __ancbufsize: int = ..., __flags: int = ... + ) -> Tuple[int, List[_CMSG], int, Any]: ... def recvfrom_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> Tuple[int, _RetAddress]: ... def recv_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> int: ... def send(self, data: bytes, flags: int = ...) -> int: ... @@ -718,22 +693,18 @@ @overload def sendto(self, data: bytes, flags: int, address: _Address) -> int: ... if sys.version_info >= (3, 3) and sys.platform != "win32": - def sendmsg(self, - __buffers: Iterable[bytes], - __ancdata: Iterable[_CMSG] = ..., - __flags: int = ..., - __address: _Address = ...) -> int: ... - if sys.platform == 'linux' and sys.version_info >= (3, 6): - # TODO add the parameter types for sendmsg_afalg - def sendmsg_afalg(self, msg=..., *, op, iv=..., assoclen=..., flags=...) -> int: ... - + def sendmsg( + self, __buffers: Iterable[bytes], __ancdata: Iterable[_CMSG] = ..., __flags: int = ..., __address: _Address = ... + ) -> int: ... + if sys.platform == "linux" and sys.version_info >= (3, 6): + def sendmsg_afalg( + self, msg: Iterable[bytes] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = ... + ) -> int: ... if sys.version_info >= (3,): - # TODO determine legal types for file parameter - def sendfile(self, file, offset: int = ..., count: Optional[int] = ...) -> int: ... + def sendfile(self, file: BinaryIO, offset: int = ..., count: Optional[int] = ...) -> int: ... def set_inheritable(self, inheritable: bool) -> None: ... def setblocking(self, flag: bool) -> None: ... def settimeout(self, value: Optional[float]) -> None: ... - if sys.version_info < (3, 6): def setsockopt(self, level: int, optname: int, value: Union[int, bytes]) -> None: ... else: @@ -741,60 +712,59 @@ def setsockopt(self, level: int, optname: int, value: Union[int, bytes]) -> None: ... @overload def setsockopt(self, level: int, optname: int, value: None, optlen: int) -> None: ... - - if sys.platform == 'win32': + if sys.platform == "win32": def share(self, process_id: int) -> bytes: ... - def shutdown(self, how: int) -> None: ... - # ----- Functions ----- if sys.version_info >= (3, 7): def close(fd: int) -> None: ... -def create_connection(address: Tuple[Optional[str], int], - timeout: Optional[float] = ..., - source_address: Optional[Tuple[Union[bytearray, bytes, Text], int]] = ...) -> socket: ... +def create_connection( + address: Tuple[Optional[str], int], + timeout: Optional[float] = ..., + source_address: Optional[Tuple[Union[bytearray, bytes, Text], int]] = ..., +) -> socket: ... if sys.version_info >= (3, 8): - def create_server(address: _Address, - *, - family: int = ..., - backlog: Optional[int] = ..., - reuse_port: bool = ..., - dualstack_ipv6: bool = ...) -> socket: ... + def create_server( + address: _Address, *, family: int = ..., backlog: Optional[int] = ..., reuse_port: bool = ..., dualstack_ipv6: bool = ... + ) -> socket: ... def has_dualstack_ipv6() -> bool: ... def fromfd(fd: int, family: int, type: int, proto: int = ...) -> socket: ... -if sys.platform == 'win32' and sys.version_info >= (3, 3): +if sys.platform == "win32" and sys.version_info >= (3, 3): def fromshare(info: bytes) -> socket: ... # the 5th tuple item is an address -# TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers -# https://github.com/python/mypy/issues/2509 if sys.version_info >= (3,): - def getaddrinfo(host: Optional[Union[bytearray, bytes, Text]], - port: Union[str, int, None], - family: int = ..., - type: int = ..., - proto: int = ..., - flags: int = ...) -> List[Tuple[AddressFamily, SocketKind, int, str, Tuple[Any, ...]]]: ... + def getaddrinfo( + host: Optional[Union[bytearray, bytes, Text]], + port: Union[str, int, None], + family: int = ..., + type: int = ..., + proto: int = ..., + flags: int = ..., + ) -> List[Tuple[AddressFamily, SocketKind, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]: ... + else: - def getaddrinfo(host: Optional[Union[bytearray, bytes, Text]], - port: Union[str, int, None], - family: int = ..., - socktype: int = ..., - proto: int = ..., - flags: int = ...) -> List[Tuple[AddressFamily, SocketKind, int, str, Tuple[Any, ...]]]: ... + def getaddrinfo( + host: Optional[Union[bytearray, bytes, Text]], + port: Union[str, int, None], + family: int = ..., + socktype: int = ..., + proto: int = ..., + flags: int = ..., + ) -> List[Tuple[AddressFamily, SocketKind, int, str, Tuple[Any, ...]]]: ... def getfqdn(name: str = ...) -> str: ... def gethostbyname(hostname: str) -> str: ... def gethostbyname_ex(hostname: str) -> Tuple[str, List[str], List[str]]: ... def gethostname() -> str: ... def gethostbyaddr(ip_address: str) -> Tuple[str, List[str], List[str]]: ... -def getnameinfo(sockaddr: Union[Tuple[str, int], Tuple[str, int, int, int]], flags: int) -> Tuple[str, int]: ... +def getnameinfo(sockaddr: Union[Tuple[str, int], Tuple[str, int, int, int]], flags: int) -> Tuple[str, str]: ... def getprotobyname(protocolname: str) -> int: ... def getservbyname(servicename: str, protocolname: str = ...) -> int: ... def getservbyport(port: int, protocolname: str = ...) -> str: ... @@ -807,11 +777,22 @@ def inet_ntoa(packed_ip: bytes) -> str: ... def inet_pton(address_family: int, ip_string: str) -> bytes: ... def inet_ntop(address_family: int, packed_ip: bytes) -> str: ... + +if sys.version_info >= (3, 9): + if sys.platform != "win32": + # flags and address appear to be unused in send_fds and recv_fds + def send_fds( + sock: socket, buffers: Iterable[bytes], fds: Union[bytes, Iterable[int]], flags: int = ..., address: None = ... + ) -> int: ... + def recv_fds(sock: socket, bufsize: int, maxfds: int, flags: int = ...) -> Tuple[bytes, List[int], int, Any]: ... + if sys.version_info >= (3, 3): def CMSG_LEN(length: int) -> int: ... def CMSG_SPACE(length: int) -> int: ... + def getdefaulttimeout() -> Optional[float]: ... def setdefaulttimeout(timeout: Optional[float]) -> None: ... + if sys.version_info >= (3, 3): if sys.platform != "win32": def sethostname(name: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/sqlite3/dbapi2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/sqlite3/dbapi2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/sqlite3/dbapi2.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/sqlite3/dbapi2.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,9 @@ -# Filip Hron -# based heavily on Andrey Vlasovskikh's python-skeletons https://github.com/JetBrains/python-skeletons/blob/master/sqlite3.py - import os import sys +from datetime import date, datetime, time from typing import Any, Callable, Generator, Iterable, Iterator, List, Optional, Text, Tuple, Type, TypeVar, Union -from datetime import date, time, datetime -_T = TypeVar('_T') +_T = TypeVar("_T") paramstyle: str threadsafety: int @@ -15,9 +12,9 @@ Time = time Timestamp = datetime -def DateFromTicks(ticks): ... -def TimeFromTicks(ticks): ... -def TimestampFromTicks(ticks): ... +def DateFromTicks(ticks: float) -> Date: ... +def TimeFromTicks(ticks: float) -> Time: ... +def TimestampFromTicks(ticks: float) -> Timestamp: ... version_info: str sqlite_version_info: Tuple[int, int, int] @@ -26,8 +23,6 @@ else: Binary = buffer -def register_adapters_and_converters(): ... - # The remaining definitions are imported from _sqlite3. PARSE_COLNAMES: int @@ -71,32 +66,42 @@ # TODO: adapt needs to get probed def adapt(obj, protocol, alternate): ... def complete_statement(sql: str) -> bool: ... + if sys.version_info >= (3, 7): - def connect(database: Union[bytes, Text, os.PathLike[Text]], - timeout: float = ..., - detect_types: int = ..., - isolation_level: Optional[str] = ..., - check_same_thread: bool = ..., - factory: Optional[Type[Connection]] = ..., - cached_statements: int = ..., - uri: bool = ...) -> Connection: ... + def connect( + database: Union[bytes, Text, os.PathLike[Text]], + timeout: float = ..., + detect_types: int = ..., + isolation_level: Optional[str] = ..., + check_same_thread: bool = ..., + factory: Optional[Type[Connection]] = ..., + cached_statements: int = ..., + uri: bool = ..., + ) -> Connection: ... + elif sys.version_info >= (3, 4): - def connect(database: Union[bytes, Text], - timeout: float = ..., - detect_types: int = ..., - isolation_level: Optional[str] = ..., - check_same_thread: bool = ..., - factory: Optional[Type[Connection]] = ..., - cached_statements: int = ..., - uri: bool = ...) -> Connection: ... + def connect( + database: Union[bytes, Text], + timeout: float = ..., + detect_types: int = ..., + isolation_level: Optional[str] = ..., + check_same_thread: bool = ..., + factory: Optional[Type[Connection]] = ..., + cached_statements: int = ..., + uri: bool = ..., + ) -> Connection: ... + else: - def connect(database: Union[bytes, Text], - timeout: float = ..., - detect_types: int = ..., - isolation_level: Optional[str] = ..., - check_same_thread: bool = ..., - factory: Optional[Type[Connection]] = ..., - cached_statements: int = ...) -> Connection: ... + def connect( + database: Union[bytes, Text], + timeout: float = ..., + detect_types: int = ..., + isolation_level: Optional[str] = ..., + check_same_thread: bool = ..., + factory: Optional[Type[Connection]] = ..., + cached_statements: int = ..., + ) -> Connection: ... + def enable_callback_tracebacks(flag: bool) -> None: ... def enable_shared_cache(do_enable: int) -> None: ... def register_adapter(type: Type[_T], callable: Callable[[_T], Union[int, float, str, bytes]]) -> None: ... @@ -124,7 +129,7 @@ row_factory: Any text_factory: Any total_changes: Any - def __init__(self, *args, **kwargs): ... + def __init__(self, *args: Any, **kwargs: Any) -> None: ... def close(self) -> None: ... def commit(self) -> None: ... def create_aggregate(self, name: str, num_params: int, aggregate_class: type) -> None: ... @@ -138,27 +143,33 @@ # TODO: please check in executemany() if seq_of_parameters type is possible like this def executemany(self, sql: str, seq_of_parameters: Iterable[Iterable[Any]]) -> Cursor: ... def executescript(self, sql_script: Union[bytes, Text]) -> Cursor: ... - def interrupt(self, *args, **kwargs) -> None: ... - def iterdump(self, *args, **kwargs) -> Generator[str, None, None]: ... - def rollback(self, *args, **kwargs) -> None: ... + def interrupt(self, *args: Any, **kwargs: Any) -> None: ... + def iterdump(self, *args: Any, **kwargs: Any) -> Generator[str, None, None]: ... + def rollback(self, *args: Any, **kwargs: Any) -> None: ... # TODO: set_authorizer(authorzer_callback) # see https://docs.python.org/2/library/sqlite3.html#sqlite3.Connection.set_authorizer # returns [SQLITE_OK, SQLITE_DENY, SQLITE_IGNORE] so perhaps int - def set_authorizer(self, *args, **kwargs) -> None: ... + def set_authorizer(self, *args: Any, **kwargs: Any) -> None: ... # set_progress_handler(handler, n) -> see https://docs.python.org/2/library/sqlite3.html#sqlite3.Connection.set_progress_handler - def set_progress_handler(self, *args, **kwargs) -> None: ... - def set_trace_callback(self, *args, **kwargs): ... + def set_progress_handler(self, *args: Any, **kwargs: Any) -> None: ... + def set_trace_callback(self, *args: Any, **kwargs: Any) -> None: ... # enable_load_extension and load_extension is not available on python distributions compiled # without sqlite3 loadable extension support. see footnotes https://docs.python.org/3/library/sqlite3.html#f1 def enable_load_extension(self, enabled: bool) -> None: ... def load_extension(self, path: str) -> None: ... if sys.version_info >= (3, 7): - def backup(self, target: Connection, *, pages: int = ..., - progress: Optional[Callable[[int, int, int], object]] = ..., name: str = ..., - sleep: float = ...) -> None: ... - def __call__(self, *args, **kwargs): ... - def __enter__(self, *args, **kwargs) -> Connection: ... - def __exit__(self, *args, **kwargs): ... + def backup( + self, + target: Connection, + *, + pages: int = ..., + progress: Optional[Callable[[int, int, int], object]] = ..., + name: str = ..., + sleep: float = ..., + ) -> None: ... + def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + def __enter__(self) -> Connection: ... + def __exit__(self, t: Optional[type] = ..., exc: Optional[BaseException] = ..., tb: Optional[Any] = ...) -> None: ... class Cursor(Iterator[Any]): arraysize: Any @@ -170,37 +181,29 @@ # TODO: Cursor class accepts exactly 1 argument # required type is sqlite3.Connection (which is imported as _Connection) # however, the name of the __init__ variable is unknown - def __init__(self, *args, **kwargs) -> None: ... - def close(self, *args, **kwargs) -> None: ... + def __init__(self, *args: Any, **kwargs: Any) -> None: ... + def close(self, *args: Any, **kwargs: Any) -> None: ... def execute(self, sql: str, parameters: Iterable[Any] = ...) -> Cursor: ... def executemany(self, sql: str, seq_of_parameters: Iterable[Iterable[Any]]) -> Cursor: ... def executescript(self, sql_script: Union[bytes, Text]) -> Cursor: ... def fetchall(self) -> List[Any]: ... def fetchmany(self, size: Optional[int] = ...) -> List[Any]: ... def fetchone(self) -> Any: ... - def setinputsizes(self, *args, **kwargs) -> None: ... - def setoutputsize(self, *args, **kwargs) -> None: ... + def setinputsizes(self, *args: Any, **kwargs: Any) -> None: ... + def setoutputsize(self, *args: Any, **kwargs: Any) -> None: ... def __iter__(self) -> Cursor: ... if sys.version_info >= (3, 0): def __next__(self) -> Any: ... else: def next(self) -> Any: ... - class DataError(DatabaseError): ... - class DatabaseError(Error): ... - class Error(Exception): ... - class IntegrityError(DatabaseError): ... - class InterfaceError(Error): ... - class InternalError(DatabaseError): ... - class NotSupportedError(DatabaseError): ... - class OperationalError(DatabaseError): ... if sys.version_info >= (3,): @@ -272,13 +275,13 @@ def __rmul__(self, other): ... class PrepareProtocol(object): - def __init__(self, *args, **kwargs): ... + def __init__(self, *args: Any, **kwargs: Any) -> None: ... class ProgrammingError(DatabaseError): ... class Row(object): - def __init__(self, *args, **kwargs): ... - def keys(self, *args, **kwargs): ... + def __init__(self, *args: Any, **kwargs: Any) -> None: ... + def keys(self, *args: Any, **kwargs: Any): ... def __eq__(self, other): ... def __ge__(self, other): ... def __getitem__(self, index): ... @@ -286,7 +289,7 @@ def __hash__(self): ... def __iter__(self): ... def __le__(self, other): ... - def __len__(self, *args, **kwargs): ... + def __len__(self, *args: Any, **kwargs: Any): ... def __lt__(self, other): ... def __ne__(self, other): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ssl.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ssl.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/ssl.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/ssl.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,9 @@ -from _typeshed import StrPath -from typing import ( - Any, Callable, ClassVar, Dict, Iterable, List, NamedTuple, Optional, Set, Text, Type, Tuple, Union, - overload -) -from typing_extensions import Literal import enum import socket import sys +from _typeshed import StrPath +from typing import Any, Callable, ClassVar, Dict, Iterable, List, NamedTuple, Optional, Set, Text, Tuple, Type, Union, overload +from typing_extensions import Literal _PCTRTT = Tuple[Tuple[str, str], ...] _PCTRTTT = Tuple[_PCTRTT, ...] @@ -24,6 +21,7 @@ class SSLError(OSError): library: str reason: str + class SSLZeroReturnError(SSLError): ... class SSLWantReadError(SSLError): ... class SSLWantWriteError(SSLError): ... @@ -34,65 +32,69 @@ class SSLCertVerificationError(SSLError, ValueError): verify_code: int verify_message: str - CertificateError = SSLCertVerificationError else: class CertificateError(ValueError): ... - -def wrap_socket(sock: socket.socket, keyfile: Optional[str] = ..., - certfile: Optional[str] = ..., server_side: bool = ..., - cert_reqs: int = ..., ssl_version: int = ..., - ca_certs: Optional[str] = ..., - do_handshake_on_connect: bool = ..., - suppress_ragged_eofs: bool = ..., - ciphers: Optional[str] = ...) -> SSLSocket: ... - - +def wrap_socket( + sock: socket.socket, + keyfile: Optional[str] = ..., + certfile: Optional[str] = ..., + server_side: bool = ..., + cert_reqs: int = ..., + ssl_version: int = ..., + ca_certs: Optional[str] = ..., + do_handshake_on_connect: bool = ..., + suppress_ragged_eofs: bool = ..., + ciphers: Optional[str] = ..., +) -> SSLSocket: ... def create_default_context( - purpose: Any = ..., - *, - cafile: Optional[str] = ..., - capath: Optional[str] = ..., - cadata: Union[Text, bytes, None] = ..., + purpose: Any = ..., *, cafile: Optional[str] = ..., capath: Optional[str] = ..., cadata: Union[Text, bytes, None] = ... ) -> SSLContext: ... if sys.version_info >= (3, 7): - def _create_unverified_context(protocol: int = ..., *, - cert_reqs: int = ..., - check_hostname: bool = ..., - purpose: Any = ..., - certfile: Optional[str] = ..., - keyfile: Optional[str] = ..., - cafile: Optional[str] = ..., - capath: Optional[str] = ..., - cadata: Union[Text, bytes, None] = ...) -> SSLContext: ... + def _create_unverified_context( + protocol: int = ..., + *, + cert_reqs: int = ..., + check_hostname: bool = ..., + purpose: Any = ..., + certfile: Optional[str] = ..., + keyfile: Optional[str] = ..., + cafile: Optional[str] = ..., + capath: Optional[str] = ..., + cadata: Union[Text, bytes, None] = ..., + ) -> SSLContext: ... + else: - def _create_unverified_context(protocol: int = ..., *, - cert_reqs: Optional[int] = ..., - check_hostname: bool = ..., - purpose: Any = ..., - certfile: Optional[str] = ..., - keyfile: Optional[str] = ..., - cafile: Optional[str] = ..., - capath: Optional[str] = ..., - cadata: Union[Text, bytes, None] = ...) -> SSLContext: ... + def _create_unverified_context( + protocol: int = ..., + *, + cert_reqs: Optional[int] = ..., + check_hostname: bool = ..., + purpose: Any = ..., + certfile: Optional[str] = ..., + keyfile: Optional[str] = ..., + cafile: Optional[str] = ..., + capath: Optional[str] = ..., + cadata: Union[Text, bytes, None] = ..., + ) -> SSLContext: ... + _create_default_https_context: Callable[..., SSLContext] if sys.version_info >= (3, 3): def RAND_bytes(__num: int) -> bytes: ... def RAND_pseudo_bytes(__num: int) -> Tuple[bytes, bool]: ... + def RAND_status() -> bool: ... def RAND_egd(path: str) -> None: ... def RAND_add(__s: bytes, __entropy: float) -> None: ... - - def match_hostname(cert: _PeerCertRetType, hostname: str) -> None: ... def cert_time_to_seconds(cert_time: str) -> int: ... -def get_server_certificate(addr: Tuple[str, int], ssl_version: int = ..., - ca_certs: Optional[str] = ...) -> str: ... +def get_server_certificate(addr: Tuple[str, int], ssl_version: int = ..., ca_certs: Optional[str] = ...) -> str: ... def DER_cert_to_PEM_cert(der_cert_bytes: bytes) -> str: ... def PEM_cert_to_DER_cert(pem_cert_string: str) -> bytes: ... + class DefaultVerifyPaths(NamedTuple): cafile: str capath: str @@ -100,13 +102,13 @@ openssl_cafile: str openssl_capath_env: str openssl_capath: str + def get_default_verify_paths() -> DefaultVerifyPaths: ... -if sys.platform == 'win32': +if sys.platform == "win32": def enum_certificates(store_name: str) -> _EnumRetType: ... def enum_crls(store_name: str) -> _EnumRetType: ... - CERT_NONE: int CERT_OPTIONAL: int CERT_REQUIRED: int @@ -141,9 +143,27 @@ OP_SINGLE_ECDH_USE: int OP_NO_COMPRESSION: int OP_NO_TICKET: int - OP_ENABLE_MIDDLEBOX_COMPAT: int if sys.version_info >= (3, 7): OP_NO_RENEGOTIATION: int + OP_NO_TLSv1_3: int + if sys.version_info >= (3, 8): + OP_ENABLE_MIDDLEBOX_COMPAT: int + OP_ALL: Options + OP_NO_SSLv2: Options + OP_NO_SSLv3: Options + OP_NO_TLSv1: Options + OP_NO_TLSv1_1: Options + OP_NO_TLSv1_2: Options + OP_CIPHER_SERVER_PREFERENCE: Options + OP_SINGLE_DH_USE: Options + OP_SINGLE_ECDH_USE: Options + OP_NO_COMPRESSION: Options + OP_NO_TICKET: Options + if sys.version_info >= (3, 7): + OP_NO_RENEGOTIATION: Options + OP_NO_TLSv1_3: Options + if sys.version_info >= (3, 8): + OP_ENABLE_MIDDLEBOX_COMPAT: Options else: OP_ALL: int OP_NO_SSLv2: int @@ -156,7 +176,15 @@ OP_SINGLE_ECDH_USE: int OP_NO_COMPRESSION: int -HAS_ALPN: int +if sys.version_info >= (3, 7): + HAS_NEVER_CHECK_COMMON_NAME: bool + HAS_SSLv2: bool + HAS_SSLv3: bool + HAS_TLSv1: bool + HAS_TLSv1_1: bool + HAS_TLSv1_2: bool + HAS_TLSv1_3: bool +HAS_ALPN: bool HAS_ECDH: bool HAS_SNI: bool HAS_NPN: bool @@ -199,10 +227,12 @@ shortname: str longname: str oid: str + if sys.version_info < (3,): class Purpose(_ASN1Object): SERVER_AUTH: ClassVar[Purpose] CLIENT_AUTH: ClassVar[Purpose] + else: class Purpose(_ASN1Object, enum.Enum): SERVER_AUTH: _ASN1Object @@ -215,9 +245,7 @@ if sys.version_info >= (3, 6): session: Optional[SSLSession] session_reused: Optional[bool] - - def read(self, len: int = ..., - buffer: Optional[bytearray] = ...) -> bytes: ... + def read(self, len: int = ..., buffer: Optional[bytearray] = ...) -> bytes: ... def write(self, data: bytes) -> int: ... def do_handshake(self, block: bool = ...) -> None: ... # block is undocumented @overload @@ -267,14 +295,12 @@ else: def __init__(self, protocol: int) -> None: ... def cert_store_stats(self) -> Dict[str, int]: ... - def load_cert_chain(self, certfile: StrPath, keyfile: Optional[StrPath] = ..., - password: Optional[_PasswordType] = ...) -> None: ... + def load_cert_chain( + self, certfile: StrPath, keyfile: Optional[StrPath] = ..., password: Optional[_PasswordType] = ... + ) -> None: ... def load_default_certs(self, purpose: Purpose = ...) -> None: ... def load_verify_locations( - self, - cafile: Optional[StrPath] = ..., - capath: Optional[StrPath] = ..., - cadata: Union[Text, bytes, None] = ..., + self, cafile: Optional[StrPath] = ..., capath: Optional[StrPath] = ..., cadata: Union[Text, bytes, None] = ... ) -> None: ... def get_ca_certs(self, binary_form: bool = ...) -> Union[List[_PeerCertRetDictType], List[bytes]]: ... def set_default_verify_paths(self) -> None: ... @@ -291,32 +317,43 @@ def load_dh_params(self, __path: str) -> None: ... def set_ecdh_curve(self, __name: str) -> None: ... if sys.version_info >= (3, 6): - def wrap_socket(self, sock: socket.socket, server_side: bool = ..., - do_handshake_on_connect: bool = ..., - suppress_ragged_eofs: bool = ..., - server_hostname: Optional[str] = ..., - session: Optional[SSLSession] = ...) -> SSLSocket: ... + def wrap_socket( + self, + sock: socket.socket, + server_side: bool = ..., + do_handshake_on_connect: bool = ..., + suppress_ragged_eofs: bool = ..., + server_hostname: Optional[str] = ..., + session: Optional[SSLSession] = ..., + ) -> SSLSocket: ... else: - def wrap_socket(self, sock: socket.socket, server_side: bool = ..., - do_handshake_on_connect: bool = ..., - suppress_ragged_eofs: bool = ..., - server_hostname: Optional[str] = ...) -> SSLSocket: ... + def wrap_socket( + self, + sock: socket.socket, + server_side: bool = ..., + do_handshake_on_connect: bool = ..., + suppress_ragged_eofs: bool = ..., + server_hostname: Optional[str] = ..., + ) -> SSLSocket: ... if sys.version_info >= (3, 6): - def wrap_bio(self, incoming: MemoryBIO, outgoing: MemoryBIO, - server_side: bool = ..., - server_hostname: Optional[str] = ..., - session: Optional[SSLSession] = ...) -> SSLObject: ... + def wrap_bio( + self, + incoming: MemoryBIO, + outgoing: MemoryBIO, + server_side: bool = ..., + server_hostname: Optional[str] = ..., + session: Optional[SSLSession] = ..., + ) -> SSLObject: ... elif sys.version_info >= (3, 5): - def wrap_bio(self, incoming: MemoryBIO, outgoing: MemoryBIO, - server_side: bool = ..., - server_hostname: Optional[str] = ...) -> SSLObject: ... + def wrap_bio( + self, incoming: MemoryBIO, outgoing: MemoryBIO, server_side: bool = ..., server_hostname: Optional[str] = ... + ) -> SSLObject: ... def session_stats(self) -> Dict[str, int]: ... if sys.version_info >= (3, 7): hostname_checks_common_name: bool maximum_version: TLSVersion minimum_version: TLSVersion - if sys.version_info >= (3, 5): class SSLObject: context: SSLContext @@ -325,8 +362,7 @@ if sys.version_info >= (3, 6): session: Optional[SSLSession] session_reused: bool - def read(self, len: int = ..., - buffer: Optional[bytearray] = ...) -> bytes: ... + def read(self, len: int = ..., buffer: Optional[bytearray] = ...) -> bytes: ... def write(self, data: bytes) -> int: ... @overload def getpeercert(self, binary_form: Literal[False] = ...) -> Optional[_PeerCertRetDictType]: ... @@ -346,7 +382,6 @@ def get_channel_binding(self, cb_type: str = ...) -> Optional[bytes]: ... if sys.version_info >= (3, 8): def verify_client_post_handshake(self) -> None: ... - class MemoryBIO: pending: int eof: bool @@ -361,14 +396,12 @@ timeout: int ticket_lifetime_hint: int has_ticket: bool - class VerifyFlags(enum.IntFlag): VERIFY_DEFAULT: int VERIFY_CRL_CHECK_LEAF: int VERIFY_CRL_CHECK_CHAIN: int VERIFY_X509_STRICT: int VERIFY_X509_TRUSTED_FIRST: int - class VerifyMode(enum.IntEnum): CERT_NONE: int CERT_OPTIONAL: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/struct.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/struct.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/struct.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/struct.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,7 @@ -# Stubs for struct - -# Based on http://docs.python.org/3.2/library/struct.html -# Based on http://docs.python.org/2/library/struct.html - import sys -from typing import Any, Tuple, Text, Union, Iterator from array import array from mmap import mmap +from typing import Any, Iterator, Text, Tuple, Union class error(Exception): ... @@ -22,6 +17,7 @@ def pack_into(fmt: _FmtType, buffer: _WriteBufferType, offset: int, *v: Any) -> None: ... def unpack(__format: _FmtType, __buffer: _BufferType) -> Tuple[Any, ...]: ... def unpack_from(__format: _FmtType, buffer: _BufferType, offset: int = ...) -> Tuple[Any, ...]: ... + if sys.version_info >= (3, 4): def iter_unpack(__format: _FmtType, __buffer: _BufferType) -> Iterator[Tuple[Any, ...]]: ... @@ -33,9 +29,7 @@ else: format: bytes size: int - def __init__(self, format: _FmtType) -> None: ... - def pack(self, *v: Any) -> bytes: ... def pack_into(self, buffer: _WriteBufferType, offset: int, *v: Any) -> None: ... def unpack(self, __buffer: _BufferType) -> Tuple[Any, ...]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/sunau.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/sunau.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/sunau.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/sunau.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for sunau (Python 2 and 3) - import sys -from typing import Any, NamedTuple, NoReturn, Optional, Text, IO, Union, Tuple +from typing import IO, Any, NamedTuple, NoReturn, Optional, Text, Tuple, Union _File = Union[Text, IO[bytes]] @@ -83,5 +81,6 @@ # Returns a Au_read if mode is rb and Au_write if mode is wb def open(f: _File, mode: Optional[str] = ...) -> Any: ... + if sys.version_info < (3, 9): openfp = open diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/tarfile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/tarfile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/tarfile.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/tarfile.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,10 +1,7 @@ -from typing import ( - Callable, IO, Iterable, Iterator, List, Mapping, Optional, Type, - Union, Tuple, Dict, Set -) import sys -from _typeshed import AnyPath +from _typeshed import AnyPath, StrPath from types import TracebackType +from typing import IO, Callable, Dict, Iterable, Iterator, List, Mapping, Optional, Set, Tuple, Type, Union # tar constants NUL: bytes @@ -51,30 +48,36 @@ if sys.version_info >= (3,): PAX_NAME_FIELDS: Set[str] - ENCODING: str if sys.version_info < (3,): TAR_PLAIN: int TAR_GZIPPED: int -def open(name: Optional[AnyPath] = ..., mode: str = ..., - fileobj: Optional[IO[bytes]] = ..., bufsize: int = ..., - *, format: Optional[int] = ..., tarinfo: Optional[TarInfo] = ..., - dereference: Optional[bool] = ..., - ignore_zeros: Optional[bool] = ..., - encoding: Optional[str] = ..., errors: str = ..., - pax_headers: Optional[Mapping[str, str]] = ..., - debug: Optional[int] = ..., - errorlevel: Optional[int] = ..., - compresslevel: Optional[int] = ...) -> TarFile: ... +def open( + name: Optional[AnyPath] = ..., + mode: str = ..., + fileobj: Optional[IO[bytes]] = ..., + bufsize: int = ..., + *, + format: Optional[int] = ..., + tarinfo: Optional[Type[TarInfo]] = ..., + dereference: Optional[bool] = ..., + ignore_zeros: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: str = ..., + pax_headers: Optional[Mapping[str, str]] = ..., + debug: Optional[int] = ..., + errorlevel: Optional[int] = ..., + compresslevel: Optional[int] = ..., +) -> TarFile: ... class TarFile(Iterable[TarInfo]): name: Optional[AnyPath] mode: str fileobj: Optional[IO[bytes]] format: Optional[int] - tarinfo: Optional[TarInfo] + tarinfo: Type[TarInfo] dereference: Optional[bool] ignore_zeros: Optional[bool] encoding: Optional[str] @@ -84,57 +87,66 @@ errorlevel: Optional[int] if sys.version_info < (3,): posix: bool - def __init__(self, name: Optional[AnyPath] = ..., mode: str = ..., - fileobj: Optional[IO[bytes]] = ..., - format: Optional[int] = ..., tarinfo: Optional[TarInfo] = ..., - dereference: Optional[bool] = ..., - ignore_zeros: Optional[bool] = ..., - encoding: Optional[str] = ..., errors: str = ..., - pax_headers: Optional[Mapping[str, str]] = ..., - debug: Optional[int] = ..., - errorlevel: Optional[int] = ..., - compresslevel: Optional[int] = ...) -> None: ... + def __init__( + self, + name: Optional[AnyPath] = ..., + mode: str = ..., + fileobj: Optional[IO[bytes]] = ..., + format: Optional[int] = ..., + tarinfo: Optional[Type[TarInfo]] = ..., + dereference: Optional[bool] = ..., + ignore_zeros: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: str = ..., + pax_headers: Optional[Mapping[str, str]] = ..., + debug: Optional[int] = ..., + errorlevel: Optional[int] = ..., + copybufsize: Optional[int] = ..., # undocumented + ) -> None: ... def __enter__(self) -> TarFile: ... - def __exit__(self, - exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def __iter__(self) -> Iterator[TarInfo]: ... @classmethod - def open(cls, name: Optional[AnyPath] = ..., mode: str = ..., - fileobj: Optional[IO[bytes]] = ..., bufsize: int = ..., - *, format: Optional[int] = ..., tarinfo: Optional[TarInfo] = ..., - dereference: Optional[bool] = ..., - ignore_zeros: Optional[bool] = ..., - encoding: Optional[str] = ..., errors: str = ..., - pax_headers: Optional[Mapping[str, str]] = ..., - debug: Optional[int] = ..., - errorlevel: Optional[int] = ...) -> TarFile: ... + def open( + cls, + name: Optional[AnyPath] = ..., + mode: str = ..., + fileobj: Optional[IO[bytes]] = ..., + bufsize: int = ..., + *, + format: Optional[int] = ..., + tarinfo: Optional[Type[TarInfo]] = ..., + dereference: Optional[bool] = ..., + ignore_zeros: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: str = ..., + pax_headers: Optional[Mapping[str, str]] = ..., + debug: Optional[int] = ..., + errorlevel: Optional[int] = ..., + ) -> TarFile: ... def getmember(self, name: str) -> TarInfo: ... def getmembers(self) -> List[TarInfo]: ... def getnames(self) -> List[str]: ... if sys.version_info >= (3, 5): - def list(self, verbose: bool = ..., - *, members: Optional[List[TarInfo]] = ...) -> None: ... + def list(self, verbose: bool = ..., *, members: Optional[List[TarInfo]] = ...) -> None: ... else: def list(self, verbose: bool = ...) -> None: ... def next(self) -> Optional[TarInfo]: ... if sys.version_info >= (3, 5): - def extractall(self, path: AnyPath = ..., - members: Optional[List[TarInfo]] = ..., - *, numeric_owner: bool = ...) -> None: ... + def extractall( + self, path: AnyPath = ..., members: Optional[List[TarInfo]] = ..., *, numeric_owner: bool = ... + ) -> None: ... else: - def extractall(self, path: AnyPath = ..., - members: Optional[List[TarInfo]] = ...) -> None: ... + def extractall(self, path: AnyPath = ..., members: Optional[List[TarInfo]] = ...) -> None: ... if sys.version_info >= (3, 5): - def extract(self, member: Union[str, TarInfo], path: AnyPath = ..., - set_attrs: bool = ..., - *, numeric_owner: bool = ...) -> None: ... - else: - def extract(self, member: Union[str, TarInfo], - path: AnyPath = ...) -> None: ... - def extractfile(self, - member: Union[str, TarInfo]) -> Optional[IO[bytes]]: ... + def extract( + self, member: Union[str, TarInfo], path: AnyPath = ..., set_attrs: bool = ..., *, numeric_owner: bool = ... + ) -> None: ... + else: + def extract(self, member: Union[str, TarInfo], path: AnyPath = ...) -> None: ... + def extractfile(self, member: Union[str, TarInfo]) -> Optional[IO[bytes]]: ... def makedir(self, tarinfo: TarInfo, targetpath: AnyPath) -> None: ... # undocumented def makefile(self, tarinfo: TarInfo, targetpath: AnyPath) -> None: ... # undocumented def makeunknown(self, tarinfo: TarInfo, targetpath: AnyPath) -> None: ... # undocumented @@ -148,28 +160,42 @@ def chmod(self, tarinfo: TarInfo, targetpath: AnyPath) -> None: ... # undocumented def utime(self, tarinfo: TarInfo, targetpath: AnyPath) -> None: ... # undocumented if sys.version_info >= (3, 7): - def add(self, name: str, arcname: Optional[str] = ..., - recursive: bool = ..., *, - filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ...) -> None: ... + def add( + self, + name: StrPath, + arcname: Optional[StrPath] = ..., + recursive: bool = ..., + *, + filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ..., + ) -> None: ... elif sys.version_info >= (3,): - def add(self, name: str, arcname: Optional[str] = ..., - recursive: bool = ..., - exclude: Optional[Callable[[str], bool]] = ..., *, - filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ...) -> None: ... - else: - def add(self, name: str, arcname: Optional[str] = ..., - recursive: bool = ..., - exclude: Optional[Callable[[str], bool]] = ..., - filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ...) -> None: ... - def addfile(self, tarinfo: TarInfo, - fileobj: Optional[IO[bytes]] = ...) -> None: ... - def gettarinfo(self, name: Optional[str] = ..., - arcname: Optional[str] = ..., - fileobj: Optional[IO[bytes]] = ...) -> TarInfo: ... + def add( + self, + name: StrPath, + arcname: Optional[StrPath] = ..., + recursive: bool = ..., + exclude: Optional[Callable[[str], bool]] = ..., + *, + filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ..., + ) -> None: ... + else: + def add( + self, + name: str, + arcname: Optional[str] = ..., + recursive: bool = ..., + exclude: Optional[Callable[[str], bool]] = ..., + filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ..., + ) -> None: ... + def addfile(self, tarinfo: TarInfo, fileobj: Optional[IO[bytes]] = ...) -> None: ... + def gettarinfo( + self, name: Optional[str] = ..., arcname: Optional[str] = ..., fileobj: Optional[IO[bytes]] = ... + ) -> TarInfo: ... def close(self) -> None: ... if sys.version_info >= (3, 9): def is_tarfile(name: Union[AnyPath, IO[bytes]]) -> bool: ... + else: def is_tarfile(name: AnyPath) -> bool: ... @@ -178,8 +204,7 @@ if sys.version_info < (3,): class TarFileCompat: - def __init__(self, filename: str, mode: str = ..., - compression: int = ...) -> None: ... + def __init__(self, filename: str, mode: str = ..., compression: int = ...) -> None: ... class TarError(Exception): ... class ReadError(TarError): ... @@ -209,8 +234,7 @@ def frombuf(cls, buf: bytes) -> TarInfo: ... @classmethod def fromtarfile(cls, tarfile: TarFile) -> TarInfo: ... - def tobuf(self, format: Optional[int] = ..., - encoding: Optional[str] = ..., errors: str = ...) -> bytes: ... + def tobuf(self, format: Optional[int] = ..., encoding: Optional[str] = ..., errors: str = ...) -> bytes: ... def isfile(self) -> bool: ... def isreg(self) -> bool: ... def isdir(self) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/termios.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/termios.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/termios.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/termios.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,7 @@ -from typing import List, Union from _typeshed import FileDescriptorLike +from typing import Any, List, Union -_Attr = List[Union[int, List[bytes]]] +_Attr = List[Union[int, List[Union[bytes, int]]]] # TODO constants not really documented B0: int @@ -236,7 +236,7 @@ XCASE: int XTABS: int -def tcgetattr(fd: FileDescriptorLike) -> _Attr: ... +def tcgetattr(fd: FileDescriptorLike) -> List[Any]: ... def tcsetattr(fd: FileDescriptorLike, when: int, attributes: _Attr) -> None: ... def tcsendbreak(fd: FileDescriptorLike, duration: int) -> None: ... def tcdrain(fd: FileDescriptorLike) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/this.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/this.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/this.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/this.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,3 @@ - from typing import Dict s: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/threading.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/threading.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/threading.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/threading.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,20 +1,17 @@ - -from typing import ( - Any, Callable, Iterable, List, Mapping, Optional, Text, Tuple, Type, Union, - TypeVar, -) -from types import FrameType, TracebackType import sys +from types import FrameType, TracebackType +from typing import Any, Callable, Iterable, List, Mapping, Optional, Text, Type, TypeVar, Union # TODO recursive type _TF = Callable[[FrameType, str, Any], Optional[Callable[..., Any]]] _PF = Callable[[FrameType, str, Any], None] -_T = TypeVar('_T') +_T = TypeVar("_T") __all__: List[str] def active_count() -> int: ... + if sys.version_info < (3,): def activeCount() -> int: ... @@ -41,30 +38,35 @@ class ThreadError(Exception): ... - class local(object): def __getattribute__(self, name: str) -> Any: ... def __setattr__(self, name: str, value: Any) -> None: ... def __delattr__(self, name: str) -> None: ... - class Thread: name: str ident: Optional[int] daemon: bool if sys.version_info >= (3,): - def __init__(self, group: None = ..., - target: Optional[Callable[..., Any]] = ..., - name: Optional[str] = ..., - args: Iterable[Any] = ..., - kwargs: Mapping[str, Any] = ..., - *, daemon: Optional[bool] = ...) -> None: ... - else: - def __init__(self, group: None = ..., - target: Optional[Callable[..., Any]] = ..., - name: Optional[Text] = ..., - args: Iterable[Any] = ..., - kwargs: Mapping[Text, Any] = ...) -> None: ... + def __init__( + self, + group: None = ..., + target: Optional[Callable[..., Any]] = ..., + name: Optional[str] = ..., + args: Iterable[Any] = ..., + kwargs: Mapping[str, Any] = ..., + *, + daemon: Optional[bool] = ..., + ) -> None: ... + else: + def __init__( + self, + group: None = ..., + target: Optional[Callable[..., Any]] = ..., + name: Optional[Text] = ..., + args: Iterable[Any] = ..., + kwargs: Mapping[Text, Any] = ..., + ) -> None: ... def start(self) -> None: ... def run(self) -> None: ... def join(self, timeout: Optional[float] = ...) -> None: ... @@ -79,16 +81,14 @@ def isDaemon(self) -> bool: ... def setDaemon(self, daemonic: bool) -> None: ... - class _DummyThread(Thread): ... - class Lock: def __init__(self) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -96,29 +96,26 @@ def release(self) -> None: ... def locked(self) -> bool: ... - class _RLock: def __init__(self) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: def acquire(self, blocking: bool = ...) -> bool: ... def release(self) -> None: ... - RLock = _RLock - class Condition: def __init__(self, lock: Union[Lock, _RLock, None] = ...) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -126,19 +123,17 @@ def release(self) -> None: ... def wait(self, timeout: Optional[float] = ...) -> bool: ... if sys.version_info >= (3,): - def wait_for(self, predicate: Callable[[], _T], - timeout: Optional[float] = ...) -> _T: ... + def wait_for(self, predicate: Callable[[], _T], timeout: Optional[float] = ...) -> _T: ... def notify(self, n: int = ...) -> None: ... def notify_all(self) -> None: ... def notifyAll(self) -> None: ... - class Semaphore: def __init__(self, value: int = ...) -> None: ... def __enter__(self) -> bool: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... if sys.version_info >= (3,): def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ... else: @@ -150,7 +145,6 @@ class BoundedSemaphore(Semaphore): ... - class Event: def __init__(self) -> None: ... def is_set(self) -> bool: ... @@ -161,30 +155,36 @@ def wait(self, timeout: Optional[float] = ...) -> bool: ... if sys.version_info >= (3, 8): - from _thread import _ExceptHookArgs as ExceptHookArgs, ExceptHookArgs as _ExceptHookArgs # don't ask + import _thread + + # don't ask... + _ExceptHookArgs = _thread.ExceptHookArgs + ExceptHookArgs = _thread._ExceptHookArgs + excepthook: Callable[[_ExceptHookArgs], Any] class Timer(Thread): if sys.version_info >= (3,): - def __init__(self, interval: float, function: Callable[..., Any], - args: Optional[Iterable[Any]] = ..., - kwargs: Optional[Mapping[str, Any]] = ...) -> None: ... - else: - def __init__(self, interval: float, function: Callable[..., Any], - args: Iterable[Any] = ..., - kwargs: Mapping[str, Any] = ...) -> None: ... + def __init__( + self, + interval: float, + function: Callable[..., Any], + args: Optional[Iterable[Any]] = ..., + kwargs: Optional[Mapping[str, Any]] = ..., + ) -> None: ... + else: + def __init__( + self, interval: float, function: Callable[..., Any], args: Iterable[Any] = ..., kwargs: Mapping[str, Any] = ... + ) -> None: ... def cancel(self) -> None: ... - if sys.version_info >= (3,): class Barrier: parties: int n_waiting: int broken: bool - def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., - timeout: Optional[float] = ...) -> None: ... + def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., timeout: Optional[float] = ...) -> None: ... def wait(self, timeout: Optional[float] = ...) -> int: ... def reset(self) -> None: ... def abort(self) -> None: ... - class BrokenBarrierError(RuntimeError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/time.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/time.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/time.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/time.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,6 @@ -"""Stub file for the 'time' module.""" -# See https://docs.python.org/3/library/time.html - import sys -from typing import Any, NamedTuple, Tuple, Union, Optional +from typing import Any, NamedTuple, Optional, Tuple, Union + if sys.version_info >= (3, 3): from types import SimpleNamespace @@ -15,12 +13,12 @@ timezone: int tzname: Tuple[str, str] -if sys.version_info >= (3, 7) and sys.platform != 'win32': +if sys.version_info >= (3, 7) and sys.platform != "win32": CLOCK_BOOTTIME: int # Linux CLOCK_PROF: int # FreeBSD, NetBSD, OpenBSD CLOCK_UPTIME: int # FreeBSD, OpenBSD -if sys.version_info >= (3, 3) and sys.platform != 'win32': +if sys.version_info >= (3, 3) and sys.platform != "win32": CLOCK_HIGHRES: int # Solaris only CLOCK_MONOTONIC: int # Unix only CLOCK_MONOTONIC_RAW: int # Linux 2.6.28 or later @@ -31,26 +29,31 @@ if sys.version_info >= (3, 8) and sys.platform == "darwin": CLOCK_UPTIME_RAW: int +class _struct_time(NamedTuple): + tm_year: int + tm_mon: int + tm_mday: int + tm_hour: int + tm_min: int + tm_sec: int + tm_wday: int + tm_yday: int + tm_isdst: int + @property + def n_fields(self) -> int: ... + @property + def n_sequence_fields(self) -> int: ... + @property + def n_unnamed_fields(self) -> int: ... + if sys.version_info >= (3, 3): - class _struct_time(NamedTuple): - tm_year: int - tm_mon: int - tm_mday: int - tm_hour: int - tm_min: int - tm_sec: int - tm_wday: int - tm_yday: int - tm_isdst: int - tm_zone: str - tm_gmtoff: int class struct_time(_struct_time): def __init__( self, o: Union[ Tuple[int, int, int, int, int, int, int, int, int], Tuple[int, int, int, int, int, int, int, int, int, str], - Tuple[int, int, int, int, int, int, int, int, int, str, int] + Tuple[int, int, int, int, int, int, int, int, int, str, int], ], _arg: Any = ..., ) -> None: ... @@ -59,28 +62,26 @@ o: Union[ Tuple[int, int, int, int, int, int, int, int, int], Tuple[int, int, int, int, int, int, int, int, int, str], - Tuple[int, int, int, int, int, int, int, int, int, str, int] + Tuple[int, int, int, int, int, int, int, int, int, str, int], ], _arg: Any = ..., ) -> struct_time: ... + if sys.version_info >= (3, 6) or sys.platform != "win32": + @property + def tm_zone(self) -> str: ... + @property + def tm_gmtoff(self) -> int: ... + else: - class _struct_time(NamedTuple): - tm_year: int - tm_mon: int - tm_mday: int - tm_hour: int - tm_min: int - tm_sec: int - tm_wday: int - tm_yday: int - tm_isdst: int class struct_time(_struct_time): def __init__(self, o: _TimeTuple, _arg: Any = ...) -> None: ... def __new__(cls, o: _TimeTuple, _arg: Any = ...) -> struct_time: ... def asctime(t: Union[_TimeTuple, struct_time] = ...) -> str: ... + if sys.version_info < (3, 8): def clock() -> float: ... + def ctime(secs: Optional[float] = ...) -> str: ... def gmtime(secs: Optional[float] = ...) -> struct_time: ... def localtime(secs: Optional[float] = ...) -> struct_time: ... @@ -89,7 +90,8 @@ def strftime(format: str, t: Union[_TimeTuple, struct_time] = ...) -> str: ... def strptime(string: str, format: str = ...) -> struct_time: ... def time() -> float: ... -if sys.platform != 'win32': + +if sys.platform != "win32": def tzset() -> None: ... # Unix only if sys.version_info >= (3, 3): @@ -97,7 +99,7 @@ def monotonic() -> float: ... def perf_counter() -> float: ... def process_time() -> float: ... - if sys.platform != 'win32': + if sys.platform != "win32": def clock_getres(clk_id: int) -> float: ... # Unix only def clock_gettime(clk_id: int) -> float: ... # Unix only def clock_settime(clk_id: int, time: float) -> None: ... # Unix only diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/token.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/token.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/token.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/token.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -78,6 +78,7 @@ TYPE_COMMENT: int TYPE_IGNORE: int COLONEQUAL: int + EXACT_TOKEN_TYPES: Dict[str, int] def ISTERMINAL(x: int) -> bool: ... def ISNONTERMINAL(x: int) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/turtle.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/turtle.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/turtle.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/turtle.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,6 @@ -from typing import Tuple, overload, Optional, Union, Dict, Any, Sequence, TypeVar, List, Callable, Text import sys +from typing import Any, Callable, Dict, List, Optional, Sequence, Text, Tuple, TypeVar, Union, overload + if sys.version_info >= (3,): from tkinter import Canvas, PhotoImage else: @@ -34,7 +35,14 @@ if sys.version_info >= (3,): def mainloop(self) -> None: ... def textinput(self, title: str, prompt: str) -> Optional[str]: ... - def numinput(self, title: str, prompt: str, default: Optional[float] = ..., minval: Optional[float] = ..., maxval: Optional[float] = ...) -> Optional[float]: ... + def numinput( + self, + title: str, + prompt: str, + default: Optional[float] = ..., + minval: Optional[float] = ..., + maxval: Optional[float] = ..., + ) -> Optional[float]: ... class Terminator(Exception): ... class TurtleGraphicsError(Exception): ... @@ -142,7 +150,6 @@ setposition = goto seth = setheading - class TPen(object): def __init__(self, resizemode: str = ...) -> None: ... @overload @@ -187,10 +194,21 @@ @overload def pen(self) -> _PenState: ... # type: ignore @overload - def pen(self, pen: Optional[_PenState] = ..., *, - shown: bool = ..., pendown: bool = ..., pencolor: _Color = ..., fillcolor: _Color = ..., - pensize: int = ..., speed: int = ..., resizemode: str = ..., stretchfactor: Tuple[float, float] = ..., - outline: int = ..., tilt: float = ...) -> None: ... + def pen( + self, + pen: Optional[_PenState] = ..., + *, + shown: bool = ..., + pendown: bool = ..., + pencolor: _Color = ..., + fillcolor: _Color = ..., + pensize: int = ..., + speed: int = ..., + resizemode: str = ..., + stretchfactor: Tuple[float, float] = ..., + outline: int = ..., + tilt: float = ..., + ) -> None: ... width = pensize up = penup pu = penup @@ -199,10 +217,12 @@ st = showturtle ht = hideturtle -_T = TypeVar('_T') +_T = TypeVar("_T") class RawTurtle(TPen, TNavigator): - def __init__(self, canvas: Union[Canvas, TurtleScreen, None] = ..., shape: str = ..., undobuffersize: int = ..., visible: bool = ...) -> None: ... + def __init__( + self, canvas: Union[Canvas, TurtleScreen, None] = ..., shape: str = ..., undobuffersize: int = ..., visible: bool = ... + ) -> None: ... def reset(self) -> None: ... def setundobuffer(self, size: Optional[int]) -> None: ... def undobufferentries(self) -> int: ... @@ -216,7 +236,9 @@ @overload def shapesize(self) -> Tuple[float, float, float]: ... # type: ignore @overload - def shapesize(self, stretch_wid: Optional[float] = ..., stretch_len: Optional[float] = ..., outline: Optional[float] = ...) -> None: ... + def shapesize( + self, stretch_wid: Optional[float] = ..., stretch_len: Optional[float] = ..., outline: Optional[float] = ... + ) -> None: ... if sys.version_info >= (3,): @overload def shearfactor(self, shear: None = ...) -> float: ... @@ -226,7 +248,9 @@ @overload def shapetransform(self) -> Tuple[float, float, float, float]: ... # type: ignore @overload - def shapetransform(self, t11: Optional[float] = ..., t12: Optional[float] = ..., t21: Optional[float] = ..., t22: Optional[float] = ...) -> None: ... + def shapetransform( + self, t11: Optional[float] = ..., t12: Optional[float] = ..., t21: Optional[float] = ..., t22: Optional[float] = ... + ) -> None: ... def get_shapepoly(self) -> Optional[_PolygonCoords]: ... def settiltangle(self, angle: float) -> None: ... @overload @@ -265,7 +289,7 @@ width: Union[int, float] = ..., height: Union[int, float] = ..., startx: Optional[int] = ..., - starty: Optional[int] = ... + starty: Optional[int] = ..., ) -> None: ... def title(self, titlestring: str) -> None: ... def bye(self) -> None: ... @@ -295,9 +319,12 @@ # Note: mainloop() was always present in the global scope, but was added to # TurtleScreenBase in Python 3.0 def mainloop() -> None: ... + if sys.version_info >= (3,): def textinput(title: str, prompt: str) -> Optional[str]: ... - def numinput(title: str, prompt: str, default: Optional[float] = ..., minval: Optional[float] = ..., maxval: Optional[float] = ...) -> Optional[float]: ... + def numinput( + title: str, prompt: str, default: Optional[float] = ..., minval: Optional[float] = ..., maxval: Optional[float] = ... + ) -> Optional[float]: ... # Functions copied from TurtleScreen: @@ -345,6 +372,7 @@ def screensize(canvwidth: None = ..., canvheight: None = ..., bg: None = ...) -> Tuple[int, int]: ... @overload def screensize(canvwidth: int, canvheight: int, bg: Optional[_Color] = ...) -> None: ... + onscreenclick = onclick resetscreen = reset clearscreen = clear @@ -382,6 +410,7 @@ def heading() -> float: ... def setheading(to_angle: float) -> None: ... def circle(radius: float, extent: Optional[float] = ..., steps: Optional[int] = ...) -> None: ... + fd = forward bk = back backward = back @@ -393,7 +422,6 @@ seth = setheading # Functions copied from TPen: - @overload def resizemode(rmode: None = ...) -> str: ... @overload @@ -432,14 +460,26 @@ def showturtle() -> None: ... def hideturtle() -> None: ... def isvisible() -> bool: ... + # Note: signatures 1 and 2 overlap unsafely when no arguments are provided @overload def pen() -> _PenState: ... # type: ignore @overload -def pen(pen: Optional[_PenState] = ..., *, - shown: bool = ..., pendown: bool = ..., pencolor: _Color = ..., fillcolor: _Color = ..., - pensize: int = ..., speed: int = ..., resizemode: str = ..., stretchfactor: Tuple[float, float] = ..., - outline: int = ..., tilt: float = ...) -> None: ... +def pen( + pen: Optional[_PenState] = ..., + *, + shown: bool = ..., + pendown: bool = ..., + pencolor: _Color = ..., + fillcolor: _Color = ..., + pensize: int = ..., + speed: int = ..., + resizemode: str = ..., + stretchfactor: Tuple[float, float] = ..., + outline: int = ..., + tilt: float = ..., +) -> None: ... + width = pensize up = penup pu = penup @@ -456,11 +496,13 @@ def shape(name: None = ...) -> str: ... @overload def shape(name: str) -> None: ... + # Unsafely overlaps when no arguments are provided @overload def shapesize() -> Tuple[float, float, float]: ... # type: ignore @overload def shapesize(stretch_wid: Optional[float] = ..., stretch_len: Optional[float] = ..., outline: Optional[float] = ...) -> None: ... + if sys.version_info >= (3,): @overload def shearfactor(shear: None = ...) -> float: ... @@ -470,14 +512,18 @@ @overload def shapetransform() -> Tuple[float, float, float, float]: ... # type: ignore @overload - def shapetransform(t11: Optional[float] = ..., t12: Optional[float] = ..., t21: Optional[float] = ..., t22: Optional[float] = ...) -> None: ... + def shapetransform( + t11: Optional[float] = ..., t12: Optional[float] = ..., t21: Optional[float] = ..., t22: Optional[float] = ... + ) -> None: ... def get_shapepoly() -> Optional[_PolygonCoords]: ... + def settiltangle(angle: float) -> None: ... @overload def tiltangle(angle: None = ...) -> float: ... @overload def tiltangle(angle: float) -> None: ... def tilt(angle: float) -> None: ... + # Can return either 'int' or Tuple[int, ...] based on if the stamp is # a compound stamp or not. So, as per the "no Union return" policy, # we return Any. @@ -494,10 +540,13 @@ def get_poly() -> Optional[_PolygonCoords]: ... def getscreen() -> TurtleScreen: ... def getturtle() -> Turtle: ... + getpen = getturtle + def onrelease(fun: Callable[[float, float], Any], btn: int = ..., add: Optional[Any] = ...) -> None: ... def ondrag(fun: Callable[[float, float], Any], btn: int = ..., add: Optional[Any] = ...) -> None: ... def undo() -> None: ... + turtlesize = shapesize # Functions copied from RawTurtle with a few tweaks: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -12,17 +12,46 @@ # If on Python versions < 3.10 and "from __future__ import annotations" # is not used, types from this module must be quoted. +import array +import mmap import sys -from typing import Protocol, Text, TypeVar, Union -from typing_extensions import Literal +from typing import AbstractSet, Any, Container, Iterable, Protocol, Text, Tuple, TypeVar, Union +from typing_extensions import Literal, final +_KT = TypeVar("_KT") +_KT_co = TypeVar("_KT_co", covariant=True) +_KT_contra = TypeVar("_KT_contra", contravariant=True) +_VT = TypeVar("_VT") +_VT_co = TypeVar("_VT_co", covariant=True) _T_co = TypeVar("_T_co", covariant=True) _T_contra = TypeVar("_T_contra", contravariant=True) +class SupportsLessThan(Protocol): + def __lt__(self, __other: Any) -> bool: ... + +SupportsLessThanT = TypeVar("SupportsLessThanT", bound=SupportsLessThan) # noqa: Y001 + +# Mapping-like protocols + +class SupportsItems(Protocol[_KT_co, _VT_co]): + def items(self) -> AbstractSet[Tuple[_KT_co, _VT_co]]: ... + +class SupportsKeysAndGetItem(Protocol[_KT, _VT_co]): + def keys(self) -> Iterable[_KT]: ... + def __getitem__(self, __k: _KT) -> _VT_co: ... + +class SupportsGetItem(Container[_KT_contra], Protocol[_KT_contra, _VT_co]): + def __getitem__(self, __k: _KT_contra) -> _VT_co: ... + +class SupportsItemAccess(SupportsGetItem[_KT_contra, _VT], Protocol[_KT_contra, _VT]): + def __setitem__(self, __k: _KT_contra, __v: _VT) -> None: ... + def __delitem__(self, __v: _KT_contra) -> None: ... + # StrPath and AnyPath can be used in places where a # path can be used instead of a string, starting with Python 3.6. if sys.version_info >= (3, 6): from os import PathLike + StrPath = Union[str, PathLike[str]] BytesPath = Union[bytes, PathLike[bytes]] AnyPath = Union[str, bytes, PathLike[str], PathLike[bytes]] @@ -32,27 +61,88 @@ AnyPath = Union[Text, bytes] OpenTextMode = Literal[ - 'r', 'r+', '+r', 'rt', 'tr', 'rt+', 'r+t', '+rt', 'tr+', 't+r', '+tr', - 'w', 'w+', '+w', 'wt', 'tw', 'wt+', 'w+t', '+wt', 'tw+', 't+w', '+tw', - 'a', 'a+', '+a', 'at', 'ta', 'at+', 'a+t', '+at', 'ta+', 't+a', '+ta', - 'x', 'x+', '+x', 'xt', 'tx', 'xt+', 'x+t', '+xt', 'tx+', 't+x', '+tx', - 'U', 'rU', 'Ur', 'rtU', 'rUt', 'Urt', 'trU', 'tUr', 'Utr', + "r", + "r+", + "+r", + "rt", + "tr", + "rt+", + "r+t", + "+rt", + "tr+", + "t+r", + "+tr", + "w", + "w+", + "+w", + "wt", + "tw", + "wt+", + "w+t", + "+wt", + "tw+", + "t+w", + "+tw", + "a", + "a+", + "+a", + "at", + "ta", + "at+", + "a+t", + "+at", + "ta+", + "t+a", + "+ta", + "x", + "x+", + "+x", + "xt", + "tx", + "xt+", + "x+t", + "+xt", + "tx+", + "t+x", + "+tx", + "U", + "rU", + "Ur", + "rtU", + "rUt", + "Urt", + "trU", + "tUr", + "Utr", ] OpenBinaryModeUpdating = Literal[ - 'rb+', 'r+b', '+rb', 'br+', 'b+r', '+br', - 'wb+', 'w+b', '+wb', 'bw+', 'b+w', '+bw', - 'ab+', 'a+b', '+ab', 'ba+', 'b+a', '+ba', - 'xb+', 'x+b', '+xb', 'bx+', 'b+x', '+bx', -] -OpenBinaryModeWriting = Literal[ - 'wb', 'bw', - 'ab', 'ba', - 'xb', 'bx', -] -OpenBinaryModeReading = Literal[ - 'rb', 'br', - 'rbU', 'rUb', 'Urb', 'brU', 'bUr', 'Ubr', + "rb+", + "r+b", + "+rb", + "br+", + "b+r", + "+br", + "wb+", + "w+b", + "+wb", + "bw+", + "b+w", + "+bw", + "ab+", + "a+b", + "+ab", + "ba+", + "b+a", + "+ba", + "xb+", + "x+b", + "+xb", + "bx+", + "b+x", + "+bx", ] +OpenBinaryModeWriting = Literal["wb", "bw", "ab", "ba", "xb", "bx"] +OpenBinaryModeReading = Literal["rb", "br", "rbU", "rUb", "Urb", "brU", "bUr", "Ubr"] OpenBinaryMode = Union[OpenBinaryModeUpdating, OpenBinaryModeReading, OpenBinaryModeWriting] class HasFileno(Protocol): @@ -63,7 +153,24 @@ class SupportsRead(Protocol[_T_co]): def read(self, __length: int = ...) -> _T_co: ... + class SupportsReadline(Protocol[_T_co]): def readline(self, __length: int = ...) -> _T_co: ... + +class SupportsNoArgReadline(Protocol[_T_co]): + def readline(self) -> _T_co: ... + class SupportsWrite(Protocol[_T_contra]): def write(self, __s: _T_contra) -> int: ... + +if sys.version_info >= (3,): + ReadableBuffer = Union[bytes, bytearray, memoryview, array.array, mmap.mmap] + WriteableBuffer = Union[bytearray, memoryview, array.array, mmap.mmap] +else: + ReadableBuffer = Union[bytes, bytearray, memoryview, array.array, mmap.mmap, buffer] + WriteableBuffer = Union[bytearray, memoryview, array.array, mmap.mmap, buffer] + +# Used by type checkers for checks involving None (does not exist at runtime) +@final +class NoneType: + def __bool__(self) -> Literal[False]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/wsgi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/wsgi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/wsgi.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/wsgi.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -4,10 +4,12 @@ # file. They are provided for type checking purposes. from sys import _OptExcInfo -from typing import Callable, Dict, Iterable, List, Any, Text, Protocol, Tuple, Optional +from typing import Any, Callable, Dict, Iterable, List, Optional, Protocol, Text, Tuple class StartResponse(Protocol): - def __call__(self, status: str, headers: List[Tuple[str, str]], exc_info: Optional[_OptExcInfo] = ...) -> Callable[[bytes], Any]: ... + def __call__( + self, status: str, headers: List[Tuple[str, str]], exc_info: Optional[_OptExcInfo] = ... + ) -> Callable[[bytes], Any]: ... WSGIEnvironment = Dict[Text, Any] WSGIApplication = Callable[[WSGIEnvironment, StartResponse], Iterable[bytes]] @@ -27,6 +29,7 @@ class _Readable(Protocol): def read(self, size: int = ...) -> bytes: ... + # Optional file wrapper in wsgi.file_wrapper class FileWrapper(Protocol): def __call__(self, file: _Readable, block_size: int = ...) -> Iterable[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/xml.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/xml.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/xml.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_typeshed/xml.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,10 @@ +# Stub-only types. This module does not exist at runtime. + +from typing import Any, Optional +from typing_extensions import Protocol + +# As defined https://docs.python.org/3/library/xml.dom.html#domimplementation-objects +class DOMImplementation(Protocol): + def hasFeature(self, feature: str, version: Optional[str]) -> bool: ... + def createDocument(self, namespaceUri: str, qualifiedName: str, doctype: Optional[Any]) -> Any: ... + def createDocumentType(self, qualifiedName: str, publicId: str, systemId: str) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/uuid.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/uuid.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/uuid.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/uuid.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for uuid - import sys -from typing import Tuple, Optional, Any, Text +from typing import Any, Optional, Text, Tuple # Because UUID has properties called int and bytes we need to rename these temporarily. _Int = int @@ -15,26 +13,31 @@ unsafe: int unknown: None - class UUID: if sys.version_info >= (3, 7): - def __init__(self, hex: Optional[Text] = ..., - bytes: Optional[_Bytes] = ..., - bytes_le: Optional[_Bytes] = ..., - fields: Optional[_FieldsType] = ..., - int: Optional[_Int] = ..., - version: Optional[_Int] = ..., - *, - is_safe: SafeUUID = ...) -> None: ... + def __init__( + self, + hex: Optional[Text] = ..., + bytes: Optional[_Bytes] = ..., + bytes_le: Optional[_Bytes] = ..., + fields: Optional[_FieldsType] = ..., + int: Optional[_Int] = ..., + version: Optional[_Int] = ..., + *, + is_safe: SafeUUID = ..., + ) -> None: ... @property def is_safe(self) -> SafeUUID: ... else: - def __init__(self, hex: Optional[Text] = ..., - bytes: Optional[_Bytes] = ..., - bytes_le: Optional[_Bytes] = ..., - fields: Optional[_FieldsType] = ..., - int: Optional[_Int] = ..., - version: Optional[_Int] = ...) -> None: ... + def __init__( + self, + hex: Optional[Text] = ..., + bytes: Optional[_Bytes] = ..., + bytes_le: Optional[_Bytes] = ..., + fields: Optional[_FieldsType] = ..., + int: Optional[_Int] = ..., + version: Optional[_Int] = ..., + ) -> None: ... @property def bytes(self) -> _Bytes: ... @property @@ -67,9 +70,7 @@ def variant(self) -> str: ... @property def version(self) -> Optional[_Int]: ... - def __int__(self) -> _Int: ... - if sys.version_info >= (3,): def __eq__(self, other: Any) -> bool: ... def __lt__(self, other: Any) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/uu.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/uu.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/uu.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/uu.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,13 +1,16 @@ -# Stubs for uu (Python 2 and 3) import sys -from typing import BinaryIO, Union, Optional, Text +from typing import BinaryIO, Optional, Text, Union _File = Union[Text, BinaryIO] class Error(Exception): ... if sys.version_info >= (3, 7): - def encode(in_file: _File, out_file: _File, name: Optional[str] = ..., mode: Optional[int] = ..., *, backtick: bool = ...) -> None: ... + def encode( + in_file: _File, out_file: _File, name: Optional[str] = ..., mode: Optional[int] = ..., *, backtick: bool = ... + ) -> None: ... + else: def encode(in_file: _File, out_file: _File, name: Optional[str] = ..., mode: Optional[int] = ...) -> None: ... + def decode(in_file: _File, out_file: Optional[_File] = ..., mode: Optional[int] = ..., quiet: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_warnings.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_warnings.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/_warnings.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/_warnings.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -12,7 +12,9 @@ if sys.version_info >= (3, 6): @overload - def warn(message: str, category: Optional[Type[Warning]] = ..., stacklevel: int = ..., source: Optional[Any] = ...) -> None: ... + def warn( + message: str, category: Optional[Type[Warning]] = ..., stacklevel: int = ..., source: Optional[Any] = ... + ) -> None: ... @overload def warn(message: Warning, category: Any = ..., stacklevel: int = ..., source: Optional[Any] = ...) -> None: ... @overload @@ -37,6 +39,7 @@ module_globals: Optional[Dict[str, Any]] = ..., source: Optional[Any] = ..., ) -> None: ... + else: @overload def warn(message: str, category: Optional[Type[Warning]] = ..., stacklevel: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/warnings.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/warnings.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/warnings.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/warnings.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,15 +1,21 @@ import sys from types import ModuleType, TracebackType -from typing import Any, List, NamedTuple, Optional, TextIO, Type, overload - +from typing import Any, List, Optional, TextIO, Type, Union, overload from typing_extensions import Literal from _warnings import warn as warn, warn_explicit as warn_explicit def showwarning( - message: str, category: Type[Warning], filename: str, lineno: int, file: Optional[TextIO] = ..., line: Optional[str] = ... + message: Union[Warning, str], + category: Type[Warning], + filename: str, + lineno: int, + file: Optional[TextIO] = ..., + line: Optional[str] = ..., ) -> None: ... -def formatwarning(message: str, category: Type[Warning], filename: str, lineno: int, line: Optional[str] = ...) -> str: ... +def formatwarning( + message: Union[Warning, str], category: Type[Warning], filename: str, lineno: int, line: Optional[str] = ... +) -> str: ... def filterwarnings( action: str, message: str = ..., category: Type[Warning] = ..., module: str = ..., lineno: int = ..., append: bool = ... ) -> None: ... @@ -19,7 +25,7 @@ class _OptionError(Exception): ... class WarningMessage: - message: Warning + message: Union[Warning, str] category: Type[Warning] filename: str lineno: int @@ -29,7 +35,7 @@ source: Optional[Any] def __init__( self, - message: Warning, + message: Union[Warning, str], category: Type[Warning], filename: str, lineno: int, @@ -40,7 +46,7 @@ else: def __init__( self, - message: Warning, + message: Union[Warning, str], category: Type[Warning], filename: str, lineno: int, diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wave.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wave.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wave.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wave.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,5 @@ -# Stubs for wave (Python 2 and 3) - import sys -from typing import ( - Any, NamedTuple, NoReturn, Optional, Text, BinaryIO, Union, Tuple, IO -) +from typing import IO, Any, BinaryIO, NamedTuple, NoReturn, Optional, Text, Tuple, Union _File = Union[Text, IO[bytes]] @@ -72,5 +68,6 @@ # Returns a Wave_read if mode is rb and Wave_write if mode is wb def open(f: _File, mode: Optional[str] = ...) -> Any: ... + if sys.version_info < (3, 9): openfp = open diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/webbrowser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/webbrowser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/webbrowser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/webbrowser.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,18 @@ import sys -from typing import Any, Optional, Callable, List, Text, Union, Sequence +from typing import Callable, List, Optional, Sequence, Text, Union class Error(Exception): ... if sys.version_info >= (3, 7): - def register(name: Text, klass: Optional[Callable[[], BaseBrowser]], instance: Optional[BaseBrowser] = ..., *, preferred: bool = ...) -> None: ... + def register( + name: Text, klass: Optional[Callable[[], BaseBrowser]], instance: Optional[BaseBrowser] = ..., *, preferred: bool = ... + ) -> None: ... + else: - def register(name: Text, klass: Optional[Callable[[], BaseBrowser]], instance: Optional[BaseBrowser] = ..., update_tryorder: int = ...) -> None: ... + def register( + name: Text, klass: Optional[Callable[[], BaseBrowser]], instance: Optional[BaseBrowser] = ..., update_tryorder: int = ... + ) -> None: ... + def get(using: Optional[Text] = ...) -> BaseBrowser: ... def open(url: Text, new: int = ..., autoraise: bool = ...) -> bool: ... def open_new(url: Text) -> bool: ... @@ -85,16 +91,15 @@ class Grail(BaseBrowser): def open(self, url: Text, new: int = ..., autoraise: bool = ...) -> bool: ... -if sys.platform == 'win32': +if sys.platform == "win32": class WindowsDefault(BaseBrowser): def open(self, url: Text, new: int = ..., autoraise: bool = ...) -> bool: ... -if sys.platform == 'darwin': +if sys.platform == "darwin": class MacOSX(BaseBrowser): name: str def __init__(self, name: Text) -> None: ... def open(self, url: Text, new: int = ..., autoraise: bool = ...) -> bool: ... - class MacOSXOSAScript(BaseBrowser): def __init__(self, name: Text) -> None: ... def open(self, url: Text, new: int = ..., autoraise: bool = ...) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/winsound.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/winsound.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/winsound.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/winsound.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -18,7 +18,6 @@ MB_ICONHAND: int MB_ICONQUESTION: int MB_OK: int - def Beep(frequency: int, duration: int) -> None: ... # Can actually accept anything ORed with 4, and if not it's definitely str, but that's inexpressible @overload diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/handlers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/handlers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/handlers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/handlers.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,17 +1,16 @@ import sys from abc import abstractmethod from types import TracebackType -from typing import Optional, Dict, MutableMapping, Type, Text, Callable, List, Tuple, IO +from typing import IO, Callable, Dict, List, MutableMapping, Optional, Text, Tuple, Type from .headers import Headers -from .types import WSGIApplication, WSGIEnvironment, StartResponse, InputStream, ErrorStream -from .util import FileWrapper, guess_scheme +from .types import ErrorStream, InputStream, StartResponse, WSGIApplication, WSGIEnvironment +from .util import FileWrapper -_exc_info = Tuple[Optional[Type[BaseException]], - Optional[BaseException], - Optional[TracebackType]] +_exc_info = Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]] def format_date_time(timestamp: Optional[float]) -> str: ... # undocumented + if sys.version_info >= (3, 2): def read_environ() -> Dict[str, str]: ... @@ -34,15 +33,15 @@ error_status: str error_headers: List[Tuple[Text, Text]] error_body: bytes - def run(self, application: WSGIApplication) -> None: ... - def setup_environ(self) -> None: ... def finish_response(self) -> None: ... def get_scheme(self) -> str: ... def set_content_length(self) -> None: ... def cleanup_headers(self) -> None: ... - def start_response(self, status: Text, headers: List[Tuple[Text, Text]], exc_info: Optional[_exc_info] = ...) -> Callable[[bytes], None]: ... + def start_response( + self, status: Text, headers: List[Tuple[Text, Text]], exc_info: Optional[_exc_info] = ... + ) -> Callable[[bytes], None]: ... def send_preamble(self) -> None: ... def write(self, data: bytes) -> None: ... def sendfile(self) -> bool: ... @@ -54,7 +53,6 @@ def log_exception(self, exc_info: _exc_info) -> None: ... def handle_error(self) -> None: ... def error_output(self, environ: WSGIEnvironment, start_response: StartResponse) -> List[bytes]: ... - @abstractmethod def _write(self, data: bytes) -> None: ... @abstractmethod @@ -71,7 +69,15 @@ stdout: IO[bytes] stderr: ErrorStream base_env: MutableMapping[str, str] - def __init__(self, stdin: InputStream, stdout: IO[bytes], stderr: ErrorStream, environ: MutableMapping[str, str], multithread: bool = ..., multiprocess: bool = ...) -> None: ... + def __init__( + self, + stdin: InputStream, + stdout: IO[bytes], + stderr: ErrorStream, + environ: MutableMapping[str, str], + multithread: bool = ..., + multiprocess: bool = ..., + ) -> None: ... def get_stdin(self) -> InputStream: ... def get_stderr(self) -> ErrorStream: ... def add_cgi_vars(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/headers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/headers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/headers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/headers.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ import sys -from typing import overload, Pattern, Optional, List, Tuple +from typing import List, Optional, Pattern, Tuple, overload _HeaderList = List[Tuple[str, str]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/simple_server.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/simple_server.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/simple_server.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/simple_server.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,13 +1,13 @@ import sys -from typing import Optional, List, Type, TypeVar, overload +from typing import List, Optional, Type, TypeVar, overload from .handlers import SimpleHandler -from .types import WSGIApplication, WSGIEnvironment, StartResponse, ErrorStream +from .types import ErrorStream, StartResponse, WSGIApplication, WSGIEnvironment if sys.version_info < (3,): from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer else: - from http.server import HTTPServer, BaseHTTPRequestHandler + from http.server import BaseHTTPRequestHandler, HTTPServer server_version: str # undocumented sys_version: str # undocumented @@ -33,8 +33,9 @@ def demo_app(environ: WSGIEnvironment, start_response: StartResponse) -> List[bytes]: ... _S = TypeVar("_S", bound=WSGIServer) - @overload def make_server(host: str, port: int, app: WSGIApplication, *, handler_class: Type[WSGIRequestHandler] = ...) -> WSGIServer: ... @overload -def make_server(host: str, port: int, app: WSGIApplication, server_class: Type[_S], handler_class: Type[WSGIRequestHandler] = ...) -> _S: ... +def make_server( + host: str, port: int, app: WSGIApplication, server_class: Type[_S], handler_class: Type[WSGIRequestHandler] = ... +) -> _S: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/validate.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/validate.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/validate.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/wsgiref/validate.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,6 @@ import sys -from typing import Any, Iterable, Iterator, Optional, NoReturn, Callable - -from _typeshed.wsgi import WSGIApplication, InputStream, ErrorStream +from _typeshed.wsgi import ErrorStream, InputStream, WSGIApplication +from typing import Any, Callable, Iterable, Iterator, NoReturn, Optional class WSGIWarning(Warning): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/domreg.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/domreg.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/domreg.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/domreg.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,10 @@ +from _typeshed.xml import DOMImplementation +from typing import Any, Callable, Dict, Iterable, Optional, Tuple, Union + +well_known_implementations: Dict[str, str] +registered: Dict[str, Callable[[], DOMImplementation]] + +def registerDOMImplementation(name: str, factory: Callable[[], DOMImplementation]) -> None: ... +def getDOMImplementation( + name: Optional[str] = ..., features: Union[str, Iterable[Tuple[str, Optional[str]]]] = ... +) -> DOMImplementation: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,3 +1,7 @@ +from typing import Any + +from .domreg import getDOMImplementation as getDOMImplementation, registerDOMImplementation as registerDOMImplementation + class Node: ELEMENT_NODE: int ATTRIBUTE_NODE: int @@ -12,7 +16,6 @@ DOCUMENT_FRAGMENT_NODE: int NOTATION_NODE: int - # ExceptionCode INDEX_SIZE_ERR: int DOMSTRING_SIZE_ERR: int @@ -31,11 +34,9 @@ INVALID_ACCESS_ERR: int VALIDATION_ERR: int - class DOMException(Exception): code: int - - def __init__(self, *args, **kw) -> None: ... + def __init__(self, *args: Any, **kw: Any) -> None: ... def _get_code(self) -> int: ... class IndexSizeErr(DOMException): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/NodeFilter.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/NodeFilter.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/NodeFilter.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/dom/NodeFilter.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -16,5 +16,4 @@ SHOW_DOCUMENT_TYPE: int SHOW_DOCUMENT_FRAGMENT: int SHOW_NOTATION: int - def acceptNode(self, node) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/cElementTree.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/cElementTree.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/cElementTree.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/cElementTree.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,3 +1 @@ -# Stubs for xml.etree.cElementTree (Python 3.4) - from xml.etree.ElementTree import * # noqa: F403 diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementInclude.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementInclude.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementInclude.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementInclude.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ import sys -from typing import Union, Optional, Callable +from typing import Callable, Optional, Union from xml.etree.ElementTree import Element XINCLUDE: str @@ -14,6 +14,12 @@ # same signature as default_loader. But default_loader has a keyword argument # Which can't be represented using Callable... if sys.version_info >= (3, 9): - def include(elem: Element, loader: Optional[Callable[..., Union[str, Element]]] = ..., base_url: Optional[str] = ..., max_depth: Optional[int] = ...) -> None: ... + def include( + elem: Element, + loader: Optional[Callable[..., Union[str, Element]]] = ..., + base_url: Optional[str] = ..., + max_depth: Optional[int] = ..., + ) -> None: ... + else: def include(elem: Element, loader: Optional[Callable[..., Union[str, Element]]] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementPath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementPath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementPath.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementPath.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ -# Stubs for xml.etree.ElementPath (Python 3.4) - -from typing import Pattern, Dict, Generator, Tuple, List, Union, TypeVar, Callable, Optional +from typing import Callable, Dict, Generator, List, Optional, Pattern, Tuple, TypeVar, Union from xml.etree.ElementTree import Element xpath_tokenizer_re: Pattern[str] @@ -25,9 +23,11 @@ root: Element def __init__(self, root: Element) -> None: ... -_T = TypeVar('_T') +_T = TypeVar("_T") def iterfind(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> List[Element]: ... def find(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> Optional[Element]: ... def findall(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> List[Element]: ... -def findtext(elem: Element, path: str, default: Optional[_T] = ..., namespaces: Optional[Dict[str, str]] = ...) -> Union[_T, str]: ... +def findtext( + elem: Element, path: str, default: Optional[_T] = ..., namespaces: Optional[Dict[str, str]] = ... +) -> Union[_T, str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementTree.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementTree.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementTree.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/etree/ElementTree.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,11 @@ +import sys +from _typeshed import AnyPath, FileDescriptor, SupportsWrite from typing import ( + IO, Any, Callable, Dict, Generator, - IO, ItemsView, Iterable, Iterator, @@ -18,8 +20,6 @@ Union, overload, ) -from _typeshed import AnyPath, FileDescriptor, SupportsWrite -import sys from typing_extensions import Literal VERSION: str @@ -30,7 +30,7 @@ def iselement(element: object) -> bool: ... -_T = TypeVar('_T') +_T = TypeVar("_T") # Type for parser inputs. Parser will accept any unicode/str/bytes and coerce, # and this is true in py2 and py3 (even fromstringlist() in python3 can be @@ -93,36 +93,50 @@ attrib: Dict[_str_result_type, _str_result_type] text: Optional[_str_result_type] tail: Optional[_str_result_type] - def __init__(self, tag: Union[_str_argument_type, Callable[..., Element]], attrib: Dict[_str_argument_type, _str_argument_type] = ..., **extra: _str_argument_type) -> None: ... + def __init__( + self, + tag: Union[_str_argument_type, Callable[..., Element]], + attrib: Dict[_str_argument_type, _str_argument_type] = ..., + **extra: _str_argument_type, + ) -> None: ... def append(self, __subelement: Element) -> None: ... def clear(self) -> None: ... - def copy(self) -> Element: ... def extend(self, __elements: Iterable[Element]) -> None: ... - def find(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Optional[Element]: ... - def findall(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> List[Element]: ... - @overload - def findtext(self, path: _str_argument_type, default: None = ..., namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Optional[_str_result_type]: ... - @overload - def findtext(self, path: _str_argument_type, default: _T, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Union[_T, _str_result_type]: ... + def find( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> Optional[Element]: ... + def findall( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> List[Element]: ... + @overload + def findtext( + self, + path: _str_argument_type, + default: None = ..., + namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ..., + ) -> Optional[_str_result_type]: ... + @overload + def findtext( + self, path: _str_argument_type, default: _T, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> Union[_T, _str_result_type]: ... @overload def get(self, key: _str_argument_type, default: None = ...) -> Optional[_str_result_type]: ... @overload def get(self, key: _str_argument_type, default: _T) -> Union[_str_result_type, _T]: ... - def getchildren(self) -> List[Element]: ... - def getiterator(self, tag: Optional[_str_argument_type] = ...) -> List[Element]: ... if sys.version_info >= (3, 2): def insert(self, __index: int, __subelement: Element) -> None: ... else: def insert(self, __index: int, __element: Element) -> None: ... def items(self) -> ItemsView[_str_result_type, _str_result_type]: ... def iter(self, tag: Optional[_str_argument_type] = ...) -> Generator[Element, None, None]: ... - def iterfind(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> List[Element]: ... + def iterfind( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> List[Element]: ... def itertext(self) -> Generator[_str_result_type, None, None]: ... def keys(self) -> KeysView[_str_result_type]: ... def makeelement(self, __tag: _str_argument_type, __attrib: Dict[_str_argument_type, _str_argument_type]) -> Element: ... def remove(self, __subelement: Element) -> None: ... def set(self, __key: _str_argument_type, __value: _str_argument_type) -> None: ... - def __bool__(self) -> bool: ... def __delitem__(self, i: Union[int, slice]) -> None: ... @overload def __getitem__(self, i: int) -> Element: ... @@ -133,9 +147,16 @@ def __setitem__(self, i: int, o: Element) -> None: ... @overload def __setitem__(self, s: slice, o: Iterable[Element]) -> None: ... - - -def SubElement(parent: Element, tag: _str_argument_type, attrib: Dict[_str_argument_type, _str_argument_type] = ..., **extra: _str_argument_type) -> Element: ... + if sys.version_info < (3, 9): + def getchildren(self) -> List[Element]: ... + def getiterator(self, tag: Optional[_str_argument_type] = ...) -> List[Element]: ... + +def SubElement( + parent: Element, + tag: _str_argument_type, + attrib: Dict[_str_argument_type, _str_argument_type] = ..., + **extra: _str_argument_type, +) -> Element: ... def Comment(text: Optional[_str_argument_type] = ...) -> Element: ... def ProcessingInstruction(target: _str_argument_type, text: Optional[_str_argument_type] = ...) -> Element: ... @@ -150,18 +171,48 @@ def getroot(self) -> Element: ... def parse(self, source: _file_or_filename, parser: Optional[XMLParser] = ...) -> Element: ... def iter(self, tag: Optional[_str_argument_type] = ...) -> Generator[Element, None, None]: ... - def getiterator(self, tag: Optional[_str_argument_type] = ...) -> List[Element]: ... - def find(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Optional[Element]: ... - @overload - def findtext(self, path: _str_argument_type, default: None = ..., namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Optional[_str_result_type]: ... - @overload - def findtext(self, path: _str_argument_type, default: _T, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> Union[_T, _str_result_type]: ... - def findall(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> List[Element]: ... - def iterfind(self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ...) -> List[Element]: ... + if sys.version_info < (3, 9): + def getiterator(self, tag: Optional[_str_argument_type] = ...) -> List[Element]: ... + def find( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> Optional[Element]: ... + @overload + def findtext( + self, + path: _str_argument_type, + default: None = ..., + namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ..., + ) -> Optional[_str_result_type]: ... + @overload + def findtext( + self, path: _str_argument_type, default: _T, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> Union[_T, _str_result_type]: ... + def findall( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> List[Element]: ... + def iterfind( + self, path: _str_argument_type, namespaces: Optional[Dict[_str_argument_type, _str_argument_type]] = ... + ) -> List[Element]: ... if sys.version_info >= (3, 4): - def write(self, file_or_filename: _file_or_filename, encoding: Optional[str] = ..., xml_declaration: Optional[bool] = ..., default_namespace: Optional[_str_argument_type] = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> None: ... + def write( + self, + file_or_filename: _file_or_filename, + encoding: Optional[str] = ..., + xml_declaration: Optional[bool] = ..., + default_namespace: Optional[_str_argument_type] = ..., + method: Optional[str] = ..., + *, + short_empty_elements: bool = ..., + ) -> None: ... else: - def write(self, file_or_filename: _file_or_filename, encoding: Optional[str] = ..., xml_declaration: Optional[bool] = ..., default_namespace: Optional[_str_argument_type] = ..., method: Optional[str] = ...) -> None: ... + def write( + self, + file_or_filename: _file_or_filename, + encoding: Optional[str] = ..., + xml_declaration: Optional[bool] = ..., + default_namespace: Optional[_str_argument_type] = ..., + method: Optional[str] = ..., + ) -> None: ... def write_c14n(self, file: _file_or_filename) -> None: ... def register_namespace(prefix: _str_argument_type, uri: _str_argument_type) -> None: ... @@ -197,7 +248,6 @@ default_namespace: Optional[_str_argument_type] = ..., short_empty_elements: bool = ..., ) -> Any: ... - @overload def tostringlist( element: Element, @@ -231,24 +281,37 @@ elif sys.version_info >= (3,): @overload - def tostring(element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> bytes: ... + def tostring( + element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ... + ) -> bytes: ... @overload - def tostring(element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> str: ... + def tostring( + element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ... + ) -> str: ... @overload def tostring(element: Element, encoding: str, method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> Any: ... - @overload - def tostringlist(element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> List[bytes]: ... + def tostringlist( + element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ... + ) -> List[bytes]: ... @overload - def tostringlist(element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> List[str]: ... + def tostringlist( + element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ... + ) -> List[str]: ... @overload - def tostringlist(element: Element, encoding: str, method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> List[Any]: ... + def tostringlist( + element: Element, encoding: str, method: Optional[str] = ..., *, short_empty_elements: bool = ... + ) -> List[Any]: ... + else: def tostring(element: Element, encoding: Optional[str] = ..., method: Optional[str] = ...) -> bytes: ... def tostringlist(element: Element, encoding: Optional[str] = ..., method: Optional[str] = ...) -> List[bytes]: ... + def dump(elem: Element) -> None: ... def parse(source: _file_or_filename, parser: Optional[XMLParser] = ...) -> ElementTree: ... -def iterparse(source: _file_or_filename, events: Optional[Sequence[str]] = ..., parser: Optional[XMLParser] = ...) -> Iterator[Tuple[str, Any]]: ... +def iterparse( + source: _file_or_filename, events: Optional[Sequence[str]] = ..., parser: Optional[XMLParser] = ... +) -> Iterator[Tuple[str, Any]]: ... if sys.version_info >= (3, 4): class XMLPullParser: @@ -298,17 +361,16 @@ exclude_tags: Optional[Iterable[str]] = ..., ) -> None: ... - class XMLParser: parser: Any - target: TreeBuilder + target: Any # TODO-what is entity used for??? entity: Any version: str if sys.version_info >= (3, 8): - def __init__(self, *, target: Optional[TreeBuilder] = ..., encoding: Optional[str] = ...) -> None: ... + def __init__(self, *, target: Any = ..., encoding: Optional[str] = ...) -> None: ... else: - def __init__(self, html: int = ..., target: Optional[TreeBuilder] = ..., encoding: Optional[str] = ...) -> None: ... + def __init__(self, html: int = ..., target: Any = ..., encoding: Optional[str] = ...) -> None: ... def doctype(self, __name: str, __pubid: str, __system: str) -> None: ... - def close(self) -> Element: ... + def close(self) -> Any: ... def feed(self, __data: _parser_input_type) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,7 @@ -from typing import Any, Iterable, List, NoReturn, Optional, Text, Union, IO - import sys -import xml.sax -from xml.sax.xmlreader import InputSource, Locator +from typing import IO, Any, Iterable, List, NoReturn, Optional, Text, Union from xml.sax.handler import ContentHandler, ErrorHandler +from xml.sax.xmlreader import Locator, XMLReader class SAXException(Exception): def __init__(self, msg: str, exception: Optional[Exception] = ...) -> None: ... @@ -25,14 +23,11 @@ default_parser_list: List[str] if sys.version_info >= (3, 8): - def make_parser(parser_list: Iterable[str] = ...) -> xml.sax.xmlreader.XMLReader: ... -else: - def make_parser(parser_list: List[str] = ...) -> xml.sax.xmlreader.XMLReader: ... + def make_parser(parser_list: Iterable[str] = ...) -> XMLReader: ... -def parse(source: Union[str, IO[str], IO[bytes]], handler: xml.sax.handler.ContentHandler, - errorHandler: xml.sax.handler.ErrorHandler = ...) -> None: ... - -def parseString(string: Union[bytes, Text], handler: xml.sax.handler.ContentHandler, - errorHandler: Optional[xml.sax.handler.ErrorHandler] = ...) -> None: ... +else: + def make_parser(parser_list: List[str] = ...) -> XMLReader: ... -def _create_parser(parser_name: str) -> xml.sax.xmlreader.XMLReader: ... +def parse(source: Union[str, IO[str], IO[bytes]], handler: ContentHandler, errorHandler: ErrorHandler = ...) -> None: ... +def parseString(string: Union[bytes, Text], handler: ContentHandler, errorHandler: Optional[ErrorHandler] = ...) -> None: ... +def _create_parser(parser_name: str) -> XMLReader: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/saxutils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/saxutils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/saxutils.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/saxutils.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,9 @@ import sys -from typing import Mapping, Text, Optional, Union, TextIO -from io import TextIOBase, RawIOBase -from codecs import StreamWriter, StreamReaderWriter from _typeshed import SupportsWrite - -from xml.sax import handler -from xml.sax import xmlreader +from codecs import StreamReaderWriter, StreamWriter +from io import RawIOBase, TextIOBase +from typing import Mapping, Optional, Text, Union +from xml.sax import handler, xmlreader def escape(data: Text, entities: Mapping[Text, Text] = ...) -> Text: ... def unescape(data: Text, entities: Mapping[Text, Text] = ...) -> Text: ... @@ -13,9 +11,18 @@ class XMLGenerator(handler.ContentHandler): if sys.version_info >= (3, 0): - def __init__(self, out: Optional[Union[TextIOBase, RawIOBase, StreamWriter, StreamReaderWriter, SupportsWrite[str]]] = ..., encoding: str = ..., short_empty_elements: bool = ...) -> None: ... + def __init__( + self, + out: Optional[Union[TextIOBase, RawIOBase, StreamWriter, StreamReaderWriter, SupportsWrite[str]]] = ..., + encoding: str = ..., + short_empty_elements: bool = ..., + ) -> None: ... else: - def __init__(self, out: Optional[Union[TextIOBase, RawIOBase, StreamWriter, StreamReaderWriter, SupportsWrite[str]]] = ..., encoding: Text = ...) -> None: ... + def __init__( + self, + out: Optional[Union[TextIOBase, RawIOBase, StreamWriter, StreamReaderWriter, SupportsWrite[str]]] = ..., + encoding: Text = ..., + ) -> None: ... def startDocument(self): ... def endDocument(self): ... def startPrefixMapping(self, prefix, uri): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/xmlreader.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/xmlreader.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/xmlreader.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/xml/sax/xmlreader.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,4 @@ - -from typing import Tuple, Mapping, Optional +from typing import Mapping, Optional, Tuple class XMLReader: def __init__(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipfile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipfile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipfile.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipfile.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,24 @@ -from _typeshed import StrPath -from typing import Any, Callable, Dict, IO, Iterable, Iterator, List, Optional, Protocol, Text, Tuple, Type, Union, Sequence, Pattern -from types import TracebackType import io import sys +from _typeshed import StrPath +from types import TracebackType +from typing import ( + IO, + Any, + Callable, + Dict, + Iterable, + Iterator, + List, + Optional, + Pattern, + Protocol, + Sequence, + Text, + Tuple, + Type, + Union, +) _SZI = Union[Text, ZipInfo] _DT = Tuple[int, int, int, int, int, int] @@ -32,12 +48,7 @@ name: str if sys.version_info >= (3, 7): def __init__( - self, - fileobj: IO[bytes], - mode: str, - zipinfo: ZipInfo, - pwd: Optional[bytes] = ..., - close_fileobj: bool = ..., + self, fileobj: IO[bytes], mode: str, zipinfo: ZipInfo, pwd: Optional[bytes] = ..., close_fileobj: bool = ... ) -> None: ... else: def __init__( @@ -96,7 +107,7 @@ def infolist(self) -> List[ZipInfo]: ... def namelist(self) -> List[Text]: ... def open(self, name: _SZI, mode: Text = ..., pwd: Optional[bytes] = ..., *, force_zip64: bool = ...) -> IO[bytes]: ... - def extract(self, member: _SZI, path: Optional[_SZI] = ..., pwd: Optional[bytes] = ...) -> str: ... + def extract(self, member: _SZI, path: Optional[StrPath] = ..., pwd: Optional[bytes] = ...) -> str: ... def extractall( self, path: Optional[StrPath] = ..., members: Optional[Iterable[Text]] = ..., pwd: Optional[bytes] = ... ) -> None: ... @@ -108,11 +119,23 @@ def read(self, name: _SZI, pwd: Optional[bytes] = ...) -> bytes: ... def testzip(self) -> Optional[str]: ... if sys.version_info >= (3, 7): - def write(self, filename: StrPath, arcname: Optional[StrPath] = ..., compress_type: Optional[int] = ..., compresslevel: Optional[int] = ...) -> None: ... + def write( + self, + filename: StrPath, + arcname: Optional[StrPath] = ..., + compress_type: Optional[int] = ..., + compresslevel: Optional[int] = ..., + ) -> None: ... else: def write(self, filename: StrPath, arcname: Optional[StrPath] = ..., compress_type: Optional[int] = ...) -> None: ... if sys.version_info >= (3, 7): - def writestr(self, zinfo_or_arcname: _SZI, data: Union[bytes, str], compress_type: Optional[int] = ..., compresslevel: Optional[int] = ...) -> None: ... + def writestr( + self, + zinfo_or_arcname: _SZI, + data: Union[bytes, str], + compress_type: Optional[int] = ..., + compresslevel: Optional[int] = ..., + ) -> None: ... elif sys.version_info >= (3,): def writestr(self, zinfo_or_arcname: _SZI, data: Union[bytes, str], compress_type: Optional[int] = ...) -> None: ... else: @@ -121,7 +144,12 @@ class PyZipFile(ZipFile): if sys.version_info >= (3,): def __init__( - self, file: Union[str, IO[bytes]], mode: str = ..., compression: int = ..., allowZip64: bool = ..., optimize: int = ... + self, + file: Union[str, IO[bytes]], + mode: str = ..., + compression: int = ..., + allowZip64: bool = ..., + optimize: int = ..., ) -> None: ... def writepy(self, pathname: str, basename: str = ..., filterfunc: Optional[Callable[[str], bool]] = ...) -> None: ... else: @@ -184,6 +212,9 @@ ZIP_STORED: int ZIP_DEFLATED: int +ZIP64_LIMIT: int +ZIP_FILECOUNT_LIMIT: int +ZIP_MAX_COMMENT: int if sys.version_info >= (3, 3): ZIP_BZIP2: int ZIP_LZMA: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipimport.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipimport.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipimport.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zipimport.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,9 +1,8 @@ -"""Stub file for the 'zipimport' module.""" - import os import sys -from typing import Any, List, Optional, Tuple, Union from types import CodeType, ModuleType +from typing import Any, List, Optional, Tuple, Union + if sys.version_info >= (3, 7): from importlib.abc import ResourceReader @@ -17,7 +16,9 @@ else: def __init__(self, path: Union[str, bytes]) -> None: ... if sys.version_info >= (3,): - def find_loader(self, fullname: str, path: Optional[str] = ...) -> Tuple[Optional[zipimporter], List[str]]: ... # undocumented + def find_loader( + self, fullname: str, path: Optional[str] = ... + ) -> Tuple[Optional[zipimporter], List[str]]: ... # undocumented def find_module(self, fullname: str, path: Optional[str] = ...) -> Optional[zipimporter]: ... def get_code(self, fullname: str) -> CodeType: ... def get_data(self, pathname: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/2and3/zlib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/2and3/zlib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,6 @@ -# Stubs for zlib import sys from array import array -from typing import Union, Any +from typing import Any, Union DEFLATED: int DEF_MEM_LEVEL: int @@ -23,13 +22,11 @@ class error(Exception): ... - class _Compress: def compress(self, data: bytes) -> bytes: ... def flush(self, mode: int = ...) -> bytes: ... def copy(self) -> _Compress: ... - class _Decompress: unused_data: bytes unconsumed_tail: bytes @@ -39,19 +36,24 @@ def flush(self, length: int = ...) -> bytes: ... def copy(self) -> _Decompress: ... - def adler32(__data: bytes, __value: int = ...) -> int: ... def compress(__data: bytes, level: int = ...) -> bytes: ... + if sys.version_info >= (3,): - def compressobj(level: int = ..., method: int = ..., wbits: int = ..., - memLevel: int = ..., strategy: int = ..., - zdict: bytes = ...) -> _Compress: ... + def compressobj( + level: int = ..., method: int = ..., wbits: int = ..., memLevel: int = ..., strategy: int = ..., zdict: bytes = ... + ) -> _Compress: ... + else: - def compressobj(level: int = ..., method: int = ..., wbits: int = ..., - memlevel: int = ..., strategy: int = ...) -> _Compress: ... + def compressobj( + level: int = ..., method: int = ..., wbits: int = ..., memlevel: int = ..., strategy: int = ... + ) -> _Compress: ... + def crc32(__data: Union[array[Any], bytes], __value: int = ...) -> int: ... def decompress(__data: bytes, wbits: int = ..., bufsize: int = ...) -> bytes: ... + if sys.version_info >= (3,): def decompressobj(wbits: int = ..., zdict: bytes = ...) -> _Decompress: ... + else: def decompressobj(wbits: int = ...) -> _Decompress: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/abc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/abc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,15 +1,16 @@ from typing import Any, Callable, Type, TypeVar -# Stubs for abc. -_T = TypeVar('_T') -_FuncT = TypeVar('_FuncT', bound=Callable[..., Any]) +_T = TypeVar("_T") +_FuncT = TypeVar("_FuncT", bound=Callable[..., Any]) -# Thesee definitions have special processing in mypy +# These definitions have special processing in mypy class ABCMeta(type): def register(cls: ABCMeta, subclass: Type[_T]) -> Type[_T]: ... def abstractmethod(callable: _FuncT) -> _FuncT: ... + class abstractproperty(property): ... + # These two are deprecated and not supported by mypy def abstractstaticmethod(callable: _FuncT) -> _FuncT: ... def abstractclassmethod(callable: _FuncT) -> _FuncT: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ast.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ast.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ast.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ast.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -14,11 +14,19 @@ from _ast import * # type: ignore if sys.version_info >= (3, 8): - class Num(Constant): ... - class Str(Constant): ... - class Bytes(Constant): ... + class Num(Constant): + value: complex + class Str(Constant): + value: str + # Aliases for value, for backwards compatibility + s: str + class Bytes(Constant): + value: bytes + # Aliases for value, for backwards compatibility + s: bytes class NameConstant(Constant): ... class Ellipsis(Constant): ... + if sys.version_info >= (3, 9): class slice(AST): ... class ExtSlice(slice): ... @@ -41,8 +49,7 @@ def visit_Delete(self, node: Delete) -> Any: ... def visit_Assign(self, node: Assign) -> Any: ... def visit_AugAssign(self, node: AugAssign) -> Any: ... - if sys.version_info >= (3, 6): - def visit_AnnAssign(self, node: AnnAssign) -> Any: ... + def visit_AnnAssign(self, node: AnnAssign) -> Any: ... def visit_For(self, node: For) -> Any: ... def visit_AsyncFor(self, node: AsyncFor) -> Any: ... def visit_While(self, node: While) -> Any: ... @@ -77,11 +84,9 @@ def visit_YieldFrom(self, node: YieldFrom) -> Any: ... def visit_Compare(self, node: Compare) -> Any: ... def visit_Call(self, node: Call) -> Any: ... - if sys.version_info >= (3, 6): - def visit_FormattedValue(self, node: FormattedValue) -> Any: ... - def visit_JoinedStr(self, node: JoinedStr) -> Any: ... - if sys.version_info >= (3, 6): - def visit_Constant(self, node: Constant) -> Any: ... + def visit_FormattedValue(self, node: FormattedValue) -> Any: ... + def visit_JoinedStr(self, node: JoinedStr) -> Any: ... + def visit_Constant(self, node: Constant) -> Any: ... if sys.version_info >= (3, 8): def visit_NamedExpr(self, node: NamedExpr) -> Any: ... def visit_Attribute(self, node: Attribute) -> Any: ... @@ -143,7 +148,7 @@ def visit_Ellipsis(self, node: Ellipsis) -> Any: ... class NodeTransformer(NodeVisitor): - def generic_visit(self, node: AST) -> Optional[AST]: ... + def generic_visit(self, node: AST) -> AST: ... # TODO: Override the visit_* methods with better return types. # The usual return type is Optional[AST], but Iterable[AST] # is also allowed in some cases -- this needs to be mapped. @@ -180,16 +185,23 @@ def unparse(ast_obj: AST) -> str: ... def copy_location(new_node: _T, old_node: AST) -> _T: ... + if sys.version_info >= (3, 9): - def dump(node: AST, annotate_fields: bool = ..., include_attributes: bool = ..., *, indent: Union[int, str, None] = ...) -> str: ... + def dump( + node: AST, annotate_fields: bool = ..., include_attributes: bool = ..., *, indent: Union[int, str, None] = ... + ) -> str: ... + else: def dump(node: AST, annotate_fields: bool = ..., include_attributes: bool = ...) -> str: ... + def fix_missing_locations(node: _T) -> _T: ... -def get_docstring(node: AST, clean: bool = ...) -> str: ... +def get_docstring(node: AST, clean: bool = ...) -> Optional[str]: ... def increment_lineno(node: _T, n: int = ...) -> _T: ... def iter_child_nodes(node: AST) -> Iterator[AST]: ... def iter_fields(node: AST) -> Iterator[_typing.Tuple[str, Any]]: ... def literal_eval(node_or_string: Union[str, AST]) -> Any: ... + if sys.version_info >= (3, 8): def get_source_segment(source: str, node: AST, *, padded: bool = ...) -> Optional[str]: ... + def walk(node: AST) -> Iterator[AST]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_events.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_events.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_events.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_events.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,20 +1,20 @@ -from socket import socket, _Address, _RetAddress import ssl import sys -from typing import Any, Awaitable, Callable, Dict, Generator, IO, List, Optional, Sequence, Tuple, TypeVar, Union, overload -from typing_extensions import Literal +from _typeshed import FileDescriptorLike from abc import ABCMeta -from asyncio.futures import Future from asyncio.events import AbstractEventLoop, AbstractServer, Handle, TimerHandle +from asyncio.futures import Future from asyncio.protocols import BaseProtocol from asyncio.tasks import Task from asyncio.transports import BaseTransport -from _typeshed import FileDescriptorLike +from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket +from typing import IO, Any, Awaitable, Callable, Dict, Generator, List, Optional, Sequence, Tuple, TypeVar, Union, overload +from typing_extensions import Literal if sys.version_info >= (3, 7): from contextvars import Context -_T = TypeVar('_T') +_T = TypeVar("_T") _Context = Dict[str, Any] _ExceptionHandler = Callable[[AbstractEventLoop, _Context], Any] _ProtocolFactory = Callable[[], BaseProtocol] @@ -25,27 +25,24 @@ class BaseEventLoop(AbstractEventLoop, metaclass=ABCMeta): def run_forever(self) -> None: ... - # Can't use a union, see mypy issue # 1873. @overload def run_until_complete(self, future: Generator[Any, None, _T]) -> _T: ... @overload def run_until_complete(self, future: Awaitable[_T]) -> _T: ... - def stop(self) -> None: ... def is_running(self) -> bool: ... def is_closed(self) -> bool: ... def close(self) -> None: ... - if sys.version_info >= (3, 6): - async def shutdown_asyncgens(self) -> None: ... + async def shutdown_asyncgens(self) -> None: ... # Methods scheduling callbacks. All these return Handles. if sys.version_info >= (3, 7): def call_soon(self, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ...) -> Handle: ... def call_later( - self, delay: float, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ..., + self, delay: float, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ... ) -> TimerHandle: ... def call_at( - self, when: float, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ..., + self, when: float, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ... ) -> TimerHandle: ... else: def call_soon(self, callback: Callable[..., Any], *args: Any) -> Handle: ... @@ -56,30 +53,34 @@ def create_future(self) -> Future[Any]: ... # Tasks methods if sys.version_info >= (3, 8): - def create_task( - self, coro: Union[Awaitable[_T], Generator[Any, None, _T]], *, name: Optional[str] = ..., - ) -> Task[_T]: ... + def create_task(self, coro: Union[Awaitable[_T], Generator[Any, None, _T]], *, name: Optional[str] = ...) -> Task[_T]: ... else: def create_task(self, coro: Union[Awaitable[_T], Generator[Any, None, _T]]) -> Task[_T]: ... - def set_task_factory(self, factory: Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]]) -> None: ... + def set_task_factory( + self, factory: Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]] + ) -> None: ... def get_task_factory(self) -> Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]]: ... # Methods for interacting with threads if sys.version_info >= (3, 7): def call_soon_threadsafe(self, callback: Callable[..., Any], *args: Any, context: Optional[Context] = ...) -> Handle: ... else: def call_soon_threadsafe(self, callback: Callable[..., Any], *args: Any) -> Handle: ... - # run_in_executor is defined as a coroutine in AbstractEventLoop but returns a Future in concrete implementation. - # Need to ignore mypy Return type error as a result. - def run_in_executor(self, executor: Any, # type: ignore - func: Callable[..., _T], *args: Any) -> Future[_T]: ... + def run_in_executor(self, executor: Any, func: Callable[..., _T], *args: Any) -> Future[_T]: ... def set_default_executor(self, executor: Any) -> None: ... # Network I/O methods returning Futures. - # TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers - # https://github.com/python/mypy/issues/2509 - async def getaddrinfo(self, host: Optional[str], port: Union[str, int, None], *, - family: int = ..., type: int = ..., proto: int = ..., - flags: int = ...) -> List[Tuple[int, int, int, str, Tuple[Any, ...]]]: ... - async def getnameinfo(self, sockaddr: Tuple[Any, ...], flags: int = ...) -> Tuple[str, int]: ... + async def getaddrinfo( + self, + host: Optional[str], + port: Union[str, int, None], + *, + family: int = ..., + type: int = ..., + proto: int = ..., + flags: int = ..., + ) -> List[Tuple[AddressFamily, SocketKind, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]: ... + async def getnameinfo( + self, sockaddr: Union[Tuple[str, int], Tuple[str, int, int, int]], flags: int = ... + ) -> Tuple[str, str]: ... if sys.version_info >= (3, 8): @overload async def create_connection( @@ -119,74 +120,209 @@ ) -> _TransProtPair: ... elif sys.version_info >= (3, 7): @overload - async def create_connection(self, protocol_factory: _ProtocolFactory, host: str = ..., port: int = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., - sock: None = ..., local_addr: Optional[Tuple[str, int]] = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... - @overload - async def create_connection(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., - sock: socket, local_addr: None = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: str = ..., + port: int = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: None = ..., + local_addr: Optional[Tuple[str, int]] = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... + @overload + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: socket, + local_addr: None = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... else: @overload - async def create_connection(self, protocol_factory: _ProtocolFactory, host: str = ..., port: int = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., sock: None = ..., - local_addr: Optional[Tuple[str, int]] = ..., server_hostname: Optional[str] = ...) -> _TransProtPair: ... - @overload - async def create_connection(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., sock: socket, - local_addr: None = ..., server_hostname: Optional[str] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: str = ..., + port: int = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: None = ..., + local_addr: Optional[Tuple[str, int]] = ..., + server_hostname: Optional[str] = ..., + ) -> _TransProtPair: ... + @overload + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: socket, + local_addr: None = ..., + server_hostname: Optional[str] = ..., + ) -> _TransProtPair: ... if sys.version_info >= (3, 7): - async def sock_sendfile(self, sock: socket, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, - fallback: bool = ...) -> int: ... + async def sock_sendfile( + self, sock: socket, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, fallback: bool = ... + ) -> int: ... + @overload + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: Optional[Union[str, Sequence[str]]] = ..., + port: int = ..., + *, + family: int = ..., + flags: int = ..., + sock: None = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ssl_handshake_timeout: Optional[float] = ..., + start_serving: bool = ..., + ) -> Server: ... @overload - async def create_server(self, protocol_factory: _ProtocolFactory, host: Optional[Union[str, Sequence[str]]] = ..., - port: int = ..., *, family: int = ..., flags: int = ..., sock: None = ..., backlog: int = ..., - ssl: _SSLContext = ..., reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - ssl_handshake_timeout: Optional[float] = ..., start_serving: bool = ...) -> Server: ... - @overload - async def create_server(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - family: int = ..., flags: int = ..., sock: socket = ..., backlog: int = ..., - ssl: _SSLContext = ..., reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - ssl_handshake_timeout: Optional[float] = ..., start_serving: bool = ...) -> Server: ... - async def connect_accepted_socket(self, protocol_factory: _ProtocolFactory, sock: socket, *, ssl: _SSLContext = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... - async def sendfile(self, transport: BaseTransport, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, - fallback: bool = ...) -> int: ... - async def start_tls(self, transport: BaseTransport, protocol: BaseProtocol, sslcontext: ssl.SSLContext, *, - server_side: bool = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> BaseTransport: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + family: int = ..., + flags: int = ..., + sock: socket = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ssl_handshake_timeout: Optional[float] = ..., + start_serving: bool = ..., + ) -> Server: ... + async def connect_accepted_socket( + self, + protocol_factory: _ProtocolFactory, + sock: socket, + *, + ssl: _SSLContext = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... + async def sendfile( + self, + transport: BaseTransport, + file: IO[bytes], + offset: int = ..., + count: Optional[int] = ..., + *, + fallback: bool = ..., + ) -> int: ... + async def start_tls( + self, + transport: BaseTransport, + protocol: BaseProtocol, + sslcontext: ssl.SSLContext, + *, + server_side: bool = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> BaseTransport: ... else: @overload - async def create_server(self, protocol_factory: _ProtocolFactory, host: Optional[Union[str, Sequence[str]]] = ..., port: int = ..., *, - family: int = ..., flags: int = ..., - sock: None = ..., backlog: int = ..., ssl: _SSLContext = ..., - reuse_address: Optional[bool] = ..., - reuse_port: Optional[bool] = ...) -> Server: ... - @overload - async def create_server(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - family: int = ..., flags: int = ..., - sock: socket, backlog: int = ..., ssl: _SSLContext = ..., - reuse_address: Optional[bool] = ..., - reuse_port: Optional[bool] = ...) -> Server: ... - async def connect_accepted_socket(self, protocol_factory: _ProtocolFactory, sock: socket, *, ssl: _SSLContext = ...) -> _TransProtPair: ... - async def create_datagram_endpoint(self, protocol_factory: _ProtocolFactory, - local_addr: Optional[Tuple[str, int]] = ..., remote_addr: Optional[Tuple[str, int]] = ..., *, - family: int = ..., proto: int = ..., flags: int = ..., - reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - allow_broadcast: Optional[bool] = ..., - sock: Optional[socket] = ...) -> _TransProtPair: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: Optional[Union[str, Sequence[str]]] = ..., + port: int = ..., + *, + family: int = ..., + flags: int = ..., + sock: None = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ) -> Server: ... + @overload + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + family: int = ..., + flags: int = ..., + sock: socket, + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ) -> Server: ... + async def connect_accepted_socket( + self, protocol_factory: _ProtocolFactory, sock: socket, *, ssl: _SSLContext = ... + ) -> _TransProtPair: ... + async def create_datagram_endpoint( + self, + protocol_factory: _ProtocolFactory, + local_addr: Optional[Tuple[str, int]] = ..., + remote_addr: Optional[Tuple[str, int]] = ..., + *, + family: int = ..., + proto: int = ..., + flags: int = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + allow_broadcast: Optional[bool] = ..., + sock: Optional[socket] = ..., + ) -> _TransProtPair: ... # Pipes and subprocesses. async def connect_read_pipe(self, protocol_factory: _ProtocolFactory, pipe: Any) -> _TransProtPair: ... async def connect_write_pipe(self, protocol_factory: _ProtocolFactory, pipe: Any) -> _TransProtPair: ... - async def subprocess_shell(self, protocol_factory: _ProtocolFactory, cmd: Union[bytes, str], *, stdin: Any = ..., - stdout: Any = ..., stderr: Any = ..., universal_newlines: Literal[False] = ..., - shell: Literal[True] = ..., bufsize: Literal[0] = ..., encoding: None = ..., - errors: None = ..., text: Literal[False, None] = ..., **kwargs: Any) -> _TransProtPair: ... - async def subprocess_exec(self, protocol_factory: _ProtocolFactory, *args: Any, stdin: Any = ..., - stdout: Any = ..., stderr: Any = ..., - **kwargs: Any) -> _TransProtPair: ... + async def subprocess_shell( + self, + protocol_factory: _ProtocolFactory, + cmd: Union[bytes, str], + *, + stdin: Any = ..., + stdout: Any = ..., + stderr: Any = ..., + universal_newlines: Literal[False] = ..., + shell: Literal[True] = ..., + bufsize: Literal[0] = ..., + encoding: None = ..., + errors: None = ..., + text: Literal[False, None] = ..., + **kwargs: Any, + ) -> _TransProtPair: ... + async def subprocess_exec( + self, + protocol_factory: _ProtocolFactory, + *args: Any, + stdin: Any = ..., + stdout: Any = ..., + stderr: Any = ..., + **kwargs: Any, + ) -> _TransProtPair: ... def add_reader(self, fd: FileDescriptorLike, callback: Callable[..., Any], *args: Any) -> None: ... def remove_reader(self, fd: FileDescriptorLike) -> None: ... def add_writer(self, fd: FileDescriptorLike, callback: Callable[..., Any], *args: Any) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_futures.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_futures.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_futures.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_futures.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,7 +1,10 @@ -import contextvars -from typing import List, Tuple, Callable, Sequence +import sys +from typing import Any, Callable, List, Sequence, Tuple from typing_extensions import Literal +if sys.version_info >= (3, 7): + from contextvars import Context + from . import futures _PENDING: Literal["PENDING"] # undocumented @@ -9,5 +12,11 @@ _FINISHED: Literal["FINISHED"] # undocumented def isfuture(obj: object) -> bool: ... -def _format_callbacks(cb: Sequence[Tuple[Callable[[futures.Future], None], contextvars.Context]]) -> str: ... # undocumented -def _future_repr_info(future: futures.Future) -> List[str]: ... # undocumented + +if sys.version_info >= (3, 7): + def _format_callbacks(cb: Sequence[Tuple[Callable[[futures.Future[Any]], None], Context]]) -> str: ... # undocumented + +else: + def _format_callbacks(cb: Sequence[Callable[[futures.Future[Any]], None]]) -> str: ... # undocumented + +def _future_repr_info(future: futures.Future[Any]) -> List[str]: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_subprocess.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_subprocess.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_subprocess.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_subprocess.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,7 @@ - -from typing import Optional, Union, Sequence, IO, Any, List, Deque, Dict, Tuple, Callable import subprocess +from typing import IO, Any, Callable, Deque, Dict, List, Optional, Sequence, Tuple, Union -from . import events -from . import protocols -from . import futures -from . import transports +from . import events, futures, protocols, transports _File = Optional[Union[int, IO[Any]]] @@ -14,18 +10,37 @@ _closed: bool # undocumented _protocol: protocols.SubprocessProtocol # undocumented _loop: events.AbstractEventLoop # undocumented - _proc: Optional[subprocess.Popen] # undocumented + _proc: Optional[subprocess.Popen[Any]] # undocumented _pid: Optional[int] # undocumented _returncode: Optional[int] # undocumented - _exit_waiters: List[futures.Future] # undocumented + _exit_waiters: List[futures.Future[Any]] # undocumented _pending_calls: Deque[Tuple[Callable[..., Any], Tuple[Any, ...]]] # undocumented _pipes: Dict[int, _File] # undocumented _finished: bool # undocumented - - def __init__(self, loop: events.AbstractEventLoop, protocol: protocols.SubprocessProtocol, args: Union[str, bytes, Sequence[Union[str, bytes]]], - shell: bool, stdin: _File, stdout: _File, stderr: _File, bufsize: int, waiter: Optional[futures.Future] = ..., extra: Optional[Any] = ..., **kwargs: Any) -> None: ... - - def _start(self, args: Union[str, bytes, Sequence[Union[str, bytes]]], shell: bool, stdin: _File, stdout: _File, stderr: _File, bufsize: int, **kwargs: Any): ... # undocumented + def __init__( + self, + loop: events.AbstractEventLoop, + protocol: protocols.SubprocessProtocol, + args: Union[str, bytes, Sequence[Union[str, bytes]]], + shell: bool, + stdin: _File, + stdout: _File, + stderr: _File, + bufsize: int, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Any] = ..., + **kwargs: Any, + ) -> None: ... + def _start( + self, + args: Union[str, bytes, Sequence[Union[str, bytes]]], + shell: bool, + stdin: _File, + stdout: _File, + stderr: _File, + bufsize: int, + **kwargs: Any, + ) -> None: ... # undocumented def set_protocol(self, protocol: protocols.BaseProtocol) -> None: ... def get_protocol(self) -> protocols.BaseProtocol: ... def is_closing(self) -> bool: ... @@ -37,7 +52,7 @@ def send_signal(self, signal: int) -> None: ... # type: ignore def terminate(self) -> None: ... def kill(self) -> None: ... - async def _connect_pipes(self, waiter: Optional[futures.Future]) -> None: ... # undocumented + async def _connect_pipes(self, waiter: Optional[futures.Future[Any]]) -> None: ... # undocumented def _call(self, cb: Callable[..., Any], *data: Any) -> None: ... # undocumented def _pipe_connection_lost(self, fd: int, exc: Optional[BaseException]) -> None: ... # undocumented def _pipe_data_received(self, fd: int, data: bytes) -> None: ... # undocumented @@ -47,7 +62,6 @@ def _call_connection_lost(self, exc: Optional[BaseException]) -> None: ... # undocumented class WriteSubprocessPipeProto(protocols.BaseProtocol): # undocumented - def __init__(self, proc: BaseSubprocessTransport, fd: int) -> None: ... def connection_made(self, transport: transports.BaseTransport) -> None: ... def connection_lost(self, exc: Optional[BaseException]) -> None: ... @@ -55,5 +69,4 @@ def resume_writing(self) -> None: ... class ReadSubprocessPipeProto(WriteSubprocessPipeProto, protocols.Protocol): # undocumented - def data_received(self, data: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_tasks.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_tasks.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_tasks.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/base_tasks.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,8 +1,9 @@ from _typeshed import AnyPath -from typing import List, Optional from types import FrameType +from typing import Any, List, Optional + from . import tasks -def _task_repr_info(task: tasks.Task) -> List[str]: ... # undocumented -def _task_get_stack(task: tasks.Task, limit: Optional[int]) -> List[FrameType]: ... # undocumented -def _task_print_stack(task: tasks.Task, limit: Optional[int], file: AnyPath): ... # undocumented +def _task_repr_info(task: tasks.Task[Any]) -> List[str]: ... # undocumented +def _task_get_stack(task: tasks.Task[Any], limit: Optional[int]) -> List[FrameType]: ... # undocumented +def _task_print_stack(task: tasks.Task[Any], limit: Optional[int], file: AnyPath) -> None: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/compat.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/compat.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/compat.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/compat.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,4 +1,3 @@ - import sys from typing import List @@ -6,5 +5,4 @@ PY34: bool PY35: bool PY352: bool - def flatten_list_bytes(list_of_data: List[bytes]) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/constants.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/constants.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/constants.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/constants.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,9 @@ - import enum import sys LOG_THRESHOLD_FOR_CONNLOST_WRITES: int ACCEPT_RETRY_DELAY: int -if sys.version_info >= (3, 6): - DEBUG_STACK_DEPTH: int +DEBUG_STACK_DEPTH: int if sys.version_info >= (3, 7): SSL_HANDSHAKE_TIMEOUT: float SENDFILE_FALLBACK_READBUFFER_SIZE: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/coroutines.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/coroutines.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/coroutines.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/coroutines.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,6 @@ from typing import Any, Callable, TypeVar -_F = TypeVar('_F', bound=Callable[..., Any]) +_F = TypeVar("_F", bound=Callable[..., Any]) def coroutine(func: _F) -> _F: ... def iscoroutinefunction(func: Callable[..., Any]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/events.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/events.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/events.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/events.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,19 @@ -from socket import socket, _Address, _RetAddress import ssl import sys -from typing import Any, Awaitable, Callable, Dict, Generator, IO, List, Optional, Sequence, Tuple, TypeVar, Union, overload +from _typeshed import FileDescriptorLike from abc import ABCMeta, abstractmethod from asyncio.futures import Future from asyncio.protocols import BaseProtocol from asyncio.tasks import Task from asyncio.transports import BaseTransport from asyncio.unix_events import AbstractChildWatcher -from _typeshed import FileDescriptorLike +from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket +from typing import IO, Any, Awaitable, Callable, Dict, Generator, List, Optional, Sequence, Tuple, TypeVar, Union, overload if sys.version_info >= (3, 7): from contextvars import Context -_T = TypeVar('_T') +_T = TypeVar("_T") _Context = Dict[str, Any] _ExceptionHandler = Callable[[AbstractEventLoop, _Context], Any] _ProtocolFactory = Callable[[], BaseProtocol] @@ -24,7 +24,9 @@ _cancelled = False _args: Sequence[Any] if sys.version_info >= (3, 7): - def __init__(self, callback: Callable[..., Any], args: Sequence[Any], loop: AbstractEventLoop, context: Optional[Context] = ...) -> None: ... + def __init__( + self, callback: Callable[..., Any], args: Sequence[Any], loop: AbstractEventLoop, context: Optional[Context] = ... + ) -> None: ... else: def __init__(self, callback: Callable[..., Any], args: Sequence[Any], loop: AbstractEventLoop) -> None: ... def __repr__(self) -> str: ... @@ -35,11 +37,16 @@ class TimerHandle(Handle): if sys.version_info >= (3, 7): - def __init__(self, when: float, callback: Callable[..., Any], args: Sequence[Any], - loop: AbstractEventLoop, context: Optional[Context] = ...) -> None: ... + def __init__( + self, + when: float, + callback: Callable[..., Any], + args: Sequence[Any], + loop: AbstractEventLoop, + context: Optional[Context] = ..., + ) -> None: ... else: - def __init__(self, when: float, callback: Callable[..., Any], args: Sequence[Any], - loop: AbstractEventLoop) -> None: ... + def __init__(self, when: float, callback: Callable[..., Any], args: Sequence[Any], loop: AbstractEventLoop) -> None: ... def __hash__(self) -> int: ... if sys.version_info >= (3, 7): def when(self) -> float: ... @@ -60,7 +67,6 @@ slow_callback_duration: float = ... @abstractmethod def run_forever(self) -> None: ... - # Can't use a union, see mypy issue # 1873. @overload @abstractmethod @@ -68,7 +74,6 @@ @overload @abstractmethod def run_until_complete(self, future: Awaitable[_T]) -> _T: ... - @abstractmethod def stop(self) -> None: ... @abstractmethod @@ -95,33 +100,39 @@ # Tasks methods if sys.version_info >= (3, 8): @abstractmethod - def create_task( - self, coro: Union[Awaitable[_T], Generator[Any, None, _T]], *, name: Optional[str] = ..., - ) -> Task[_T]: ... + def create_task(self, coro: Union[Awaitable[_T], Generator[Any, None, _T]], *, name: Optional[str] = ...) -> Task[_T]: ... else: @abstractmethod def create_task(self, coro: Union[Awaitable[_T], Generator[Any, None, _T]]) -> Task[_T]: ... @abstractmethod - def set_task_factory(self, factory: Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]]) -> None: ... + def set_task_factory( + self, factory: Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]] + ) -> None: ... @abstractmethod def get_task_factory(self) -> Optional[Callable[[AbstractEventLoop, Generator[Any, None, _T]], Future[_T]]]: ... # Methods for interacting with threads @abstractmethod def call_soon_threadsafe(self, callback: Callable[..., Any], *args: Any) -> Handle: ... @abstractmethod - async def run_in_executor(self, executor: Any, - func: Callable[..., _T], *args: Any) -> _T: ... + def run_in_executor(self, executor: Any, func: Callable[..., _T], *args: Any) -> Awaitable[_T]: ... @abstractmethod def set_default_executor(self, executor: Any) -> None: ... # Network I/O methods returning Futures. @abstractmethod - # TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers - # https://github.com/python/mypy/issues/2509 - async def getaddrinfo(self, host: Optional[str], port: Union[str, int, None], *, - family: int = ..., type: int = ..., proto: int = ..., - flags: int = ...) -> List[Tuple[int, int, int, str, Tuple[Any, ...]]]: ... - @abstractmethod - async def getnameinfo(self, sockaddr: Tuple[Any, ...], flags: int = ...) -> Tuple[str, int]: ... + async def getaddrinfo( + self, + host: Optional[str], + port: Union[str, int, None], + *, + family: int = ..., + type: int = ..., + proto: int = ..., + flags: int = ..., + ) -> List[Tuple[AddressFamily, SocketKind, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]: ... + @abstractmethod + async def getnameinfo( + self, sockaddr: Union[Tuple[str, int], Tuple[str, int, int, int]], flags: int = ... + ) -> Tuple[str, str]: ... if sys.version_info >= (3, 8): @overload @abstractmethod @@ -164,96 +175,246 @@ elif sys.version_info >= (3, 7): @overload @abstractmethod - async def create_connection(self, protocol_factory: _ProtocolFactory, host: str = ..., port: int = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., - sock: None = ..., local_addr: Optional[Tuple[str, int]] = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: str = ..., + port: int = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: None = ..., + local_addr: Optional[Tuple[str, int]] = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... @overload @abstractmethod - async def create_connection(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., - sock: socket, local_addr: None = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: socket, + local_addr: None = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... else: @overload @abstractmethod - async def create_connection(self, protocol_factory: _ProtocolFactory, host: str = ..., port: int = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., sock: None = ..., - local_addr: Optional[Tuple[str, int]] = ..., server_hostname: Optional[str] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: str = ..., + port: int = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: None = ..., + local_addr: Optional[Tuple[str, int]] = ..., + server_hostname: Optional[str] = ..., + ) -> _TransProtPair: ... @overload @abstractmethod - async def create_connection(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - ssl: _SSLContext = ..., family: int = ..., proto: int = ..., flags: int = ..., sock: socket, - local_addr: None = ..., server_hostname: Optional[str] = ...) -> _TransProtPair: ... + async def create_connection( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + ssl: _SSLContext = ..., + family: int = ..., + proto: int = ..., + flags: int = ..., + sock: socket, + local_addr: None = ..., + server_hostname: Optional[str] = ..., + ) -> _TransProtPair: ... if sys.version_info >= (3, 7): @abstractmethod - async def sock_sendfile(self, sock: socket, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, - fallback: bool = ...) -> int: ... + async def sock_sendfile( + self, sock: socket, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, fallback: bool = ... + ) -> int: ... @overload @abstractmethod - async def create_server(self, protocol_factory: _ProtocolFactory, host: Optional[Union[str, Sequence[str]]] = ..., - port: int = ..., *, family: int = ..., flags: int = ..., sock: None = ..., backlog: int = ..., - ssl: _SSLContext = ..., reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - ssl_handshake_timeout: Optional[float] = ..., start_serving: bool = ...) -> AbstractServer: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: Optional[Union[str, Sequence[str]]] = ..., + port: int = ..., + *, + family: int = ..., + flags: int = ..., + sock: None = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ssl_handshake_timeout: Optional[float] = ..., + start_serving: bool = ..., + ) -> AbstractServer: ... @overload @abstractmethod - async def create_server(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - family: int = ..., flags: int = ..., sock: socket = ..., backlog: int = ..., - ssl: _SSLContext = ..., reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - ssl_handshake_timeout: Optional[float] = ..., start_serving: bool = ...) -> AbstractServer: ... - async def create_unix_connection(self, protocol_factory: _ProtocolFactory, path: Optional[str] = ..., *, ssl: _SSLContext = ..., - sock: Optional[socket] = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> _TransProtPair: ... - async def create_unix_server(self, protocol_factory: _ProtocolFactory, path: Optional[str] = ..., *, sock: Optional[socket] = ..., - backlog: int = ..., ssl: _SSLContext = ..., ssl_handshake_timeout: Optional[float] = ..., - start_serving: bool = ...) -> AbstractServer: ... - @abstractmethod - async def sendfile(self, transport: BaseTransport, file: IO[bytes], offset: int = ..., count: Optional[int] = ..., *, - fallback: bool = ...) -> int: ... - @abstractmethod - async def start_tls(self, transport: BaseTransport, protocol: BaseProtocol, sslcontext: ssl.SSLContext, *, - server_side: bool = ..., server_hostname: Optional[str] = ..., - ssl_handshake_timeout: Optional[float] = ...) -> BaseTransport: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + family: int = ..., + flags: int = ..., + sock: socket = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ssl_handshake_timeout: Optional[float] = ..., + start_serving: bool = ..., + ) -> AbstractServer: ... + async def create_unix_connection( + self, + protocol_factory: _ProtocolFactory, + path: Optional[str] = ..., + *, + ssl: _SSLContext = ..., + sock: Optional[socket] = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> _TransProtPair: ... + async def create_unix_server( + self, + protocol_factory: _ProtocolFactory, + path: Optional[str] = ..., + *, + sock: Optional[socket] = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + ssl_handshake_timeout: Optional[float] = ..., + start_serving: bool = ..., + ) -> AbstractServer: ... + @abstractmethod + async def sendfile( + self, + transport: BaseTransport, + file: IO[bytes], + offset: int = ..., + count: Optional[int] = ..., + *, + fallback: bool = ..., + ) -> int: ... + @abstractmethod + async def start_tls( + self, + transport: BaseTransport, + protocol: BaseProtocol, + sslcontext: ssl.SSLContext, + *, + server_side: bool = ..., + server_hostname: Optional[str] = ..., + ssl_handshake_timeout: Optional[float] = ..., + ) -> BaseTransport: ... else: @overload @abstractmethod - async def create_server(self, protocol_factory: _ProtocolFactory, host: Optional[Union[str, Sequence[str]]] = ..., port: int = ..., *, - family: int = ..., flags: int = ..., - sock: None = ..., backlog: int = ..., ssl: _SSLContext = ..., - reuse_address: Optional[bool] = ..., - reuse_port: Optional[bool] = ...) -> AbstractServer: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: Optional[Union[str, Sequence[str]]] = ..., + port: int = ..., + *, + family: int = ..., + flags: int = ..., + sock: None = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ) -> AbstractServer: ... @overload @abstractmethod - async def create_server(self, protocol_factory: _ProtocolFactory, host: None = ..., port: None = ..., *, - family: int = ..., flags: int = ..., - sock: socket, backlog: int = ..., ssl: _SSLContext = ..., - reuse_address: Optional[bool] = ..., - reuse_port: Optional[bool] = ...) -> AbstractServer: ... - async def create_unix_connection(self, protocol_factory: _ProtocolFactory, path: str, *, - ssl: _SSLContext = ..., sock: Optional[socket] = ..., - server_hostname: Optional[str] = ...) -> _TransProtPair: ... - async def create_unix_server(self, protocol_factory: _ProtocolFactory, path: str, *, - sock: Optional[socket] = ..., backlog: int = ..., ssl: _SSLContext = ...) -> AbstractServer: ... - @abstractmethod - async def create_datagram_endpoint(self, protocol_factory: _ProtocolFactory, - local_addr: Optional[Tuple[str, int]] = ..., remote_addr: Optional[Tuple[str, int]] = ..., *, - family: int = ..., proto: int = ..., flags: int = ..., - reuse_address: Optional[bool] = ..., reuse_port: Optional[bool] = ..., - allow_broadcast: Optional[bool] = ..., - sock: Optional[socket] = ...) -> _TransProtPair: ... + async def create_server( + self, + protocol_factory: _ProtocolFactory, + host: None = ..., + port: None = ..., + *, + family: int = ..., + flags: int = ..., + sock: socket, + backlog: int = ..., + ssl: _SSLContext = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + ) -> AbstractServer: ... + async def create_unix_connection( + self, + protocol_factory: _ProtocolFactory, + path: str, + *, + ssl: _SSLContext = ..., + sock: Optional[socket] = ..., + server_hostname: Optional[str] = ..., + ) -> _TransProtPair: ... + async def create_unix_server( + self, + protocol_factory: _ProtocolFactory, + path: str, + *, + sock: Optional[socket] = ..., + backlog: int = ..., + ssl: _SSLContext = ..., + ) -> AbstractServer: ... + @abstractmethod + async def create_datagram_endpoint( + self, + protocol_factory: _ProtocolFactory, + local_addr: Optional[Tuple[str, int]] = ..., + remote_addr: Optional[Tuple[str, int]] = ..., + *, + family: int = ..., + proto: int = ..., + flags: int = ..., + reuse_address: Optional[bool] = ..., + reuse_port: Optional[bool] = ..., + allow_broadcast: Optional[bool] = ..., + sock: Optional[socket] = ..., + ) -> _TransProtPair: ... # Pipes and subprocesses. @abstractmethod async def connect_read_pipe(self, protocol_factory: _ProtocolFactory, pipe: Any) -> _TransProtPair: ... @abstractmethod async def connect_write_pipe(self, protocol_factory: _ProtocolFactory, pipe: Any) -> _TransProtPair: ... @abstractmethod - async def subprocess_shell(self, protocol_factory: _ProtocolFactory, cmd: Union[bytes, str], *, stdin: Any = ..., - stdout: Any = ..., stderr: Any = ..., - **kwargs: Any) -> _TransProtPair: ... - @abstractmethod - async def subprocess_exec(self, protocol_factory: _ProtocolFactory, *args: Any, stdin: Any = ..., - stdout: Any = ..., stderr: Any = ..., - **kwargs: Any) -> _TransProtPair: ... + async def subprocess_shell( + self, + protocol_factory: _ProtocolFactory, + cmd: Union[bytes, str], + *, + stdin: Any = ..., + stdout: Any = ..., + stderr: Any = ..., + **kwargs: Any, + ) -> _TransProtPair: ... + @abstractmethod + async def subprocess_exec( + self, + protocol_factory: _ProtocolFactory, + *args: Any, + stdin: Any = ..., + stdout: Any = ..., + stderr: Any = ..., + **kwargs: Any, + ) -> _TransProtPair: ... @abstractmethod def add_reader(self, fd: FileDescriptorLike, callback: Callable[..., Any], *args: Any) -> None: ... @abstractmethod @@ -327,14 +488,11 @@ def get_event_loop_policy() -> AbstractEventLoopPolicy: ... def set_event_loop_policy(policy: Optional[AbstractEventLoopPolicy]) -> None: ... - def get_event_loop() -> AbstractEventLoop: ... def set_event_loop(loop: Optional[AbstractEventLoop]) -> None: ... def new_event_loop() -> AbstractEventLoop: ... - def get_child_watcher() -> AbstractChildWatcher: ... def set_child_watcher(watcher: AbstractChildWatcher) -> None: ... - def _set_running_loop(__loop: Optional[AbstractEventLoop]) -> None: ... def _get_running_loop() -> AbstractEventLoop: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/format_helpers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/format_helpers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/format_helpers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/format_helpers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,8 @@ - -import sys import functools +import sys import traceback - -from typing import Optional, Tuple, Union, Iterable, Dict, Any, overload -from types import FunctionType, FrameType +from types import FrameType, FunctionType +from typing import Any, Dict, Iterable, Optional, Tuple, Union, overload class _HasWrapper: __wrapper__: Union[_HasWrapper, FunctionType] @@ -12,14 +10,11 @@ _FuncType = Union[FunctionType, _HasWrapper, functools.partial, functools.partialmethod] if sys.version_info >= (3, 7): - @overload def _get_function_source(func: _FuncType) -> Tuple[str, int]: ... @overload def _get_function_source(func: object) -> Optional[Tuple[str, int]]: ... - def _format_callback_source(func: object, args: Iterable[Any]) -> str: ... def _format_args_and_kwargs(args: Iterable[Any], kwargs: Dict[str, Any]) -> str: ... def _format_callback(func: object, args: Iterable[Any], kwargs: Dict[str, Any], suffix: str = ...) -> str: ... - def extract_stack(f: Optional[FrameType] = ..., limit: Optional[int] = ...) -> traceback.StackSummary: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/futures.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/futures.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/futures.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/futures.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,21 +1,21 @@ import sys -from typing import Any, Union, Callable, TypeVar, Type, List, Iterable, Generator, Awaitable, Optional, Tuple +from concurrent.futures._base import Error, Future as _ConcurrentFuture +from typing import Any, Awaitable, Callable, Generator, Iterable, List, Optional, Tuple, Type, TypeVar, Union + from .events import AbstractEventLoop -from concurrent.futures._base import ( - Future as _ConcurrentFuture, - Error, -) if sys.version_info < (3, 8): - from concurrent.futures import CancelledError as CancelledError - from concurrent.futures import TimeoutError as TimeoutError + from concurrent.futures import CancelledError as CancelledError, TimeoutError as TimeoutError class InvalidStateError(Error): ... if sys.version_info >= (3, 7): from contextvars import Context -_T = TypeVar('_T') -_S = TypeVar('_S') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") +_S = TypeVar("_S") if sys.version_info < (3, 7): class _TracebackLogger: @@ -33,8 +33,6 @@ _exception: BaseException _blocking = False _log_traceback = False - if sys.version_info < (3, 6): - _tb_logger: Type[_TracebackLogger] def __init__(self, *, loop: Optional[AbstractEventLoop] = ...) -> None: ... def __repr__(self) -> str: ... def __del__(self) -> None: ... @@ -61,5 +59,7 @@ def __await__(self) -> Generator[Any, None, _T]: ... @property def _loop(self) -> AbstractEventLoop: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... def wrap_future(future: Union[_ConcurrentFuture[_T], Future[_T]], *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,97 +1,58 @@ import sys from typing import Type -from asyncio.base_events import BaseEventLoop as BaseEventLoop -from asyncio.coroutines import ( - coroutine as coroutine, - iscoroutinefunction as iscoroutinefunction, - iscoroutine as iscoroutine, -) -from asyncio.events import ( - AbstractEventLoopPolicy as AbstractEventLoopPolicy, +from .base_events import BaseEventLoop as BaseEventLoop +from .coroutines import coroutine as coroutine, iscoroutine as iscoroutine, iscoroutinefunction as iscoroutinefunction +from .events import ( AbstractEventLoop as AbstractEventLoop, + AbstractEventLoopPolicy as AbstractEventLoopPolicy, AbstractServer as AbstractServer, Handle as Handle, TimerHandle as TimerHandle, - get_event_loop_policy as get_event_loop_policy, - set_event_loop_policy as set_event_loop_policy, + _get_running_loop as _get_running_loop, + _set_running_loop as _set_running_loop, + get_child_watcher as get_child_watcher, get_event_loop as get_event_loop, - set_event_loop as set_event_loop, + get_event_loop_policy as get_event_loop_policy, new_event_loop as new_event_loop, - get_child_watcher as get_child_watcher, set_child_watcher as set_child_watcher, - _set_running_loop as _set_running_loop, - _get_running_loop as _get_running_loop, -) -if sys.version_info >= (3, 7): - from asyncio.events import get_running_loop as get_running_loop -if sys.version_info >= (3, 8): - from asyncio.exceptions import ( - CancelledError as CancelledError, - IncompleteReadError as IncompleteReadError, - InvalidStateError as InvalidStateError, - LimitOverrunError as LimitOverrunError, - SendfileNotAvailableError as SendfileNotAvailableError, - TimeoutError as TimeoutError, - ) -else: - if sys.version_info >= (3, 7): - from asyncio.events import ( - SendfileNotAvailableError as SendfileNotAvailableError - ) - from asyncio.futures import ( - CancelledError as CancelledError, - TimeoutError as TimeoutError, - InvalidStateError as InvalidStateError, - ) - from asyncio.streams import ( - IncompleteReadError as IncompleteReadError, - LimitOverrunError as LimitOverrunError, - ) -from asyncio.futures import ( - Future as Future, - isfuture as isfuture, - wrap_future as wrap_future, + set_event_loop as set_event_loop, + set_event_loop_policy as set_event_loop_policy, ) -from asyncio.locks import ( - Lock as Lock, - Event as Event, +from .futures import Future as Future, isfuture as isfuture, wrap_future as wrap_future +from .locks import ( + BoundedSemaphore as BoundedSemaphore, Condition as Condition, + Event as Event, + Lock as Lock, Semaphore as Semaphore, - BoundedSemaphore as BoundedSemaphore, ) -from asyncio.protocols import ( +from .protocols import ( BaseProtocol as BaseProtocol, - Protocol as Protocol, DatagramProtocol as DatagramProtocol, + Protocol as Protocol, SubprocessProtocol as SubprocessProtocol, ) -if sys.version_info >= (3, 7): - from asyncio.protocols import BufferedProtocol as BufferedProtocol -from asyncio.queues import ( - Queue as Queue, - PriorityQueue as PriorityQueue, +from .queues import ( LifoQueue as LifoQueue, - QueueFull as QueueFull, + PriorityQueue as PriorityQueue, + Queue as Queue, QueueEmpty as QueueEmpty, + QueueFull as QueueFull, ) -if sys.version_info >= (3, 7): - from asyncio.runners import run as run -from asyncio.streams import ( +from .streams import ( StreamReader as StreamReader, - StreamWriter as StreamWriter, StreamReaderProtocol as StreamReaderProtocol, + StreamWriter as StreamWriter, open_connection as open_connection, start_server as start_server, ) -from asyncio.subprocess import ( - create_subprocess_exec as create_subprocess_exec, - create_subprocess_shell as create_subprocess_shell, -) -from asyncio.tasks import ( +from .subprocess import create_subprocess_exec as create_subprocess_exec, create_subprocess_shell as create_subprocess_shell +from .tasks import ( + ALL_COMPLETED as ALL_COMPLETED, FIRST_COMPLETED as FIRST_COMPLETED, FIRST_EXCEPTION as FIRST_EXCEPTION, - ALL_COMPLETED as ALL_COMPLETED, + Task as Task, as_completed as as_completed, ensure_future as ensure_future, gather as gather, @@ -100,39 +61,56 @@ sleep as sleep, wait as wait, wait_for as wait_for, - Task as Task, ) -if sys.version_info >= (3, 7): - from asyncio.tasks import ( - all_tasks as all_tasks, - create_task as create_task, - current_task as current_task, - ) -if sys.version_info >= (3, 9): - from asyncio.threads import to_thread as to_thread -from asyncio.transports import ( +from .transports import ( BaseTransport as BaseTransport, - ReadTransport as ReadTransport, - WriteTransport as WriteTransport, - Transport as Transport, DatagramTransport as DatagramTransport, + ReadTransport as ReadTransport, SubprocessTransport as SubprocessTransport, + Transport as Transport, + WriteTransport as WriteTransport, ) +if sys.version_info >= (3, 7): + from .events import get_running_loop as get_running_loop +if sys.version_info >= (3, 8): + from .exceptions import ( + CancelledError as CancelledError, + IncompleteReadError as IncompleteReadError, + InvalidStateError as InvalidStateError, + LimitOverrunError as LimitOverrunError, + SendfileNotAvailableError as SendfileNotAvailableError, + TimeoutError as TimeoutError, + ) +else: + if sys.version_info >= (3, 7): + from .events import SendfileNotAvailableError as SendfileNotAvailableError + from .futures import CancelledError as CancelledError, InvalidStateError as InvalidStateError, TimeoutError as TimeoutError + from .streams import IncompleteReadError as IncompleteReadError, LimitOverrunError as LimitOverrunError + +if sys.version_info >= (3, 7): + from .protocols import BufferedProtocol as BufferedProtocol + +if sys.version_info >= (3, 7): + from .runners import run as run + +if sys.version_info >= (3, 7): + from .tasks import all_tasks as all_tasks, create_task as create_task, current_task as current_task +if sys.version_info >= (3, 9): + from .threads import to_thread as to_thread + DefaultEventLoopPolicy: Type[AbstractEventLoopPolicy] -if sys.platform == 'win32': - from asyncio.windows_events import * +if sys.platform == "win32": + from .windows_events import * -if sys.platform != 'win32': - from asyncio.streams import ( - open_unix_connection as open_unix_connection, - start_unix_server as start_unix_server, - ) +if sys.platform != "win32": + from .streams import open_unix_connection as open_unix_connection, start_unix_server as start_unix_server from .unix_events import ( AbstractChildWatcher as AbstractChildWatcher, FastChildWatcher as FastChildWatcher, SafeChildWatcher as SafeChildWatcher, SelectorEventLoop as SelectorEventLoop, ) + if sys.version_info >= (3, 8): from .unix_events import MultiLoopChildWatcher as MultiLoopChildWatcher, ThreadedChildWatcher as ThreadedChildWatcher diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/locks.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/locks.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/locks.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/locks.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,24 +1,25 @@ import sys -from typing import Any, Callable, Iterable, Generator, Type, TypeVar, Union, Optional, Awaitable +from types import TracebackType +from typing import Any, Awaitable, Callable, Deque, Generator, Optional, Type, TypeVar, Union from .events import AbstractEventLoop from .futures import Future -from types import TracebackType - -_T = TypeVar('_T') +_T = TypeVar("_T") if sys.version_info >= (3, 9): class _ContextManagerMixin: def __init__(self, lock: Union[Lock, Semaphore]) -> None: ... def __aenter__(self) -> Awaitable[None]: ... - def __aexit__(self, exc_type: Optional[Type[BaseException]], exc: Optional[BaseException], tb: Optional[TracebackType]) -> Awaitable[None]: ... + def __aexit__( + self, exc_type: Optional[Type[BaseException]], exc: Optional[BaseException], tb: Optional[TracebackType] + ) -> Awaitable[None]: ... + else: class _ContextManager: def __init__(self, lock: Union[Lock, Semaphore]) -> None: ... def __enter__(self) -> object: ... def __exit__(self, *args: Any) -> None: ... - class _ContextManagerMixin: def __init__(self, lock: Union[Lock, Semaphore]) -> None: ... # Apparently this exists to *prohibit* use as a context manager. @@ -27,8 +28,9 @@ def __iter__(self) -> Generator[Any, None, _ContextManager]: ... def __await__(self) -> Generator[Any, None, _ContextManager]: ... def __aenter__(self) -> Awaitable[None]: ... - def __aexit__(self, exc_type: Optional[Type[BaseException]], exc: Optional[BaseException], tb: Optional[TracebackType]) -> Awaitable[None]: ... - + def __aexit__( + self, exc_type: Optional[Type[BaseException]], exc: Optional[BaseException], tb: Optional[TracebackType] + ) -> Awaitable[None]: ... class Lock(_ContextManagerMixin): def __init__(self, *, loop: Optional[AbstractEventLoop] = ...) -> None: ... @@ -54,10 +56,13 @@ def notify_all(self) -> None: ... class Semaphore(_ContextManagerMixin): + _value: int + _waiters: Deque[Future[Any]] def __init__(self, value: int = ..., *, loop: Optional[AbstractEventLoop] = ...) -> None: ... def locked(self) -> bool: ... async def acquire(self) -> bool: ... def release(self) -> None: ... + def _wake_up_next(self) -> None: ... class BoundedSemaphore(Semaphore): def __init__(self, value: int = ..., *, loop: Optional[AbstractEventLoop] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/log.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/log.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/log.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/log.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ - import logging logger: logging.Logger diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/proactor_events.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/proactor_events.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/proactor_events.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/proactor_events.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -5,31 +5,66 @@ from . import base_events, constants, events, futures, streams, transports class _ProactorBasePipeTransport(transports._FlowControlMixin, transports.BaseTransport): - - def __init__(self, loop: events.AbstractEventLoop, sock: socket, protocol: streams.StreamReaderProtocol, waiter: Optional[futures.Future[Any]] = ..., extra: Optional[Mapping[Any, Any]] = ..., server: Optional[events.AbstractServer] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + sock: socket, + protocol: streams.StreamReaderProtocol, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Mapping[Any, Any]] = ..., + server: Optional[events.AbstractServer] = ..., + ) -> None: ... def __repr__(self) -> str: ... def __del__(self) -> None: ... def get_write_buffer_size(self) -> int: ... class _ProactorReadPipeTransport(_ProactorBasePipeTransport, transports.ReadTransport): - - def __init__(self, loop: events.AbstractEventLoop, sock: socket, protocol: streams.StreamReaderProtocol, waiter: Optional[futures.Future[Any]] = ..., extra: Optional[Mapping[Any, Any]] = ..., server: Optional[events.AbstractServer] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + sock: socket, + protocol: streams.StreamReaderProtocol, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Mapping[Any, Any]] = ..., + server: Optional[events.AbstractServer] = ..., + ) -> None: ... class _ProactorBaseWritePipeTransport(_ProactorBasePipeTransport, transports.WriteTransport): - - def __init__(self, loop: events.AbstractEventLoop, sock: socket, protocol: streams.StreamReaderProtocol, waiter: Optional[futures.Future[Any]] = ..., extra: Optional[Mapping[Any, Any]] = ..., server: Optional[events.AbstractServer] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + sock: socket, + protocol: streams.StreamReaderProtocol, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Mapping[Any, Any]] = ..., + server: Optional[events.AbstractServer] = ..., + ) -> None: ... class _ProactorWritePipeTransport(_ProactorBaseWritePipeTransport): - - def __init__(self, loop: events.AbstractEventLoop, sock: socket, protocol: streams.StreamReaderProtocol, waiter: Optional[futures.Future[Any]] = ..., extra: Optional[Mapping[Any, Any]] = ..., server: Optional[events.AbstractServer] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + sock: socket, + protocol: streams.StreamReaderProtocol, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Mapping[Any, Any]] = ..., + server: Optional[events.AbstractServer] = ..., + ) -> None: ... class _ProactorDuplexPipeTransport(_ProactorReadPipeTransport, _ProactorBaseWritePipeTransport, transports.Transport): ... class _ProactorSocketTransport(_ProactorReadPipeTransport, _ProactorBaseWritePipeTransport, transports.Transport): _sendfile_compatible: constants._SendfileMode = ... - - def __init__(self, loop: events.AbstractEventLoop, sock: socket, protocol: streams.StreamReaderProtocol, waiter: Optional[futures.Future[Any]] = ..., extra: Optional[Mapping[Any, Any]] = ..., server: Optional[events.AbstractServer] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + sock: socket, + protocol: streams.StreamReaderProtocol, + waiter: Optional[futures.Future[Any]] = ..., + extra: Optional[Mapping[Any, Any]] = ..., + server: Optional[events.AbstractServer] = ..., + ) -> None: ... def _set_extra(self, sock: socket) -> None: ... def can_write_eof(self) -> Literal[True]: ... def write_eof(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/protocols.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/protocols.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/protocols.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/protocols.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ import sys from asyncio import transports -from typing import Optional, Tuple, Union +from typing import Optional, Tuple class BaseProtocol: def connection_made(self, transport: transports.BaseTransport) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/queues.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/queues.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/queues.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/queues.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,14 @@ +import sys from asyncio.events import AbstractEventLoop -from typing import Generic, TypeVar, Optional +from typing import Any, Generic, Optional, TypeVar + +if sys.version_info >= (3, 9): + from types import GenericAlias class QueueEmpty(Exception): ... class QueueFull(Exception): ... -_T = TypeVar('_T') +_T = TypeVar("_T") class Queue(Generic[_T]): def __init__(self, maxsize: int = ..., *, loop: Optional[AbstractEventLoop] = ...) -> None: ... @@ -23,11 +27,10 @@ def put_nowait(self, item: _T) -> None: ... async def get(self) -> _T: ... def get_nowait(self) -> _T: ... - async def join(self) -> bool: ... + async def join(self) -> None: ... def task_done(self) -> None: ... - + if sys.version_info >= (3, 9): + def __class_getitem__(cls, type: Any) -> GenericAlias: ... class PriorityQueue(Queue[_T]): ... - - class LifoQueue(Queue[_T]): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/runners.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/runners.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/runners.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/runners.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,10 @@ import sys - if sys.version_info >= (3, 7): - from typing import Awaitable, TypeVar - - _T = TypeVar('_T') + from typing import Awaitable, Optional, TypeVar - def run(main: Awaitable[_T], *, debug: bool = ...) -> _T: ... + _T = TypeVar("_T") + if sys.version_info >= (3, 8): + def run(main: Awaitable[_T], *, debug: Optional[bool] = ...) -> _T: ... + else: + def run(main: Awaitable[_T], *, debug: bool = ...) -> _T: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/sslproto.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/sslproto.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/sslproto.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/sslproto.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,9 @@ - -import sys import ssl - -from typing import ClassVar, Optional, List, Tuple, Callable, Dict, Any, Deque +import sys +from typing import Any, Callable, ClassVar, Deque, Dict, List, Optional, Tuple from typing_extensions import Literal -from . import transports -from . import constants -from . import events -from . import protocols -from . import futures +from . import constants, events, futures, protocols, transports def _create_transport_context(server_side: bool, server_hostname: Optional[str]) -> ssl.SSLContext: ... @@ -32,9 +26,7 @@ _need_ssldata: bool _handshake_cb: Optional[Callable[[Optional[BaseException]], None]] _shutdown_cb: Optional[Callable[[], None]] - def __init__(self, context: ssl.SSLContext, server_side: bool, server_hostname: Optional[str] = ...) -> None: ... - @property def context(self) -> ssl.SSLContext: ... @property @@ -43,7 +35,6 @@ def need_ssldata(self) -> bool: ... @property def wrapped(self) -> bool: ... - def do_handshake(self, callback: Optional[Callable[[Optional[BaseException]], None]] = ...) -> List[bytes]: ... def shutdown(self, callback: Optional[Callable[[], None]] = ...) -> List[bytes]: ... def feed_eof(self) -> None: ... @@ -57,12 +48,7 @@ _loop: events.AbstractEventLoop _ssl_protocol: SSLProtocol _closed: bool - - if sys.version_info >= (3, 6): - def __init__(self, loop: events.AbstractEventLoop, ssl_protocol: SSLProtocol) -> None: ... - else: - def __init__(self, loop: events.AbstractEventLoop, ssl_protocol: SSLProtocol, app_protocol: protocols.BaseProtocol) -> None: ... - + def __init__(self, loop: events.AbstractEventLoop, ssl_protocol: SSLProtocol) -> None: ... def get_extra_info(self, name: str, default: Optional[Any] = ...) -> Dict[str, Any]: ... def set_protocol(self, protocol: protocols.BaseProtocol) -> None: ... def get_protocol(self) -> protocols.BaseProtocol: ... @@ -89,7 +75,7 @@ _extra: Dict[str, Any] _write_backlog: Deque[Tuple[bytes, int]] _write_buffer_size: int - _waiter: futures.Future + _waiter: futures.Future[Any] _loop: events.AbstractEventLoop _app_transport: _SSLProtocolTransport _sslpipe: Optional[_SSLPipe] @@ -103,12 +89,28 @@ _app_protocol_is_buffer: bool if sys.version_info >= (3, 7): - def __init__(self, loop: events.AbstractEventLoop, app_protocol: protocols.BaseProtocol, sslcontext: ssl.SSLContext, waiter: futures.Future, - server_side: bool = ..., server_hostname: Optional[str] = ..., call_connection_made: bool = ..., ssl_handshake_timeout: Optional[int] = ...) -> None: ... + def __init__( + self, + loop: events.AbstractEventLoop, + app_protocol: protocols.BaseProtocol, + sslcontext: ssl.SSLContext, + waiter: futures.Future[Any], + server_side: bool = ..., + server_hostname: Optional[str] = ..., + call_connection_made: bool = ..., + ssl_handshake_timeout: Optional[int] = ..., + ) -> None: ... else: - def __init__(self, loop: events.AbstractEventLoop, app_protocol: protocols.BaseProtocol, sslcontext: ssl.SSLContext, waiter: futures.Future, - server_side: bool = ..., server_hostname: Optional[str] = ..., call_connection_made: bool = ...) -> None: ... - + def __init__( + self, + loop: events.AbstractEventLoop, + app_protocol: protocols.BaseProtocol, + sslcontext: ssl.SSLContext, + waiter: futures.Future, + server_side: bool = ..., + server_hostname: Optional[str] = ..., + call_connection_made: bool = ..., + ) -> None: ... if sys.version_info >= (3, 7): def _set_app_protocol(self, app_protocol: protocols.BaseProtocol) -> None: ... def _wakeup_waiter(self, exc: Optional[BaseException] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/staggered.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/staggered.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/staggered.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/staggered.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,12 @@ - import sys -from typing import Iterable, Callable, Awaitable, Optional, Tuple, Any, List +from typing import Any, Awaitable, Callable, Iterable, List, Optional, Tuple + from . import events if sys.version_info >= (3, 8): - async def staggered_race(coro_fns: Iterable[Callable[[], Awaitable]], delay: Optional[float], *, loop: Optional[events.AbstractEventLoop] = ...) -> Tuple[Any, Optional[int], List[Optional[Exception]]]: ... + async def staggered_race( + coro_fns: Iterable[Callable[[], Awaitable[Any]]], + delay: Optional[float], + *, + loop: Optional[events.AbstractEventLoop] = ..., + ) -> Tuple[Any, Optional[int], List[Optional[Exception]]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/streams.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/streams.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/streams.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/streams.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,7 @@ import sys -from typing import Any, Awaitable, Callable, Iterable, Optional, Tuple, Union +from typing import Any, AsyncIterator, Awaitable, Callable, Iterable, Optional, Tuple, Union -from . import events -from . import protocols -from . import transports +from . import events, protocols, transports _ClientConnectedCallback = Callable[[StreamReader, StreamWriter], Optional[Awaitable[None]]] @@ -12,7 +10,6 @@ expected: Optional[int] partial: bytes def __init__(self, partial: bytes, expected: Optional[int]) -> None: ... - class LimitOverrunError(Exception): consumed: int def __init__(self, message: str, consumed: int) -> None: ... @@ -24,9 +21,8 @@ loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., ssl_handshake_timeout: Optional[float] = ..., - **kwds: Any + **kwds: Any, ) -> Tuple[StreamReader, StreamWriter]: ... - async def start_server( client_connected_cb: _ClientConnectedCallback, host: Optional[str] = ..., @@ -35,50 +31,50 @@ loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., ssl_handshake_timeout: Optional[float] = ..., - **kwds: Any + **kwds: Any, ) -> events.AbstractServer: ... -if sys.platform != 'win32': +if sys.platform != "win32": if sys.version_info >= (3, 7): from os import PathLike + _PathType = Union[str, PathLike[str]] else: _PathType = str - async def open_unix_connection( - path: Optional[_PathType] = ..., - *, - loop: Optional[events.AbstractEventLoop] = ..., - limit: int = ..., - **kwds: Any + path: Optional[_PathType] = ..., *, loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., **kwds: Any ) -> Tuple[StreamReader, StreamWriter]: ... - async def start_unix_server( client_connected_cb: _ClientConnectedCallback, path: Optional[_PathType] = ..., *, loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., - **kwds: Any) -> events.AbstractServer: ... + **kwds: Any, + ) -> events.AbstractServer: ... class FlowControlMixin(protocols.Protocol): ... class StreamReaderProtocol(FlowControlMixin, protocols.Protocol): - def __init__(self, - stream_reader: StreamReader, - client_connected_cb: Optional[_ClientConnectedCallback] = ..., - loop: Optional[events.AbstractEventLoop] = ...) -> None: ... + def __init__( + self, + stream_reader: StreamReader, + client_connected_cb: Optional[_ClientConnectedCallback] = ..., + loop: Optional[events.AbstractEventLoop] = ..., + ) -> None: ... def connection_made(self, transport: transports.BaseTransport) -> None: ... def connection_lost(self, exc: Optional[Exception]) -> None: ... def data_received(self, data: bytes) -> None: ... def eof_received(self) -> bool: ... class StreamWriter: - def __init__(self, - transport: transports.BaseTransport, - protocol: protocols.BaseProtocol, - reader: Optional[StreamReader], - loop: events.AbstractEventLoop) -> None: ... + def __init__( + self, + transport: transports.BaseTransport, + protocol: protocols.BaseProtocol, + reader: Optional[StreamReader], + loop: events.AbstractEventLoop, + ) -> None: ... @property def transport(self) -> transports.BaseTransport: ... def write(self, data: bytes) -> None: ... @@ -93,9 +89,7 @@ async def drain(self) -> None: ... class StreamReader: - def __init__(self, - limit: int = ..., - loop: Optional[events.AbstractEventLoop] = ...) -> None: ... + def __init__(self, limit: int = ..., loop: Optional[events.AbstractEventLoop] = ...) -> None: ... def exception(self) -> Exception: ... def set_exception(self, exc: Exception) -> None: ... def set_transport(self, transport: transports.BaseTransport) -> None: ... @@ -106,3 +100,5 @@ async def readuntil(self, separator: bytes = ...) -> bytes: ... async def read(self, n: int = ...) -> bytes: ... async def readexactly(self, n: int) -> bytes: ... + def __aiter__(self) -> AsyncIterator[bytes]: ... + async def __anext__(self) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/subprocess.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/subprocess.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/subprocess.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/subprocess.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,10 @@ import sys -from asyncio import events -from asyncio import protocols -from asyncio import streams -from asyncio import transports -from typing import Any, Optional, Text, Tuple, Union, IO +from asyncio import events, protocols, streams, transports +from typing import IO, Any, Optional, Tuple, Union if sys.version_info >= (3, 8): from os import PathLike + _ExecArg = Union[str, bytes, PathLike[str], PathLike[bytes]] else: _ExecArg = Union[str, bytes] # Union used instead of AnyStr due to mypy issue #1236 @@ -15,27 +13,24 @@ STDOUT: int DEVNULL: int -class SubprocessStreamProtocol(streams.FlowControlMixin, - protocols.SubprocessProtocol): +class SubprocessStreamProtocol(streams.FlowControlMixin, protocols.SubprocessProtocol): stdin: Optional[streams.StreamWriter] stdout: Optional[streams.StreamReader] stderr: Optional[streams.StreamReader] def __init__(self, limit: int, loop: events.AbstractEventLoop) -> None: ... def connection_made(self, transport: transports.BaseTransport) -> None: ... - def pipe_data_received(self, fd: int, data: Union[bytes, Text]) -> None: ... + def pipe_data_received(self, fd: int, data: Union[bytes, str]) -> None: ... def pipe_connection_lost(self, fd: int, exc: Optional[Exception]) -> None: ... def process_exited(self) -> None: ... - class Process: stdin: Optional[streams.StreamWriter] stdout: Optional[streams.StreamReader] stderr: Optional[streams.StreamReader] pid: int - def __init__(self, - transport: transports.BaseTransport, - protocol: protocols.BaseProtocol, - loop: events.AbstractEventLoop) -> None: ... + def __init__( + self, transport: transports.BaseTransport, protocol: protocols.BaseProtocol, loop: events.AbstractEventLoop + ) -> None: ... @property def returncode(self) -> Optional[int]: ... async def wait(self) -> int: ... @@ -44,7 +39,6 @@ def kill(self) -> None: ... async def communicate(self, input: Optional[bytes] = ...) -> Tuple[bytes, bytes]: ... - async def create_subprocess_shell( cmd: Union[str, bytes], # Union used instead of AnyStr due to mypy issue #1236 stdin: Union[int, IO[Any], None] = ..., @@ -52,9 +46,8 @@ stderr: Union[int, IO[Any], None] = ..., loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., - **kwds: Any + **kwds: Any, ) -> Process: ... - async def create_subprocess_exec( program: _ExecArg, *args: _ExecArg, @@ -63,5 +56,5 @@ stderr: Union[int, IO[Any], None] = ..., loop: Optional[events.AbstractEventLoop] = ..., limit: int = ..., - **kwds: Any + **kwds: Any, ) -> Process: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/tasks.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/tasks.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/tasks.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/tasks.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,29 +1,47 @@ import concurrent.futures import sys +from types import FrameType from typing import ( - Any, TypeVar, Set, List, TextIO, Union, Tuple, Generic, Generator, Iterable, Awaitable, overload, Iterator, Optional, + Any, + Awaitable, + Generator, + Generic, + Iterable, + Iterator, + List, + Optional, + Set, + TextIO, + Tuple, + TypeVar, + Union, + overload, ) from typing_extensions import Literal -from types import FrameType + from .events import AbstractEventLoop from .futures import Future -_T = TypeVar('_T') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") _FutureT = Union[Future[_T], Generator[Any, None, _T], Awaitable[_T]] FIRST_EXCEPTION: str FIRST_COMPLETED: str ALL_COMPLETED: str -def as_completed(fs: Iterable[_FutureT[_T]], *, loop: Optional[AbstractEventLoop] = ..., - timeout: Optional[float] = ...) -> Iterator[Future[_T]]: ... -def ensure_future(coro_or_future: _FutureT[_T], - *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... +def as_completed( + fs: Iterable[_FutureT[_T]], *, loop: Optional[AbstractEventLoop] = ..., timeout: Optional[float] = ... +) -> Iterator[Future[_T]]: ... +def ensure_future(coro_or_future: _FutureT[_T], *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... + # Prior to Python 3.7 'async' was an alias for 'ensure_future'. # It became a keyword in 3.7. @@ -32,66 +50,120 @@ # zip() because typing does not support variadic type variables. See # typing PR #1550 for discussion. @overload -def gather(coro_or_future1: _FutureT[_T1], - *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: Literal[False] = ...) -> Future[Tuple[_T1]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], - *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: Literal[False] = ...) -> Future[Tuple[_T1, _T2]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - *, loop: Optional[AbstractEventLoop] = ..., - return_exceptions: Literal[False] = ...) -> Future[Tuple[_T1, _T2, _T3]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - coro_or_future4: _FutureT[_T4], - *, loop: Optional[AbstractEventLoop] = ..., - return_exceptions: Literal[False] = ...) -> Future[Tuple[_T1, _T2, _T3, _T4]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - coro_or_future4: _FutureT[_T4], coro_or_future5: _FutureT[_T5], - *, loop: Optional[AbstractEventLoop] = ..., - return_exceptions: Literal[False] = ...) -> Future[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def gather(coro_or_future1: _FutureT[Any], coro_or_future2: _FutureT[Any], coro_or_future3: _FutureT[Any], - coro_or_future4: _FutureT[Any], coro_or_future5: _FutureT[Any], coro_or_future6: _FutureT[Any], - *coros_or_futures: _FutureT[Any], - loop: Optional[AbstractEventLoop] = ..., return_exceptions: bool = ...) -> Future[List[Any]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], - *, loop: Optional[AbstractEventLoop] = ..., - return_exceptions: bool = ...) -> Future[Tuple[Union[_T1, BaseException]]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], - *, loop: Optional[AbstractEventLoop] = ..., - return_exceptions: bool = ...) -> Future[Tuple[Union[_T1, BaseException], Union[_T2, BaseException]]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: bool = ...) -> Future[ - Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException]]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - coro_or_future4: _FutureT[_T4], - *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: bool = ...) -> Future[ - Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException], Union[_T4, BaseException]]]: ... -@overload -def gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], - coro_or_future4: _FutureT[_T4], coro_or_future5: _FutureT[_T5], - *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: bool = ...) -> Future[ - Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException], Union[_T4, BaseException], Union[_T5, BaseException]]]: ... -def run_coroutine_threadsafe(coro: _FutureT[_T], - loop: AbstractEventLoop) -> concurrent.futures.Future[_T]: ... +def gather( + coro_or_future1: _FutureT[_T1], *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: Literal[False] = ... +) -> Future[Tuple[_T1]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: Literal[False] = ..., +) -> Future[Tuple[_T1, _T2]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: Literal[False] = ..., +) -> Future[Tuple[_T1, _T2, _T3]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + coro_or_future4: _FutureT[_T4], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: Literal[False] = ..., +) -> Future[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + coro_or_future4: _FutureT[_T4], + coro_or_future5: _FutureT[_T5], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: Literal[False] = ..., +) -> Future[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def gather( + coro_or_future1: _FutureT[Any], + coro_or_future2: _FutureT[Any], + coro_or_future3: _FutureT[Any], + coro_or_future4: _FutureT[Any], + coro_or_future5: _FutureT[Any], + coro_or_future6: _FutureT[Any], + *coros_or_futures: _FutureT[Any], + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: bool = ..., +) -> Future[List[Any]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], *, loop: Optional[AbstractEventLoop] = ..., return_exceptions: bool = ... +) -> Future[Tuple[Union[_T1, BaseException]]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: bool = ..., +) -> Future[Tuple[Union[_T1, BaseException], Union[_T2, BaseException]]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: bool = ..., +) -> Future[Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException]]]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + coro_or_future4: _FutureT[_T4], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: bool = ..., +) -> Future[ + Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException], Union[_T4, BaseException]] +]: ... +@overload +def gather( + coro_or_future1: _FutureT[_T1], + coro_or_future2: _FutureT[_T2], + coro_or_future3: _FutureT[_T3], + coro_or_future4: _FutureT[_T4], + coro_or_future5: _FutureT[_T5], + *, + loop: Optional[AbstractEventLoop] = ..., + return_exceptions: bool = ..., +) -> Future[ + Tuple[ + Union[_T1, BaseException], + Union[_T2, BaseException], + Union[_T3, BaseException], + Union[_T4, BaseException], + Union[_T5, BaseException], + ] +]: ... +def run_coroutine_threadsafe(coro: _FutureT[_T], loop: AbstractEventLoop) -> concurrent.futures.Future[_T]: ... def shield(arg: _FutureT[_T], *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... def sleep(delay: float, result: _T = ..., *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... -def wait(fs: Iterable[_FutureT[_T]], *, loop: Optional[AbstractEventLoop] = ..., timeout: Optional[float] = ..., - return_when: str = ...) -> Future[Tuple[Set[Future[_T]], Set[Future[_T]]]]: ... -def wait_for(fut: _FutureT[_T], timeout: Optional[float], - *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... +def wait( + fs: Iterable[_FutureT[_T]], *, loop: Optional[AbstractEventLoop] = ..., timeout: Optional[float] = ..., return_when: str = ... +) -> Future[Tuple[Set[Future[_T]], Set[Future[_T]]]]: ... +def wait_for(fut: _FutureT[_T], timeout: Optional[float], *, loop: Optional[AbstractEventLoop] = ...) -> Future[_T]: ... class Task(Future[_T], Generic[_T]): - @classmethod - def current_task(cls, loop: Optional[AbstractEventLoop] = ...) -> Optional[Task[Any]]: ... - @classmethod - def all_tasks(cls, loop: Optional[AbstractEventLoop] = ...) -> Set[Task[Any]]: ... if sys.version_info >= (3, 8): def __init__( self, @@ -113,15 +185,20 @@ def cancel(self, msg: Optional[str] = ...) -> bool: ... else: def cancel(self) -> bool: ... + if sys.version_info < (3, 9): + @classmethod + def current_task(cls, loop: Optional[AbstractEventLoop] = ...) -> Optional[Task[Any]]: ... + @classmethod + def all_tasks(cls, loop: Optional[AbstractEventLoop] = ...) -> Set[Task[Any]]: ... if sys.version_info < (3, 7): def _wakeup(self, fut: Future[Any]) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... if sys.version_info >= (3, 7): def all_tasks(loop: Optional[AbstractEventLoop] = ...) -> Set[Task[Any]]: ... if sys.version_info >= (3, 8): - def create_task( - coro: Union[Generator[Any, None, _T], Awaitable[_T]], *, name: Optional[str] = ..., - ) -> Task[_T]: ... + def create_task(coro: Union[Generator[Any, None, _T], Awaitable[_T]], *, name: Optional[str] = ...) -> Task[_T]: ... else: def create_task(coro: Union[Generator[Any, None, _T], Awaitable[_T]]) -> Task[_T]: ... def current_task(loop: Optional[AbstractEventLoop] = ...) -> Optional[Task[Any]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/threads.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/threads.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/threads.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/threads.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ import sys from typing import Any, Callable, TypeVar -_T = TypeVar('_T') +_T = TypeVar("_T") if sys.version_info >= (3, 9): async def to_thread(__func: Callable[..., _T], *args: Any, **kwargs: Any) -> _T: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/transports.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/transports.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/transports.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/transports.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,17 +1,16 @@ import sys -from socket import _Address -from typing import Any, Mapping, List, Optional, Tuple -from asyncio.protocols import BaseProtocol from asyncio.events import AbstractEventLoop +from asyncio.protocols import BaseProtocol +from socket import _Address +from typing import Any, List, Mapping, Optional, Tuple class BaseTransport: def __init__(self, extra: Optional[Mapping[Any, Any]] = ...) -> None: ... def get_extra_info(self, name: Any, default: Any = ...) -> Any: ... def is_closing(self) -> bool: ... def close(self) -> None: ... - if sys.version_info >= (3, 5): - def set_protocol(self, protocol: BaseProtocol) -> None: ... - def get_protocol(self) -> BaseProtocol: ... + def set_protocol(self, protocol: BaseProtocol) -> None: ... + def get_protocol(self) -> BaseProtocol: ... class ReadTransport(BaseTransport): if sys.version_info >= (3, 7): @@ -20,9 +19,7 @@ def resume_reading(self) -> None: ... class WriteTransport(BaseTransport): - def set_write_buffer_limits( - self, high: Optional[int] = ..., low: Optional[int] = ... - ) -> None: ... + def set_write_buffer_limits(self, high: Optional[int] = ..., low: Optional[int] = ...) -> None: ... def get_write_buffer_size(self) -> int: ... def write(self, data: Any) -> None: ... def writelines(self, list_of_data: List[Any]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/trsock.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/trsock.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/trsock.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/trsock.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,7 @@ - -import sys import socket -from typing import Union, NoReturn, Tuple, Optional, Iterable, List, Any, BinaryIO, Type, overload +import sys from types import TracebackType +from typing import Any, BinaryIO, Iterable, List, NoReturn, Optional, Sequence, Tuple, Type, Union, overload if sys.version_info >= (3, 8): # These are based in socket, maybe move them out into _typeshed.pyi or such @@ -10,7 +9,6 @@ _RetAddress = Any _WriteBuffer = Union[bytearray, memoryview] _CMSG = Tuple[int, int, bytes] - class TransportSocket: def __init__(self, sock: socket.socket) -> None: ... def _na(self, what: str) -> None: ... @@ -40,20 +38,26 @@ def connect(self, address: Union[_Address, bytes]) -> None: ... def connect_ex(self, address: Union[_Address, bytes]) -> int: ... def bind(self, address: Union[_Address, bytes]) -> None: ... - if sys.platform == 'win32': + if sys.platform == "win32": def ioctl(self, control: int, option: Union[int, Tuple[int, int, int], bool]) -> None: ... else: def ioctl(self, control: int, option: Union[int, Tuple[int, int, int], bool]) -> NoReturn: ... def listen(self, __backlog: int = ...) -> None: ... def makefile(self) -> BinaryIO: ... - def sendfile(self, file, offset: int = ..., count: Optional[int] = ...) -> int: ... + def sendfile(self, file: BinaryIO, offset: int = ..., count: Optional[int] = ...) -> int: ... def close(self) -> None: ... def detach(self) -> int: ... if sys.platform == "linux": - def sendmsg_afalg(self, msg=..., *, op, iv=..., assoclen=..., flags=...) -> int: ... + def sendmsg_afalg( + self, msg: Iterable[bytes] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = ... + ) -> int: ... else: - def sendmsg_afalg(self, msg=..., *, op, iv=..., assoclen=..., flags=...) -> NoReturn: ... - def sendmsg(self, __buffers: Iterable[bytes], __ancdata: Iterable[_CMSG] = ..., __flags: int = ..., __address: _Address = ...) -> int: ... + def sendmsg_afalg( + self, msg: Iterable[bytes] = ..., *, op: int, iv: Any = ..., assoclen: int = ..., flags: int = ... + ) -> NoReturn: ... + def sendmsg( + self, __buffers: Iterable[bytes], __ancdata: Iterable[_CMSG] = ..., __flags: int = ..., __address: _Address = ... + ) -> int: ... @overload def sendto(self, data: bytes, address: _Address) -> int: ... @overload @@ -61,13 +65,15 @@ def send(self, data: bytes, flags: int = ...) -> int: ... def sendall(self, data: bytes, flags: int = ...) -> None: ... def set_inheritable(self, inheritable: bool) -> None: ... - if sys.platform == 'win32': + if sys.platform == "win32": def share(self, process_id: int) -> bytes: ... else: def share(self, process_id: int) -> NoReturn: ... def recv_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> int: ... def recvfrom_into(self, buffer: _WriteBuffer, nbytes: int = ..., flags: int = ...) -> Tuple[int, _RetAddress]: ... - def recvmsg_into(self, __buffers: Iterable[_WriteBuffer], __ancbufsize: int = ..., __flags: int = ...) -> Tuple[int, List[_CMSG], int, Any]: ... + def recvmsg_into( + self, __buffers: Iterable[_WriteBuffer], __ancbufsize: int = ..., __flags: int = ... + ) -> Tuple[int, List[_CMSG], int, Any]: ... def recvmsg(self, __bufsize: int, __ancbufsize: int = ..., __flags: int = ...) -> Tuple[bytes, List[_CMSG], int, Any]: ... def recvfrom(self, bufsize: int, flags: int = ...) -> Tuple[bytes, _RetAddress]: ... def recv(self, bufsize: int, flags: int = ...) -> bytes: ... @@ -75,4 +81,6 @@ def gettimeout(self) -> Optional[float]: ... def setblocking(self, flag: bool) -> None: ... def __enter__(self) -> socket.socket: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/unix_events.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/unix_events.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/unix_events.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/unix_events.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -5,9 +5,9 @@ from .events import AbstractEventLoop, BaseDefaultEventLoopPolicy from .selector_events import BaseSelectorEventLoop -_T1 = TypeVar('_T1', bound=AbstractChildWatcher) -_T2 = TypeVar('_T2', bound=SafeChildWatcher) -_T3 = TypeVar('_T3', bound=FastChildWatcher) +_T1 = TypeVar("_T1", bound=AbstractChildWatcher) +_T2 = TypeVar("_T2", bound=SafeChildWatcher) +_T3 = TypeVar("_T3", bound=FastChildWatcher) class AbstractChildWatcher: def add_child_handler(self, pid: int, callback: Callable[..., Any], *args: Any) -> None: ... @@ -44,8 +44,8 @@ from typing import Protocol - _T4 = TypeVar('_T4', bound=MultiLoopChildWatcher) - _T5 = TypeVar('_T5', bound=ThreadedChildWatcher) + _T4 = TypeVar("_T4", bound=MultiLoopChildWatcher) + _T5 = TypeVar("_T5", bound=ThreadedChildWatcher) class _Warn(Protocol): def __call__( self, message: str, category: Optional[Type[Warning]] = ..., stacklevel: int = ..., source: Optional[Any] = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/windows_utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/windows_utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/windows_utils.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/asyncio/windows_utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,9 @@ - import sys -from typing import Tuple, Callable, Optional, Type, Protocol from types import TracebackType - +from typing import Callable, Optional, Protocol, Tuple, Type class _WarnFunction(Protocol): - def __call__(self, message: str, category: Type[Warning], source: PipeHandle): ... - + def __call__(self, message: str, category: Type[Warning] = ..., stacklevel: int = ..., source: PipeHandle = ...) -> None: ... BUFSIZE: int PIPE: int @@ -15,7 +12,6 @@ def pipe(*, duplex: bool = ..., overlapped: Tuple[bool, bool] = ..., bufsize: int = ...) -> Tuple[int, int]: ... class PipeHandle: - def __init__(self, handle: int) -> None: ... def __repr__(self) -> str: ... if sys.version_info >= (3, 8): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_bootlocale.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_bootlocale.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_bootlocale.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_bootlocale.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,2 +1 @@ - def getpreferredencoding(do_setlocale: bool = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/builtins.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/builtins.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/builtins.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/builtins.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,62 @@ -# True and False are deliberately omitted because they are keywords in -# Python 3, and stub files conform to Python 3 syntax. - +import sys +from _typeshed import ( + AnyPath, + OpenBinaryMode, + OpenBinaryModeReading, + OpenBinaryModeUpdating, + OpenBinaryModeWriting, + OpenTextMode, + ReadableBuffer, + SupportsKeysAndGetItem, + SupportsLessThan, + SupportsLessThanT, + SupportsWrite, +) +from ast import AST, mod +from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper +from types import CodeType, TracebackType from typing import ( - TypeVar, Iterator, Iterable, NoReturn, overload, Container, - Sequence, MutableSequence, Mapping, MutableMapping, Tuple, List, Any, Dict, Callable, Generic, - Set, AbstractSet, FrozenSet, MutableSet, Sized, Reversible, SupportsInt, SupportsFloat, SupportsAbs, - SupportsComplex, IO, BinaryIO, Union, - ItemsView, KeysView, ValuesView, ByteString, Optional, AnyStr, Type, Text, + IO, + AbstractSet, + Any, + BinaryIO, + ByteString, + Callable, + Container, + Dict, + FrozenSet, + Generic, + ItemsView, + Iterable, + Iterator, + KeysView, + List, + Mapping, + MutableMapping, + MutableSequence, + MutableSet, + NoReturn, + Optional, Protocol, + Reversible, + Sequence, + Set, + Sized, + SupportsAbs, + SupportsBytes, + SupportsComplex, + SupportsFloat, + SupportsInt, + SupportsRound, + Tuple, + Type, + TypeVar, + Union, + ValuesView, + overload, + runtime_checkable, ) -from abc import ABCMeta -from ast import mod, AST -from io import ( - TextIOWrapper, FileIO, BufferedRandom, BufferedReader, BufferedWriter -) -from types import TracebackType, CodeType -from _typeshed import AnyPath, OpenBinaryMode, OpenTextMode, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenBinaryModeReading, SupportsWrite from typing_extensions import Literal -import sys - -from typing import SupportsBytes, SupportsRound if sys.version_info >= (3, 9): from types import GenericAlias @@ -27,30 +64,28 @@ class _SupportsIndex(Protocol): def __index__(self) -> int: ... -class _SupportsLessThan(Protocol): - def __lt__(self, other: Any) -> bool: ... +class _SupportsTrunc(Protocol): + def __trunc__(self) -> int: ... -_T = TypeVar('_T') -_T_co = TypeVar('_T_co', covariant=True) -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') -_S = TypeVar('_S') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') -_TT = TypeVar('_TT', bound='type') -_LT = TypeVar('_LT', bound=_SupportsLessThan) +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") +_S = TypeVar("_S") +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") +_TT = TypeVar("_TT", bound="type") +_TBE = TypeVar("_TBE", bound="BaseException") class object: __doc__: Optional[str] __dict__: Dict[str, Any] - __slots__: Union[Text, Iterable[Text]] + __slots__: Union[str, Iterable[str]] __module__: str - if sys.version_info >= (3, 6): - __annotations__: Dict[str, Any] - + __annotations__: Dict[str, Any] @property def __class__(self: _T) -> Type[_T]: ... @__class__.setter @@ -70,13 +105,11 @@ def __reduce__(self) -> Union[str, Tuple[Any, ...]]: ... def __reduce_ex__(self, protocol: int) -> Union[str, Tuple[Any, ...]]: ... def __dir__(self) -> Iterable[str]: ... - if sys.version_info >= (3, 6): - def __init_subclass__(cls) -> None: ... + def __init_subclass__(cls) -> None: ... class staticmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] __isabstractmethod__: bool - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... @@ -84,7 +117,6 @@ class classmethod(object): # Special, only valid as a decorator. __func__: Callable[..., Any] __isabstractmethod__: bool - def __init__(self, f: Callable[..., Any]) -> None: ... def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ... def __get__(self, obj: _T, type: Optional[Type[_T]] = ...) -> Callable[..., Any]: ... @@ -103,7 +135,6 @@ __qualname__: str __text_signature__: Optional[str] __weakrefoffset__: int - @overload def __init__(self, o: object) -> None: ... @overload @@ -121,8 +152,6 @@ def __subclasscheck__(self, subclass: type) -> bool: ... @classmethod def __prepare__(metacls, __name: str, __bases: Tuple[type, ...], **kwds: Any) -> Mapping[str, Any]: ... - if sys.version_info >= (3, 9): - def __class_getitem__(cls, item: Any) -> GenericAlias: ... class super(object): @overload @@ -134,10 +163,9 @@ class int: @overload - def __init__(self, x: Union[Text, bytes, SupportsInt, _SupportsIndex] = ...) -> None: ... + def __init__(self, x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc] = ...) -> None: ... @overload - def __init__(self, x: Union[Text, bytes, bytearray], base: int) -> None: ... - + def __init__(self, x: Union[str, bytes, bytearray], base: int) -> None: ... if sys.version_info >= (3, 8): def as_integer_ratio(self) -> Tuple[int, Literal[1]]: ... @property @@ -149,13 +177,12 @@ @property def denominator(self) -> int: ... def conjugate(self) -> int: ... - def bit_length(self) -> int: ... def to_bytes(self, length: int, byteorder: str, *, signed: bool = ...) -> bytes: ... @classmethod - def from_bytes(cls, bytes: Union[Iterable[int], SupportsBytes], byteorder: str, *, - signed: bool = ...) -> int: ... # TODO buffer object argument - + def from_bytes( + cls, bytes: Union[Iterable[int], SupportsBytes], byteorder: str, *, signed: bool = ... + ) -> int: ... # TODO buffer object argument def __add__(self, x: int) -> int: ... def __sub__(self, x: int) -> int: ... def __mul__(self, x: int) -> int: ... @@ -170,6 +197,9 @@ def __rtruediv__(self, x: int) -> float: ... def __rmod__(self, x: int) -> int: ... def __rdivmod__(self, x: int) -> Tuple[int, int]: ... + @overload + def __pow__(self, __x: Literal[2], __modulo: Optional[int] = ...) -> int: ... + @overload def __pow__(self, __x: int, __modulo: Optional[int] = ...) -> Any: ... # Return type can be int or float, depending on x. def __rpow__(self, x: int, mod: Optional[int] = ...) -> Any: ... def __and__(self, n: int) -> int: ... @@ -190,14 +220,12 @@ def __floor__(self) -> int: ... def __round__(self, ndigits: Optional[int] = ...) -> int: ... def __getnewargs__(self) -> Tuple[int]: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: int) -> bool: ... def __le__(self, x: int) -> bool: ... def __gt__(self, x: int) -> bool: ... def __ge__(self, x: int) -> bool: ... - def __str__(self) -> str: ... def __float__(self) -> float: ... def __int__(self) -> int: ... @@ -207,19 +235,17 @@ def __index__(self) -> int: ... class float: - def __init__(self, x: Union[SupportsFloat, _SupportsIndex, Text, bytes, bytearray] = ...) -> None: ... + def __init__(self, x: Union[SupportsFloat, _SupportsIndex, str, bytes, bytearray] = ...) -> None: ... def as_integer_ratio(self) -> Tuple[int, int]: ... def hex(self) -> str: ... def is_integer(self) -> bool: ... @classmethod def fromhex(cls, __s: str) -> float: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... def conjugate(self) -> float: ... - def __add__(self, x: float) -> float: ... def __sub__(self, x: float) -> float: ... def __mul__(self, x: float) -> float: ... @@ -227,7 +253,9 @@ def __truediv__(self, x: float) -> float: ... def __mod__(self, x: float) -> float: ... def __divmod__(self, x: float) -> Tuple[float, float]: ... - def __pow__(self, x: float, mod: None = ...) -> float: ... # In Python 3, returns complex if self is negative and x is not whole + def __pow__( + self, x: float, mod: None = ... + ) -> float: ... # In Python 3, returns complex if self is negative and x is not whole def __radd__(self, x: float) -> float: ... def __rsub__(self, x: float) -> float: ... def __rmul__(self, x: float) -> float: ... @@ -238,11 +266,13 @@ def __rpow__(self, x: float, mod: None = ...) -> float: ... def __getnewargs__(self) -> Tuple[float]: ... def __trunc__(self) -> int: ... + if sys.version_info >= (3, 9): + def __ceil__(self) -> int: ... + def __floor__(self) -> int: ... @overload def __round__(self, ndigits: None = ...) -> int: ... @overload def __round__(self, ndigits: int) -> float: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __lt__(self, x: float) -> bool: ... @@ -251,7 +281,6 @@ def __ge__(self, x: float) -> bool: ... def __neg__(self) -> float: ... def __pos__(self) -> float: ... - def __str__(self) -> str: ... def __int__(self) -> int: ... def __float__(self) -> float: ... @@ -264,14 +293,11 @@ def __init__(self, real: float = ..., imag: float = ...) -> None: ... @overload def __init__(self, real: Union[str, SupportsComplex, _SupportsIndex]) -> None: ... - @property def real(self) -> float: ... @property def imag(self) -> float: ... - def conjugate(self) -> complex: ... - def __add__(self, x: complex) -> complex: ... def __sub__(self, x: complex) -> complex: ... def __mul__(self, x: complex) -> complex: ... @@ -282,46 +308,35 @@ def __rmul__(self, x: complex) -> complex: ... def __rpow__(self, x: complex, mod: None = ...) -> complex: ... def __rtruediv__(self, x: complex) -> complex: ... - def __eq__(self, x: object) -> bool: ... def __ne__(self, x: object) -> bool: ... def __neg__(self) -> complex: ... def __pos__(self) -> complex: ... - def __str__(self) -> str: ... def __complex__(self) -> complex: ... def __abs__(self) -> float: ... def __hash__(self) -> int: ... def __bool__(self) -> bool: ... -_str_base = object - - - - - class _FormatMapMapping(Protocol): def __getitem__(self, __key: str) -> Any: ... -class str(Sequence[str], _str_base): +class str(Sequence[str]): @overload def __init__(self, o: object = ...) -> None: ... @overload def __init__(self, o: bytes, encoding: str = ..., errors: str = ...) -> None: ... - def capitalize(self) -> str: ... - if sys.version_info >= (3, 3): - def casefold(self) -> str: ... + def casefold(self) -> str: ... def center(self, __width: int, __fillchar: str = ...) -> str: ... - def count(self, x: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... - def encode(self, encoding: Text = ..., errors: Text = ...) -> bytes: ... - def endswith(self, suffix: Union[Text, Tuple[Text, ...]], start: Optional[int] = ..., - end: Optional[int] = ...) -> bool: ... + def count(self, x: str, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... + def encode(self, encoding: str = ..., errors: str = ...) -> bytes: ... + def endswith(self, suffix: Union[str, Tuple[str, ...]], start: Optional[int] = ..., end: Optional[int] = ...) -> bool: ... def expandtabs(self, tabsize: int = ...) -> str: ... - def find(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... + def find(self, sub: str, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def format(self, *args: object, **kwargs: object) -> str: ... def format_map(self, map: _FormatMapMapping) -> str: ... - def index(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... + def index(self, sub: str, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def isalnum(self) -> bool: ... def isalpha(self) -> bool: ... if sys.version_info >= (3, 7): @@ -344,16 +359,15 @@ if sys.version_info >= (3, 9): def removeprefix(self, __prefix: str) -> str: ... def removesuffix(self, __suffix: str) -> str: ... - def rfind(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... - def rindex(self, sub: Text, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... + def rfind(self, sub: str, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... + def rindex(self, sub: str, __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def rjust(self, __width: int, __fillchar: str = ...) -> str: ... def rpartition(self, __sep: str) -> Tuple[str, str, str]: ... def rsplit(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ... def rstrip(self, __chars: Optional[str] = ...) -> str: ... def split(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ... def splitlines(self, keepends: bool = ...) -> List[str]: ... - def startswith(self, prefix: Union[Text, Tuple[Text, ...]], start: Optional[int] = ..., - end: Optional[int] = ...) -> bool: ... + def startswith(self, prefix: Union[str, Tuple[str, ...]], start: Optional[int] = ..., end: Optional[int] = ...) -> bool: ... def strip(self, __chars: Optional[str] = ...) -> str: ... def swapcase(self) -> str: ... def title(self) -> str: ... @@ -366,19 +380,18 @@ @staticmethod @overload def maketrans(__x: str, __y: str, __z: Optional[str] = ...) -> Dict[int, Union[int, None]]: ... - def __add__(self, s: str) -> str: ... # Incompatible with Sequence.__contains__ - def __contains__(self, o: Union[str, Text]) -> bool: ... # type: ignore + def __contains__(self, o: Union[str, str]) -> bool: ... # type: ignore def __eq__(self, x: object) -> bool: ... - def __ge__(self, x: Text) -> bool: ... + def __ge__(self, x: str) -> bool: ... def __getitem__(self, i: Union[int, slice]) -> str: ... - def __gt__(self, x: Text) -> bool: ... + def __gt__(self, x: str) -> bool: ... def __hash__(self) -> int: ... def __iter__(self) -> Iterator[str]: ... - def __le__(self, x: Text) -> bool: ... + def __le__(self, x: str) -> bool: ... def __len__(self) -> int: ... - def __lt__(self, x: Text) -> bool: ... + def __lt__(self, x: str) -> bool: ... def __mod__(self, x: Any) -> str: ... def __mul__(self, n: int) -> str: ... def __ne__(self, x: object) -> bool: ... @@ -387,13 +400,11 @@ def __str__(self) -> str: ... def __getnewargs__(self) -> Tuple[str]: ... - class bytes(ByteString): @overload def __init__(self, ints: Iterable[int]) -> None: ... @overload - def __init__(self, string: str, encoding: str, - errors: str = ...) -> None: ... + def __init__(self, string: str, encoding: str, errors: str = ...) -> None: ... @overload def __init__(self, length: int) -> None: ... @overload @@ -409,7 +420,7 @@ def find(self, sub: Union[bytes, int], start: Optional[int] = ..., end: Optional[int] = ...) -> int: ... if sys.version_info >= (3, 8): def hex(self, sep: Union[str, bytes] = ..., bytes_per_sep: int = ...) -> str: ... - elif sys.version_info >= (3, 5): + else: def hex(self) -> str: ... def index(self, sub: Union[bytes, int], start: Optional[int] = ..., end: Optional[int] = ...) -> int: ... def isalnum(self) -> bool: ... @@ -439,10 +450,7 @@ def split(self, sep: Optional[bytes] = ..., maxsplit: int = ...) -> List[bytes]: ... def splitlines(self, keepends: bool = ...) -> List[bytes]: ... def startswith( - self, - prefix: Union[bytes, Tuple[bytes, ...]], - start: Optional[int] = ..., - end: Optional[int] = ..., + self, prefix: Union[bytes, Tuple[bytes, ...]], start: Optional[int] = ..., end: Optional[int] = ... ) -> bool: ... def strip(self, __bytes: Optional[bytes] = ...) -> bytes: ... def swapcase(self) -> bytes: ... @@ -454,7 +462,6 @@ def fromhex(cls, __s: str) -> bytes: ... @classmethod def maketrans(cls, frm: bytes, to: bytes) -> bytes: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[int]: ... def __str__(self) -> str: ... @@ -469,8 +476,7 @@ def __add__(self, s: bytes) -> bytes: ... def __mul__(self, n: int) -> bytes: ... def __rmul__(self, n: int) -> bytes: ... - if sys.version_info >= (3, 5): - def __mod__(self, value: Any) -> bytes: ... + def __mod__(self, value: Any) -> bytes: ... # Incompatible with Sequence.__contains__ def __contains__(self, o: Union[int, bytes]) -> bool: ... # type: ignore def __eq__(self, x: object) -> bool: ... @@ -487,19 +493,18 @@ @overload def __init__(self, ints: Iterable[int]) -> None: ... @overload - def __init__(self, string: Text, encoding: Text, errors: Text = ...) -> None: ... + def __init__(self, string: str, encoding: str, errors: str = ...) -> None: ... @overload def __init__(self, length: int) -> None: ... def capitalize(self) -> bytearray: ... def center(self, __width: int, __fillchar: bytes = ...) -> bytearray: ... def count(self, __sub: Union[bytes, int], __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def copy(self) -> bytearray: ... - def decode(self, encoding: Text = ..., errors: Text = ...) -> str: ... + def decode(self, encoding: str = ..., errors: str = ...) -> str: ... def endswith(self, __suffix: Union[bytes, Tuple[bytes, ...]]) -> bool: ... def expandtabs(self, tabsize: int = ...) -> bytearray: ... def find(self, __sub: Union[bytes, int], __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... - if sys.version_info >= (3, 5): - def hex(self) -> str: ... + def hex(self) -> str: ... def index(self, __sub: Union[bytes, int], __start: Optional[int] = ..., __end: Optional[int] = ...) -> int: ... def insert(self, __index: int, __item: int) -> None: ... def isalnum(self) -> bool: ... @@ -529,10 +534,7 @@ def split(self, sep: Optional[bytes] = ..., maxsplit: int = ...) -> List[bytearray]: ... def splitlines(self, keepends: bool = ...) -> List[bytearray]: ... def startswith( - self, - __prefix: Union[bytes, Tuple[bytes, ...]], - __start: Optional[int] = ..., - __end: Optional[int] = ..., + self, __prefix: Union[bytes, Tuple[bytes, ...]], __start: Optional[int] = ..., __end: Optional[int] = ... ) -> bool: ... def strip(self, __bytes: Optional[bytes] = ...) -> bytearray: ... def swapcase(self) -> bytearray: ... @@ -544,7 +546,6 @@ def fromhex(cls, __string: str) -> bytearray: ... @classmethod def maketrans(cls, __frm: bytes, __to: bytes) -> bytes: ... - def __len__(self) -> int: ... def __iter__(self) -> Iterator[int]: ... def __str__(self) -> str: ... @@ -566,8 +567,7 @@ def __mul__(self, n: int) -> bytearray: ... def __rmul__(self, n: int) -> bytearray: ... def __imul__(self, n: int) -> bytearray: ... - if sys.version_info >= (3, 5): - def __mod__(self, value: Any) -> bytes: ... + def __mod__(self, value: Any) -> bytes: ... # Incompatible with Sequence.__contains__ def __contains__(self, o: Union[int, bytes]) -> bool: ... # type: ignore def __eq__(self, x: object) -> bool: ... @@ -577,9 +577,7 @@ def __gt__(self, x: bytes) -> bool: ... def __ge__(self, x: bytes) -> bool: ... -_mv_container_type = int - -class memoryview(Sized, Container[_mv_container_type]): +class memoryview(Sized, Container[int]): format: str itemsize: int shape: Optional[Tuple[int, ...]] @@ -593,27 +591,25 @@ f_contiguous: bool contiguous: bool nbytes: int - def __init__(self, obj: Union[bytes, bytearray, memoryview]) -> None: ... + def __init__(self, obj: ReadableBuffer) -> None: ... def __enter__(self) -> memoryview: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def cast(self, format: str, shape: Union[List[int], Tuple[int]] = ...) -> memoryview: ... - @overload - def __getitem__(self, i: int) -> _mv_container_type: ... + def __getitem__(self, i: int) -> int: ... @overload def __getitem__(self, s: slice) -> memoryview: ... - def __contains__(self, x: object) -> bool: ... - def __iter__(self) -> Iterator[_mv_container_type]: ... + def __iter__(self) -> Iterator[int]: ... def __len__(self) -> int: ... - @overload def __setitem__(self, s: slice, o: memoryview) -> None: ... @overload def __setitem__(self, i: int, o: bytes) -> None: ... @overload def __setitem__(self, s: slice, o: Sequence[bytes]) -> None: ... - if sys.version_info >= (3, 8): def tobytes(self, order: Optional[Literal["C", "F", "A"]] = ...) -> bytes: ... else: @@ -621,12 +617,8 @@ def tolist(self) -> List[int]: ... if sys.version_info >= (3, 8): def toreadonly(self) -> memoryview: ... - - if sys.version_info >= (3, 2): - def release(self) -> None: ... - - if sys.version_info >= (3, 5): - def hex(self) -> str: ... + def release(self) -> None: ... + def hex(self) -> str: ... class bool(int): def __init__(self, o: object = ...) -> None: ... @@ -680,14 +672,14 @@ def __le__(self, x: Tuple[_T_co, ...]) -> bool: ... def __gt__(self, x: Tuple[_T_co, ...]) -> bool: ... def __ge__(self, x: Tuple[_T_co, ...]) -> bool: ... + @overload def __add__(self, x: Tuple[_T_co, ...]) -> Tuple[_T_co, ...]: ... + @overload + def __add__(self, x: Tuple[Any, ...]) -> Tuple[Any, ...]: ... def __mul__(self, n: int) -> Tuple[_T_co, ...]: ... def __rmul__(self, n: int) -> Tuple[_T_co, ...]: ... def count(self, __value: Any) -> int: ... - if sys.version_info >= (3, 5): - def index(self, __value: Any, __start: int = ..., __stop: int = ...) -> int: ... - else: - def index(self, __value: Any) -> int: ... + def index(self, __value: Any, __start: int = ..., __stop: int = ...) -> int: ... if sys.version_info >= (3, 9): def __class_getitem__(cls, item: Any) -> GenericAlias: ... @@ -715,10 +707,9 @@ def remove(self, __value: _T) -> None: ... def reverse(self) -> None: ... @overload - def sort(self: List[_LT], *, key: None = ..., reverse: bool = ...) -> None: ... + def sort(self: List[SupportsLessThanT], *, key: None = ..., reverse: bool = ...) -> None: ... @overload - def sort(self, *, key: Callable[[_T], _SupportsLessThan], reverse: bool = ...) -> None: ... - + def sort(self, *, key: Callable[[_T], SupportsLessThan], reverse: bool = ...) -> None: ... def __len__(self) -> int: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... @@ -752,12 +743,10 @@ @overload def __init__(self, **kwargs: _VT) -> None: ... @overload - def __init__(self, map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... + def __init__(self, map: SupportsKeysAndGetItem[_KT, _VT], **kwargs: _VT) -> None: ... @overload def __init__(self, iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT) -> None: ... - def __new__(cls: Type[_T1], *args: Any, **kwargs: Any) -> _T1: ... - def clear(self) -> None: ... def copy(self) -> Dict[_KT, _VT]: ... def popitem(self) -> Tuple[_KT, _VT]: ... @@ -788,6 +777,8 @@ __hash__: None # type: ignore if sys.version_info >= (3, 9): def __class_getitem__(cls, item: Any) -> GenericAlias: ... + def __or__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... + def __ior__(self, __value: Mapping[_KT, _VT]) -> Dict[_KT, _VT]: ... class set(MutableSet[_T], Generic[_T]): def __init__(self, iterable: Iterable[_T] = ...) -> None: ... @@ -816,8 +807,8 @@ def __iand__(self, s: AbstractSet[object]) -> Set[_T]: ... def __or__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ior__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... - def __sub__(self, s: AbstractSet[object]) -> Set[_T]: ... - def __isub__(self, s: AbstractSet[object]) -> Set[_T]: ... + def __sub__(self, s: AbstractSet[_T]) -> Set[_T]: ... + def __isub__(self, s: AbstractSet[_T]) -> Set[_T]: ... def __xor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __ixor__(self, s: AbstractSet[_S]) -> Set[Union[_T, _S]]: ... def __le__(self, s: AbstractSet[object]) -> bool: ... @@ -857,6 +848,8 @@ def __init__(self, iterable: Iterable[_T], start: int = ...) -> None: ... def __iter__(self) -> Iterator[Tuple[int, _T]]: ... def __next__(self) -> Tuple[int, _T]: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class range(Sequence[int]): start: int @@ -879,10 +872,13 @@ def __reversed__(self) -> Iterator[int]: ... class property(object): - def __init__(self, fget: Optional[Callable[[Any], Any]] = ..., - fset: Optional[Callable[[Any, Any], None]] = ..., - fdel: Optional[Callable[[Any], None]] = ..., - doc: Optional[str] = ...) -> None: ... + def __init__( + self, + fget: Optional[Callable[[Any], Any]] = ..., + fset: Optional[Callable[[Any, Any], None]] = ..., + fdel: Optional[Callable[[Any], None]] = ..., + doc: Optional[str] = ..., + ) -> None: ... def getter(self, fget: Callable[[Any], Any]) -> property: ... def setter(self, fset: Callable[[Any, Any], None]) -> property: ... def deleter(self, fdel: Callable[[Any], None]) -> property: ... @@ -893,7 +889,6 @@ def fset(self, value: Any) -> None: ... def fdel(self) -> None: ... - class _NotImplementedType(Any): # type: ignore # A little weird, but typing the __call__ as NotImplemented makes the error message # for NotImplemented() much better @@ -905,38 +900,69 @@ def all(__iterable: Iterable[object]) -> bool: ... def any(__iterable: Iterable[object]) -> bool: ... def ascii(__obj: object) -> str: ... - def bin(__number: Union[int, _SupportsIndex]) -> str: ... if sys.version_info >= (3, 7): def breakpoint(*args: Any, **kws: Any) -> None: ... + def callable(__obj: object) -> bool: ... def chr(__i: int) -> str: ... -if sys.version_info >= (3, 6): - # This class is to be exported as PathLike from os, - # but we define it here as _PathLike to avoid import cycle issues. - # See https://github.com/python/typeshed/pull/991#issuecomment-288160993 - class _PathLike(Generic[AnyStr]): - def __fspath__(self) -> AnyStr: ... - def compile(source: Union[str, bytes, mod, AST], filename: Union[str, bytes, _PathLike[Any]], mode: str, flags: int = ..., dont_inherit: int = ..., optimize: int = ...) -> Any: ... -def compile(source: Union[str, bytes, mod, AST], filename: Union[str, bytes], mode: str, flags: int = ..., dont_inherit: int = ..., optimize: int = ...) -> Any: ... + +# This class is to be exported as PathLike from os, +# but we define it here as _PathLike to avoid import cycle issues. +# See https://github.com/python/typeshed/pull/991#issuecomment-288160993 +_AnyStr_co = TypeVar("_AnyStr_co", str, bytes, covariant=True) +@runtime_checkable +class _PathLike(Protocol[_AnyStr_co]): + def __fspath__(self) -> _AnyStr_co: ... + +if sys.version_info >= (3, 8): + def compile( + source: Union[str, bytes, mod, AST], + filename: Union[str, bytes, _PathLike[Any]], + mode: str, + flags: int = ..., + dont_inherit: int = ..., + optimize: int = ..., + *, + _feature_version: int = ..., + ) -> Any: ... + +else: + def compile( + source: Union[str, bytes, mod, AST], + filename: Union[str, bytes, _PathLike[Any]], + mode: str, + flags: int = ..., + dont_inherit: int = ..., + optimize: int = ..., + ) -> Any: ... + def copyright() -> None: ... def credits() -> None: ... -def delattr(__obj: Any, __name: Text) -> None: ... +def delattr(__obj: Any, __name: str) -> None: ... def dir(__o: object = ...) -> List[str]: ... -_N2 = TypeVar('_N2', int, float) + +_N2 = TypeVar("_N2", int, float) + def divmod(__x: _N2, __y: _N2) -> Tuple[_N2, _N2]: ... -def eval(__source: Union[Text, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ...) -> Any: ... -def exec(__source: Union[str, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ...) -> Any: ... +def eval( + __source: Union[str, bytes, CodeType], __globals: Optional[Dict[str, Any]] = ..., __locals: Optional[Mapping[str, Any]] = ... +) -> Any: ... +def exec( + __source: Union[str, bytes, CodeType], + __globals: Optional[Dict[str, Any]] = ..., + __locals: Optional[Mapping[str, Any]] = ..., +) -> Any: ... def exit(code: object = ...) -> NoReturn: ... @overload def filter(__function: None, __iterable: Iterable[Optional[_T]]) -> Iterator[_T]: ... @overload def filter(__function: Callable[[_T], Any], __iterable: Iterable[_T]) -> Iterator[_T]: ... def format(__value: object, __format_spec: str = ...) -> str: ... # TODO unicode -def getattr(__o: Any, name: Text, __default: Any = ...) -> Any: ... +def getattr(__o: Any, name: str, __default: Any = ...) -> Any: ... def globals() -> Dict[str, Any]: ... -def hasattr(__obj: Any, __name: Text) -> bool: ... +def hasattr(__obj: Any, __name: str) -> bool: ... def hash(__obj: object) -> int: ... def help(*args: Any, **kwds: Any) -> None: ... def hex(__number: Union[int, _SupportsIndex]) -> str: ... @@ -956,47 +982,67 @@ @overload def map(__func: Callable[[_T1], _S], __iter1: Iterable[_T1]) -> Iterator[_S]: ... @overload -def map(__func: Callable[[_T1, _T2], _S], __iter1: Iterable[_T1], - __iter2: Iterable[_T2]) -> Iterator[_S]: ... +def map(__func: Callable[[_T1, _T2], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> Iterator[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3], _S], __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3] +) -> Iterator[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], +) -> Iterator[_S]: ... +@overload +def map( + __func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], + __iter1: Iterable[_T1], + __iter2: Iterable[_T2], + __iter3: Iterable[_T3], + __iter4: Iterable[_T4], + __iter5: Iterable[_T5], +) -> Iterator[_S]: ... +@overload +def map( + __func: Callable[..., _S], + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[_S]: ... +@overload +def max( + __arg1: SupportsLessThanT, __arg2: SupportsLessThanT, *_args: SupportsLessThanT, key: None = ... +) -> SupportsLessThanT: ... +@overload +def max(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], SupportsLessThanT]) -> _T: ... +@overload +def max(__iterable: Iterable[SupportsLessThanT], *, key: None = ...) -> SupportsLessThanT: ... +@overload +def max(__iterable: Iterable[_T], *, key: Callable[[_T], SupportsLessThanT]) -> _T: ... +@overload +def max(__iterable: Iterable[SupportsLessThanT], *, key: None = ..., default: _T) -> Union[SupportsLessThanT, _T]: ... @overload -def map(__func: Callable[[_T1, _T2, _T3], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> Iterator[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> Iterator[_S]: ... -@overload -def map(__func: Callable[[_T1, _T2, _T3, _T4, _T5], _S], - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - __iter3: Iterable[_T3], - __iter4: Iterable[_T4], - __iter5: Iterable[_T5]) -> Iterator[_S]: ... -@overload -def map(__func: Callable[..., _S], - __iter1: Iterable[Any], - __iter2: Iterable[Any], - __iter3: Iterable[Any], - __iter4: Iterable[Any], - __iter5: Iterable[Any], - __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> Iterator[_S]: ... -@overload -def max(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ... -@overload -def max(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ... +def max(__iterable: Iterable[_T1], *, key: Callable[[_T1], SupportsLessThanT], default: _T2) -> Union[_T1, _T2]: ... @overload -def max(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT) -> Union[_T, _VT]: ... +def min( + __arg1: SupportsLessThanT, __arg2: SupportsLessThanT, *_args: SupportsLessThanT, key: None = ... +) -> SupportsLessThanT: ... @overload -def min(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ... +def min(__arg1: _T, __arg2: _T, *_args: _T, key: Callable[[_T], SupportsLessThanT]) -> _T: ... @overload -def min(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ... +def min(__iterable: Iterable[SupportsLessThanT], *, key: None = ...) -> SupportsLessThanT: ... @overload -def min(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT) -> Union[_T, _VT]: ... +def min(__iterable: Iterable[_T], *, key: Callable[[_T], SupportsLessThanT]) -> _T: ... +@overload +def min(__iterable: Iterable[SupportsLessThanT], *, key: None = ..., default: _T) -> Union[SupportsLessThanT, _T]: ... +@overload +def min(__iterable: Iterable[_T1], *, key: Callable[[_T1], SupportsLessThanT], default: _T2) -> Union[_T1, _T2]: ... @overload def next(__i: Iterator[_T]) -> _T: ... @overload @@ -1092,20 +1138,24 @@ closefd: bool = ..., opener: Optional[_Opener] = ..., ) -> IO[Any]: ... - - -def ord(__c: Union[Text, bytes]) -> int: ... +def ord(__c: Union[str, bytes]) -> int: ... def print( - *values: object, sep: Optional[Text] = ..., end: Optional[Text] = ..., file: Optional[SupportsWrite[str]] = ..., flush: bool = ... + *values: object, + sep: Optional[str] = ..., + end: Optional[str] = ..., + file: Optional[SupportsWrite[str]] = ..., + flush: bool = ..., ) -> None: ... - _E = TypeVar("_E", contravariant=True) _M = TypeVar("_M", contravariant=True) + class _SupportsPow2(Protocol[_E, _T_co]): def __pow__(self, __other: _E) -> _T_co: ... + class _SupportsPow3(Protocol[_E, _M, _T_co]): def __pow__(self, __other: _E, __modulo: _M) -> _T_co: ... + if sys.version_info >= (3, 8): @overload def pow(base: int, exp: int, mod: None = ...) -> Any: ... # returns int or float depending on whether exp is non-negative @@ -1117,9 +1167,12 @@ def pow(base: _SupportsPow2[_E, _T_co], exp: _E) -> _T_co: ... @overload def pow(base: _SupportsPow3[_E, _M, _T_co], exp: _E, mod: _M) -> _T_co: ... + else: @overload - def pow(__base: int, __exp: int, __mod: None = ...) -> Any: ... # returns int or float depending on whether exp is non-negative + def pow( + __base: int, __exp: int, __mod: None = ... + ) -> Any: ... # returns int or float depending on whether exp is non-negative @overload def pow(__base: int, __exp: int, __mod: int) -> int: ... @overload @@ -1128,11 +1181,12 @@ def pow(__base: _SupportsPow2[_E, _T_co], __exp: _E) -> _T_co: ... @overload def pow(__base: _SupportsPow3[_E, _M, _T_co], __exp: _E, __mod: _M) -> _T_co: ... + def quit(code: object = ...) -> NoReturn: ... @overload -def reversed(__object: Sequence[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Sequence[_T]) -> Iterator[_T]: ... @overload -def reversed(__object: Reversible[_T]) -> Iterator[_T]: ... +def reversed(__sequence: Reversible[_T]) -> Iterator[_T]: ... def repr(__obj: object) -> str: ... @overload def round(number: float) -> int: ... @@ -1146,64 +1200,62 @@ def round(number: SupportsRound[_T], ndigits: None) -> int: ... @overload def round(number: SupportsRound[_T], ndigits: int) -> _T: ... -def setattr(__obj: Any, __name: Text, __value: Any) -> None: ... +def setattr(__obj: Any, __name: str, __value: Any) -> None: ... +@overload +def sorted(__iterable: Iterable[SupportsLessThanT], *, key: None = ..., reverse: bool = ...) -> List[SupportsLessThanT]: ... @overload -def sorted(__iterable: Iterable[_LT], *, - key: None = ..., - reverse: bool = ...) -> List[_LT]: ... -@overload -def sorted(__iterable: Iterable[_T], *, - key: Callable[[_T], _SupportsLessThan], - reverse: bool = ...) -> List[_T]: ... +def sorted(__iterable: Iterable[_T], *, key: Callable[[_T], SupportsLessThan], reverse: bool = ...) -> List[_T]: ... + if sys.version_info >= (3, 8): @overload def sum(__iterable: Iterable[_T]) -> Union[_T, int]: ... @overload def sum(__iterable: Iterable[_T], start: _S) -> Union[_T, _S]: ... + else: @overload def sum(__iterable: Iterable[_T]) -> Union[_T, int]: ... @overload def sum(__iterable: Iterable[_T], __start: _S) -> Union[_T, _S]: ... -def vars(__object: Any = ...) -> Dict[str, Any]: ... -# Some overloads to better support zipping heterogeneous tuples -@overload -def zip(*iterables: Tuple[_T1, _T2]) -> Tuple[Tuple[_T1, ...], Tuple[_T2, ...]]: ... # type: ignore -@overload -def zip(*iterables: Tuple[_T1, _T2, _T3]) -> Tuple[Tuple[_T1, ...], Tuple[_T2, ...], Tuple[_T3, ...]]: ... # type: ignore -@overload -def zip(*iterables: Tuple[_T1, _T2, _T3, _T4]) -> Tuple[Tuple[_T1, ...], Tuple[_T2, ...], Tuple[_T3, ...], Tuple[_T4, ...]]: ... # type: ignore -@overload -def zip(*iterables: Tuple[_T1, _T2, _T3, _T4, _T5]) -> Tuple[Tuple[_T1, ...], Tuple[_T2, ...], Tuple[_T3, ...], Tuple[_T4, ...], Tuple[_T5, ...]]: ... # type: ignore +def vars(__object: Any = ...) -> Dict[str, Any]: ... @overload def zip(__iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ... @overload def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], - __iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... -@overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... +def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... @overload -def zip(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], - __iter4: Iterable[_T4], __iter5: Iterable[_T5]) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def zip(__iter1: Iterable[Any], __iter2: Iterable[Any], __iter3: Iterable[Any], - __iter4: Iterable[Any], __iter5: Iterable[Any], __iter6: Iterable[Any], - *iterables: Iterable[Any]) -> Iterator[Tuple[Any, ...]]: ... -def __import__(name: Text, globals: Optional[Mapping[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ..., - fromlist: Sequence[str] = ..., - level: int = ...) -> Any: ... +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def zip( + __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4], __iter5: Iterable[_T5] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def zip( + __iter1: Iterable[Any], + __iter2: Iterable[Any], + __iter3: Iterable[Any], + __iter4: Iterable[Any], + __iter5: Iterable[Any], + __iter6: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[Tuple[Any, ...]]: ... +def __import__( + name: str, + globals: Optional[Mapping[str, Any]] = ..., + locals: Optional[Mapping[str, Any]] = ..., + fromlist: Sequence[str] = ..., + level: int = ..., +) -> Any: ... # Actually the type of Ellipsis is , but since it's # not exposed anywhere under that name, we make it private here. class ellipsis: ... -Ellipsis: ellipsis - +Ellipsis: ellipsis class BaseException(object): args: Tuple[Any, ...] @@ -1214,22 +1266,28 @@ def __init__(self, *args: object) -> None: ... def __str__(self) -> str: ... def __repr__(self) -> str: ... - def with_traceback(self, tb: Optional[TracebackType]) -> BaseException: ... + def with_traceback(self: _TBE, tb: Optional[TracebackType]) -> _TBE: ... class GeneratorExit(BaseException): ... class KeyboardInterrupt(BaseException): ... + class SystemExit(BaseException): code: int + class Exception(BaseException): ... + class StopIteration(Exception): value: Any + _StandardError = Exception + class OSError(Exception): errno: int strerror: str # filename, filename2 are actually Union[str, bytes, None] filename: Any filename2: Any + EnvironmentError = OSError IOError = OSError @@ -1238,45 +1296,45 @@ class AttributeError(_StandardError): ... class BufferError(_StandardError): ... class EOFError(_StandardError): ... + class ImportError(_StandardError): - if sys.version_info >= (3, 3): - def __init__(self, *args: object, name: Optional[str] = ..., path: Optional[str] = ...) -> None: ... - name: Optional[str] - path: Optional[str] + def __init__(self, *args: object, name: Optional[str] = ..., path: Optional[str] = ...) -> None: ... + name: Optional[str] + path: Optional[str] + class LookupError(_StandardError): ... class MemoryError(_StandardError): ... class NameError(_StandardError): ... class ReferenceError(_StandardError): ... class RuntimeError(_StandardError): ... -if sys.version_info >= (3, 5): - class StopAsyncIteration(Exception): - value: Any + +class StopAsyncIteration(Exception): + value: Any + class SyntaxError(_StandardError): msg: str lineno: Optional[int] offset: Optional[int] text: Optional[str] filename: Optional[str] + class SystemError(_StandardError): ... class TypeError(_StandardError): ... class ValueError(_StandardError): ... - class FloatingPointError(ArithmeticError): ... class OverflowError(ArithmeticError): ... class ZeroDivisionError(ArithmeticError): ... - -if sys.version_info >= (3, 6): - class ModuleNotFoundError(ImportError): ... - +class ModuleNotFoundError(ImportError): ... class IndexError(LookupError): ... class KeyError(LookupError): ... - class UnboundLocalError(NameError): ... class WindowsError(OSError): winerror: int + class BlockingIOError(OSError): characters_written: int + class ChildProcessError(OSError): ... class ConnectionError(OSError): ... class BrokenPipeError(ConnectionError): ... @@ -1291,33 +1349,29 @@ class PermissionError(OSError): ... class ProcessLookupError(OSError): ... class TimeoutError(OSError): ... - class NotImplementedError(RuntimeError): ... -if sys.version_info >= (3, 5): - class RecursionError(RuntimeError): ... - +class RecursionError(RuntimeError): ... class IndentationError(SyntaxError): ... class TabError(IndentationError): ... - class UnicodeError(ValueError): ... + class UnicodeDecodeError(UnicodeError): encoding: str object: bytes start: int end: int reason: str - def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, - __reason: str) -> None: ... + def __init__(self, __encoding: str, __object: bytes, __start: int, __end: int, __reason: str) -> None: ... + class UnicodeEncodeError(UnicodeError): encoding: str - object: Text + object: str start: int end: int reason: str - def __init__(self, __encoding: str, __object: Text, __start: int, __end: int, - __reason: str) -> None: ... -class UnicodeTranslateError(UnicodeError): ... + def __init__(self, __encoding: str, __object: str, __start: int, __end: int, __reason: str) -> None: ... +class UnicodeTranslateError(UnicodeError): ... class Warning(Exception): ... class UserWarning(Warning): ... class DeprecationWarning(Warning): ... @@ -1328,7 +1382,4 @@ class ImportWarning(Warning): ... class UnicodeWarning(Warning): ... class BytesWarning(Warning): ... -if sys.version_info >= (3, 2): - class ResourceWarning(Warning): ... - - +class ResourceWarning(Warning): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/collections/abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/collections/abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/collections/abc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/collections/abc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,36 +1,27 @@ -# Stubs for collections.abc (introduced from Python 3.3) -# -# https://docs.python.org/3.3/whatsnew/3.3.html#collections -import sys - from . import ( + AsyncGenerator as AsyncGenerator, AsyncIterable as AsyncIterable, AsyncIterator as AsyncIterator, Awaitable as Awaitable, ByteString as ByteString, + Callable as Callable, + Collection as Collection, Container as Container, Coroutine as Coroutine, Generator as Generator, Hashable as Hashable, + ItemsView as ItemsView, Iterable as Iterable, Iterator as Iterator, - Sized as Sized, - Callable as Callable, + KeysView as KeysView, Mapping as Mapping, + MappingView as MappingView, MutableMapping as MutableMapping, - Sequence as Sequence, MutableSequence as MutableSequence, - Set as Set, MutableSet as MutableSet, - MappingView as MappingView, - ItemsView as ItemsView, - KeysView as KeysView, + Reversible as Reversible, + Sequence as Sequence, + Set as Set, + Sized as Sized, ValuesView as ValuesView, ) - -if sys.version_info >= (3, 6): - from . import ( - Collection as Collection, - Reversible as Reversible, - AsyncGenerator as AsyncGenerator, - ) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/collections/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/collections/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/collections/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/collections/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,49 +1,49 @@ -# These are not exported. import sys import typing from typing import ( - TypeVar, Generic, Dict, overload, List, Tuple, - Any, Type, Optional, Union -) -# These are exported. -from . import abc - -from typing import ( + AbstractSet, + Any, + AsyncGenerator as AsyncGenerator, AsyncIterable as AsyncIterable, AsyncIterator as AsyncIterator, Awaitable as Awaitable, + ByteString as ByteString, Callable as Callable, + Collection as Collection, Container as Container, Coroutine as Coroutine, + Dict, + Generator as Generator, + Generic, Hashable as Hashable, + ItemsView as ItemsView, Iterable as Iterable, Iterator as Iterator, - Sized as Sized, - Generator as Generator, - ByteString as ByteString, - Reversible as Reversible, + KeysView as KeysView, + List, Mapping as Mapping, MappingView as MappingView, - ItemsView as ItemsView, - KeysView as KeysView, - ValuesView as ValuesView, MutableMapping as MutableMapping, - Sequence as Sequence, MutableSequence as MutableSequence, MutableSet as MutableSet, - AbstractSet as Set, + Optional, + Reversible as Reversible, + Sequence as Sequence, + Sized as Sized, + Tuple, + Type, + TypeVar, + Union, + ValuesView as ValuesView, + overload, ) -if sys.version_info >= (3, 6): - from typing import ( - Collection as Collection, - AsyncGenerator as AsyncGenerator, - ) - -_S = TypeVar('_S') -_T = TypeVar('_T') -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') +Set = AbstractSet + +_S = TypeVar("_S") +_T = TypeVar("_T") +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") # namedtuple is special-cased in the type checker; the initializer is ignored. if sys.version_info >= (3, 7): @@ -55,7 +55,8 @@ module: Optional[str] = ..., defaults: Optional[Iterable[Any]] = ..., ) -> Type[Tuple[Any, ...]]: ... -elif sys.version_info >= (3, 6): + +else: def namedtuple( typename: str, field_names: Union[str, Iterable[str]], @@ -64,14 +65,10 @@ rename: bool = ..., module: Optional[str] = ..., ) -> Type[Tuple[Any, ...]]: ... -else: - def namedtuple( - typename: str, field_names: Union[str, Iterable[str]], verbose: bool = ..., rename: bool = ..., - ) -> Type[Tuple[Any, ...]]: ... class UserDict(MutableMapping[_KT, _VT]): data: Dict[_KT, _VT] - def __init__(self, dict: Optional[Mapping[_KT, _VT]] = ..., **kwargs: _VT) -> None: ... + def __init__(self, __dict: Optional[Mapping[_KT, _VT]] = ..., **kwargs: _VT) -> None: ... def __len__(self) -> int: ... def __getitem__(self, key: _KT) -> _VT: ... def __setitem__(self, key: _KT, item: _VT) -> None: ... @@ -116,7 +113,7 @@ def sort(self, *args: Any, **kwds: Any) -> None: ... def extend(self, other: Iterable[_T]) -> None: ... -_UserStringT = TypeVar('_UserStringT', bound=UserString) +_UserStringT = TypeVar("_UserStringT", bound=UserString) class UserString(Sequence[str]): data: str @@ -172,7 +169,9 @@ if sys.version_info >= (3, 9): def removeprefix(self: _UserStringT, __prefix: Union[str, UserString]) -> _UserStringT: ... def removesuffix(self: _UserStringT, __suffix: Union[str, UserString]) -> _UserStringT: ... - def replace(self: _UserStringT, old: Union[str, UserString], new: Union[str, UserString], maxsplit: int = ...) -> _UserStringT: ... + def replace( + self: _UserStringT, old: Union[str, UserString], new: Union[str, UserString], maxsplit: int = ... + ) -> _UserStringT: ... def rfind(self, sub: Union[str, UserString], start: int = ..., end: int = ...) -> int: ... def rindex(self, sub: Union[str, UserString], start: int = ..., end: int = ...) -> int: ... def rjust(self: _UserStringT, width: int, *args: Any) -> _UserStringT: ... @@ -189,15 +188,10 @@ def upper(self: _UserStringT) -> _UserStringT: ... def zfill(self: _UserStringT, width: int) -> _UserStringT: ... - -# Technically, deque only derives from MutableSequence in 3.5 (before then, the insert and index -# methods did not exist). -# But in practice it's not worth losing sleep over. class deque(MutableSequence[_T], Generic[_T]): @property def maxlen(self) -> Optional[int]: ... - def __init__(self, iterable: Iterable[_T] = ..., - maxlen: Optional[int] = ...) -> None: ... + def __init__(self, iterable: Iterable[_T] = ..., maxlen: Optional[int] = ...) -> None: ... def append(self, x: _T) -> None: ... def appendleft(self, x: _T) -> None: ... def clear(self) -> None: ... @@ -207,17 +201,15 @@ def extendleft(self, iterable: Iterable[_T]) -> None: ... def insert(self, i: int, x: _T) -> None: ... def index(self, x: _T, start: int = ..., stop: int = ...) -> int: ... - def pop(self, i: int = ...) -> _T: ... + def pop(self) -> _T: ... # type: ignore def popleft(self) -> _T: ... def remove(self, value: _T) -> None: ... def reverse(self) -> None: ... - def rotate(self, n: int) -> None: ... - + def rotate(self, n: int = ...) -> None: ... def __len__(self) -> int: ... def __iter__(self) -> Iterator[_T]: ... def __str__(self) -> str: ... def __hash__(self) -> int: ... - # These methods of deque don't really take slices, but we need to # define them as taking a slice to satisfy MutableSequence. @overload @@ -232,12 +224,9 @@ def __delitem__(self, i: int) -> None: ... @overload def __delitem__(self, s: slice) -> None: ... - def __contains__(self, o: object) -> bool: ... def __reversed__(self) -> Iterator[_T]: ... - def __iadd__(self: _S, iterable: Iterable[_T]) -> _S: ... - def __add__(self, other: deque[_T]) -> deque[_T]: ... def __mul__(self, other: int) -> deque[_T]: ... def __imul__(self, other: int) -> None: ... @@ -251,16 +240,13 @@ def __init__(self, __iterable: Iterable[_T]) -> None: ... def copy(self: _S) -> _S: ... def elements(self) -> Iterator[_T]: ... - def most_common(self, n: Optional[int] = ...) -> List[Tuple[_T, int]]: ... - @overload def subtract(self, __iterable: None = ...) -> None: ... @overload def subtract(self, __mapping: Mapping[_T, int]) -> None: ... @overload def subtract(self, __iterable: Iterable[_T]) -> None: ... - # The Iterable[Tuple[...]] argument type is not actually desirable # (the tuples will be added as keys, breaking type safety) but # it's included so that the signature is compatible with @@ -272,22 +258,23 @@ def update(self, __m: Union[Iterable[_T], Iterable[Tuple[_T, int]]], **kwargs: int) -> None: ... @overload def update(self, __m: None = ..., **kwargs: int) -> None: ... - def __add__(self, other: Counter[_T]) -> Counter[_T]: ... def __sub__(self, other: Counter[_T]) -> Counter[_T]: ... def __and__(self, other: Counter[_T]) -> Counter[_T]: ... - def __or__(self, other: Counter[_T]) -> Counter[_T]: ... + def __or__(self, other: Counter[_T]) -> Counter[_T]: ... # type: ignore def __pos__(self) -> Counter[_T]: ... def __neg__(self) -> Counter[_T]: ... def __iadd__(self, other: Counter[_T]) -> Counter[_T]: ... def __isub__(self, other: Counter[_T]) -> Counter[_T]: ... def __iand__(self, other: Counter[_T]) -> Counter[_T]: ... - def __ior__(self, other: Counter[_T]) -> Counter[_T]: ... + def __ior__(self, other: Counter[_T]) -> Counter[_T]: ... # type: ignore class _OrderedDictKeysView(KeysView[_KT], Reversible[_KT]): def __reversed__(self) -> Iterator[_KT]: ... + class _OrderedDictItemsView(ItemsView[_KT, _VT], Reversible[Tuple[_KT, _VT]]): def __reversed__(self) -> Iterator[Tuple[_KT, _VT]]: ... + class _OrderedDictValuesView(ValuesView[_VT], Reversible[_VT]): def __reversed__(self) -> Iterator[_VT]: ... @@ -302,7 +289,6 @@ class defaultdict(Dict[_KT, _VT], Generic[_KT, _VT]): default_factory: Optional[Callable[[], _VT]] - @overload def __init__(self, **kwargs: _VT) -> None: ... @overload @@ -310,32 +296,26 @@ @overload def __init__(self, default_factory: Optional[Callable[[], _VT]], **kwargs: _VT) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - map: Mapping[_KT, _VT]) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], map: Mapping[_KT, _VT]) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], map: Mapping[_KT, _VT], **kwargs: _VT) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - iterable: Iterable[Tuple[_KT, _VT]]) -> None: ... + def __init__(self, default_factory: Optional[Callable[[], _VT]], iterable: Iterable[Tuple[_KT, _VT]]) -> None: ... @overload - def __init__(self, default_factory: Optional[Callable[[], _VT]], - iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT) -> None: ... + def __init__( + self, default_factory: Optional[Callable[[], _VT]], iterable: Iterable[Tuple[_KT, _VT]], **kwargs: _VT + ) -> None: ... def __missing__(self, key: _KT) -> _VT: ... # TODO __reversed__ def copy(self: _S) -> _S: ... class ChainMap(MutableMapping[_KT, _VT], Generic[_KT, _VT]): def __init__(self, *maps: Mapping[_KT, _VT]) -> None: ... - @property def maps(self) -> List[Mapping[_KT, _VT]]: ... - def new_child(self, m: Mapping[_KT, _VT] = ...) -> typing.ChainMap[_KT, _VT]: ... - @property def parents(self) -> typing.ChainMap[_KT, _VT]: ... - def __setitem__(self, k: _KT, v: _VT) -> None: ... def __delitem__(self, v: _KT) -> None: ... def __getitem__(self, k: _KT) -> _VT: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_compat_pickle.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_compat_pickle.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_compat_pickle.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_compat_pickle.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ - from typing import Dict, Tuple -import sys IMPORT_MAPPING: Dict[str, str] NAME_MAPPING: Dict[Tuple[str, str], Tuple[str, str]] @@ -9,6 +7,4 @@ REVERSE_IMPORT_MAPPING: Dict[str, str] REVERSE_NAME_MAPPING: Dict[Tuple[str, str], Tuple[str, str]] PYTHON3_OSERROR_EXCEPTIONS: Tuple[str, ...] - -if sys.version_info >= (3, 6): - PYTHON3_IMPORTERROR_EXCEPTIONS: Tuple[str, ...] +PYTHON3_IMPORTERROR_EXCEPTIONS: Tuple[str, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/compileall.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/compileall.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/compileall.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/compileall.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,11 +2,6 @@ from _typeshed import AnyPath from typing import Any, Optional, Pattern -if sys.version_info < (3, 6): - _SuccessType = bool -else: - _SuccessType = int - if sys.version_info >= (3, 7): from py_compile import PycInvalidationMode @@ -26,7 +21,8 @@ stripdir: Optional[str] = ..., # TODO: change to Optional[AnyPath] once https://bugs.python.org/issue40447 is resolved prependdir: Optional[AnyPath] = ..., limit_sl_dest: Optional[AnyPath] = ..., - ) -> _SuccessType: ... + hardlink_dupes: bool = ..., + ) -> int: ... def compile_file( fullname: AnyPath, ddir: Optional[AnyPath] = ..., @@ -40,7 +36,9 @@ stripdir: Optional[str] = ..., # TODO: change to Optional[AnyPath] once https://bugs.python.org/issue40447 is resolved prependdir: Optional[AnyPath] = ..., limit_sl_dest: Optional[AnyPath] = ..., - ) -> _SuccessType: ... + hardlink_dupes: bool = ..., + ) -> int: ... + elif sys.version_info >= (3, 7): def compile_dir( dir: AnyPath, @@ -53,7 +51,7 @@ optimize: int = ..., workers: int = ..., invalidation_mode: Optional[PycInvalidationMode] = ..., - ) -> _SuccessType: ... + ) -> int: ... def compile_file( fullname: AnyPath, ddir: Optional[AnyPath] = ..., @@ -63,7 +61,7 @@ legacy: bool = ..., optimize: int = ..., invalidation_mode: Optional[PycInvalidationMode] = ..., - ) -> _SuccessType: ... + ) -> int: ... else: # rx can be any object with a 'search' method; once we have Protocols we can change the type @@ -77,7 +75,7 @@ legacy: bool = ..., optimize: int = ..., workers: int = ..., - ) -> _SuccessType: ... + ) -> int: ... def compile_file( fullname: AnyPath, ddir: Optional[AnyPath] = ..., @@ -86,7 +84,7 @@ quiet: int = ..., legacy: bool = ..., optimize: int = ..., - ) -> _SuccessType: ... + ) -> int: ... if sys.version_info >= (3, 7): def compile_path( @@ -97,7 +95,8 @@ legacy: bool = ..., optimize: int = ..., invalidation_mode: Optional[PycInvalidationMode] = ..., - ) -> _SuccessType: ... + ) -> int: ... + else: def compile_path( skip_curdir: bool = ..., @@ -106,4 +105,4 @@ quiet: int = ..., legacy: bool = ..., optimize: int = ..., - ) -> _SuccessType: ... + ) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_compression.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_compression.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_compression.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_compression.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,23 @@ -from typing import Any -import io +from _typeshed import WriteableBuffer +from io import BufferedIOBase, RawIOBase +from typing import Any, Callable, Tuple, Type, Union BUFFER_SIZE: Any -class BaseStream(io.BufferedIOBase): ... +class BaseStream(BufferedIOBase): ... -class DecompressReader(io.RawIOBase): - def readable(self): ... - def __init__(self, fp, decomp_factory, trailing_error=..., **decomp_args): ... - def close(self): ... - def seekable(self): ... - def readinto(self, b): ... +class DecompressReader(RawIOBase): + def __init__( + self, + fp: RawIOBase, + decomp_factory: Callable[..., object], + trailing_error: Union[Type[Exception], Tuple[Type[Exception], ...]] = ..., + **decomp_args: Any, + ) -> None: ... + def readable(self) -> bool: ... + def close(self) -> None: ... + def seekable(self) -> bool: ... + def readinto(self, b: WriteableBuffer) -> int: ... def read(self, size: int = ...) -> bytes: ... - def seek(self, offset, whence=...): ... - def tell(self): ... + def seek(self, offset: int, whence: int = ...) -> int: ... + def tell(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/_base.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/_base.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/_base.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/_base.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,26 @@ +import sys import threading +from abc import abstractmethod from logging import Logger -from typing import TypeVar, Generic, Any, Iterable, Iterator, Callable, Tuple, Optional, Set, List from types import TracebackType -import sys +from typing import ( + Any, + Callable, + Container, + Generic, + Iterable, + Iterator, + List, + Optional, + Protocol, + Sequence, + Set, + TypeVar, + overload, +) + +if sys.version_info >= (3, 9): + from types import GenericAlias FIRST_COMPLETED: str FIRST_EXCEPTION: str @@ -17,13 +35,23 @@ class Error(Exception): ... class CancelledError(Error): ... class TimeoutError(Error): ... + if sys.version_info >= (3, 8): class InvalidStateError(Error): ... if sys.version_info >= (3, 7): class BrokenExecutor(RuntimeError): ... -_T = TypeVar('_T') +_T = TypeVar("_T") + +_T_co = TypeVar("_T_co", covariant=True) + +# Copied over Collection implementation as it does not exist in Python 2 and <3.6. +# Also to solve pytype issues with _Collection. +class _Collection(Iterable[_T_co], Container[_T_co], Protocol[_T_co]): + # Implement Sized (but don't have it as a base class). + @abstractmethod + def __len__(self) -> int: ... class Future(Generic[_T]): def __init__(self) -> None: ... @@ -35,32 +63,40 @@ def result(self, timeout: Optional[float] = ...) -> _T: ... def set_running_or_notify_cancel(self) -> bool: ... def set_result(self, result: _T) -> None: ... - - if sys.version_info >= (3,): - def exception(self, timeout: Optional[float] = ...) -> Optional[BaseException]: ... - def set_exception(self, exception: Optional[BaseException]) -> None: ... - else: - def exception(self, timeout: Optional[float] = ...) -> Any: ... - def exception_info(self, timeout: Optional[float] = ...) -> Tuple[Any, Optional[TracebackType]]: ... - def set_exception(self, exception: Any) -> None: ... - def set_exception_info(self, exception: Any, traceback: Optional[TracebackType]) -> None: ... - + def exception(self, timeout: Optional[float] = ...) -> Optional[BaseException]: ... + def set_exception(self, exception: Optional[BaseException]) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class Executor: - def submit(self, fn: Callable[..., _T], *args: Any, **kwargs: Any) -> Future[_T]: ... - if sys.version_info >= (3, 5): - def map(self, func: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ..., - chunksize: int = ...) -> Iterator[_T]: ... + if sys.version_info >= (3, 9): + def submit(self, __fn: Callable[..., _T], *args: Any, **kwargs: Any) -> Future[_T]: ... + else: + def submit(self, fn: Callable[..., _T], *args: Any, **kwargs: Any) -> Future[_T]: ... + def map( + self, fn: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ..., chunksize: int = ... + ) -> Iterator[_T]: ... + if sys.version_info >= (3, 9): + def shutdown(self, wait: bool = ..., *, cancel_futures: bool = ...) -> None: ... else: - def map(self, func: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ...,) -> Iterator[_T]: ... - def shutdown(self, wait: bool = ...) -> None: ... + def shutdown(self, wait: bool = ...) -> None: ... def __enter__(self: _T) -> _T: ... def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> Optional[bool]: ... def as_completed(fs: Iterable[Future[_T]], timeout: Optional[float] = ...) -> Iterator[Future[_T]]: ... -def wait(fs: Iterable[Future[_T]], timeout: Optional[float] = ..., return_when: str = ...) -> Tuple[Set[Future[_T]], - Set[Future[_T]]]: ... +# Ideally this would be a namedtuple, but mypy doesn't support generic tuple types. See #1976 +class DoneAndNotDoneFutures(Sequence[_T]): + done: Set[Future[_T]] + not_done: Set[Future[_T]] + def __new__(_cls, done: Set[Future[_T]], not_done: Set[Future[_T]]) -> DoneAndNotDoneFutures[_T]: ... + def __len__(self) -> int: ... + @overload + def __getitem__(self, i: int) -> _T: ... + @overload + def __getitem__(self, s: slice) -> DoneAndNotDoneFutures[_T]: ... + +def wait(fs: Iterable[Future[_T]], timeout: Optional[float] = ..., return_when: str = ...) -> DoneAndNotDoneFutures[_T]: ... class _Waiter: event: threading.Event @@ -70,7 +106,6 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AsCompletedWaiter(_Waiter): lock: threading.Lock def __init__(self) -> None: ... @@ -78,13 +113,11 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _FirstCompletedWaiter(_Waiter): def add_result(self, future: Future[Any]) -> None: ... def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AllCompletedWaiter(_Waiter): num_pending_calls: int stop_on_exception: bool @@ -94,7 +127,6 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AcquireFutures: futures: Iterable[Future[Any]] def __init__(self, futures: Iterable[Future[Any]]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,20 @@ import sys + from ._base import ( + ALL_COMPLETED as ALL_COMPLETED, FIRST_COMPLETED as FIRST_COMPLETED, FIRST_EXCEPTION as FIRST_EXCEPTION, - ALL_COMPLETED as ALL_COMPLETED, CancelledError as CancelledError, - TimeoutError as TimeoutError, - Future as Future, Executor as Executor, - wait as wait, + Future as Future, + TimeoutError as TimeoutError, as_completed as as_completed, + wait as wait, ) +from .process import ProcessPoolExecutor as ProcessPoolExecutor +from .thread import ThreadPoolExecutor as ThreadPoolExecutor + if sys.version_info >= (3, 8): from ._base import InvalidStateError as InvalidStateError if sys.version_info >= (3, 7): from ._base import BrokenExecutor as BrokenExecutor -from .thread import ThreadPoolExecutor as ThreadPoolExecutor -from .process import ProcessPoolExecutor as ProcessPoolExecutor diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/process.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/process.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/process.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/process.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,23 +1,28 @@ +import sys from typing import Any, Callable, Optional, Tuple + from ._base import Executor -import sys EXTRA_QUEUED_CALLS: Any if sys.version_info >= (3, 7): from ._base import BrokenExecutor class BrokenProcessPool(BrokenExecutor): ... -elif sys.version_info >= (3,): + +else: class BrokenProcessPool(RuntimeError): ... if sys.version_info >= (3, 7): from multiprocessing.context import BaseContext - class ProcessPoolExecutor(Executor): - def __init__(self, max_workers: Optional[int] = ..., - mp_context: Optional[BaseContext] = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Tuple[Any, ...] = ...) -> None: ... + def __init__( + self, + max_workers: Optional[int] = ..., + mp_context: Optional[BaseContext] = ..., + initializer: Optional[Callable[..., None]] = ..., + initargs: Tuple[Any, ...] = ..., + ) -> None: ... + else: class ProcessPoolExecutor(Executor): def __init__(self, max_workers: Optional[int] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/thread.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/thread.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/thread.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/concurrent/futures/thread.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,26 +1,31 @@ -from typing import Any, Callable, Iterable, Mapping, Optional, Tuple, TypeVar, Generic -from ._base import Executor, Future import sys +from typing import Any, Callable, Generic, Iterable, Mapping, Optional, Tuple, TypeVar + +from ._base import Executor, Future if sys.version_info >= (3, 7): from ._base import BrokenExecutor class BrokenThreadPool(BrokenExecutor): ... -_S = TypeVar('_S') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_S = TypeVar("_S") class ThreadPoolExecutor(Executor): if sys.version_info >= (3, 7): - def __init__(self, max_workers: Optional[int] = ..., - thread_name_prefix: str = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Tuple[Any, ...] = ...) -> None: ... - elif sys.version_info >= (3, 6) or sys.version_info < (3,): - def __init__(self, max_workers: Optional[int] = ..., - thread_name_prefix: str = ...) -> None: ... + def __init__( + self, + max_workers: Optional[int] = ..., + thread_name_prefix: str = ..., + initializer: Optional[Callable[..., None]] = ..., + initargs: Tuple[Any, ...] = ..., + ) -> None: ... + elif sys.version_info >= (3, 6): + def __init__(self, max_workers: Optional[int] = ..., thread_name_prefix: str = ...) -> None: ... else: def __init__(self, max_workers: Optional[int] = ...) -> None: ... - class _WorkItem(Generic[_S]): future: Future[_S] fn: Callable[..., _S] @@ -28,3 +33,5 @@ kwargs: Mapping[str, Any] def __init__(self, future: Future[_S], fn: Callable[..., _S], args: Iterable[Any], kwargs: Mapping[str, Any]) -> None: ... def run(self) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/configparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/configparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/configparser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/configparser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,32 @@ -from _typeshed import AnyPath, StrPath import sys -from typing import (AbstractSet, MutableMapping, Mapping, Dict, Sequence, List, - Union, Iterable, Iterator, Callable, Any, IO, overload, - Optional, Pattern, Type, TypeVar, ClassVar, Tuple) +from _typeshed import AnyPath, StrPath, SupportsWrite +from typing import ( + AbstractSet, + Any, + Callable, + ClassVar, + Dict, + Iterable, + Iterator, + List, + Mapping, + MutableMapping, + Optional, + Pattern, + Sequence, + Tuple, + Type, + TypeVar, + Union, + overload, +) # Internal type aliases _section = Mapping[str, str] _parser = MutableMapping[str, _section] _converter = Callable[[str], Any] _converters = Dict[str, _converter] -_T = TypeVar('_T') +_T = TypeVar("_T") if sys.version_info >= (3, 7): _Path = AnyPath @@ -20,123 +37,106 @@ MAX_INTERPOLATION_DEPTH: int class Interpolation: - def before_get(self, parser: _parser, - section: str, - option: str, - value: str, - defaults: _section) -> str: ... - - def before_set(self, parser: _parser, - section: str, - option: str, - value: str) -> str: ... - - def before_read(self, parser: _parser, - section: str, - option: str, - value: str) -> str: ... - - def before_write(self, parser: _parser, - section: str, - option: str, - value: str) -> str: ... - + def before_get(self, parser: _parser, section: str, option: str, value: str, defaults: _section) -> str: ... + def before_set(self, parser: _parser, section: str, option: str, value: str) -> str: ... + def before_read(self, parser: _parser, section: str, option: str, value: str) -> str: ... + def before_write(self, parser: _parser, section: str, option: str, value: str) -> str: ... class BasicInterpolation(Interpolation): ... class ExtendedInterpolation(Interpolation): ... class LegacyInterpolation(Interpolation): ... - class RawConfigParser(_parser): - BOOLEAN_STATES: ClassVar[Mapping[str, bool]] = ... # Undocumented - def __init__(self, - defaults: Optional[_section] = ..., - dict_type: Type[Mapping[str, str]] = ..., - allow_no_value: bool = ..., - *, - delimiters: Sequence[str] = ..., - comment_prefixes: Sequence[str] = ..., - inline_comment_prefixes: Optional[Sequence[str]] = ..., - strict: bool = ..., - empty_lines_in_values: bool = ..., - default_section: str = ..., - interpolation: Optional[Interpolation] = ..., - converters: _converters = ...) -> None: ... + _SECT_TMPL: ClassVar[str] = ... # Undocumented + _OPT_TMPL: ClassVar[str] = ... # Undocumented + _OPT_NV_TMPL: ClassVar[str] = ... # Undocumented + + SECTCRE: Pattern[str] = ... + OPTCRE: ClassVar[Pattern[str]] = ... + OPTCRE_NV: ClassVar[Pattern[str]] = ... # Undocumented + NONSPACECRE: ClassVar[Pattern[str]] = ... # Undocumented + BOOLEAN_STATES: ClassVar[Mapping[str, bool]] = ... # Undocumented + default_section: str + def __init__( + self, + defaults: Optional[_section] = ..., + dict_type: Type[Mapping[str, str]] = ..., + allow_no_value: bool = ..., + *, + delimiters: Sequence[str] = ..., + comment_prefixes: Sequence[str] = ..., + inline_comment_prefixes: Optional[Sequence[str]] = ..., + strict: bool = ..., + empty_lines_in_values: bool = ..., + default_section: str = ..., + interpolation: Optional[Interpolation] = ..., + converters: _converters = ..., + ) -> None: ... def __len__(self) -> int: ... - def __getitem__(self, section: str) -> SectionProxy: ... - def __setitem__(self, section: str, options: _section) -> None: ... - def __delitem__(self, section: str) -> None: ... - def __iter__(self) -> Iterator[str]: ... - def defaults(self) -> _section: ... - def sections(self) -> List[str]: ... - def add_section(self, section: str) -> None: ... - def has_section(self, section: str) -> bool: ... - def options(self, section: str) -> List[str]: ... - def has_option(self, section: str, option: str) -> bool: ... - - def read(self, filenames: Union[_Path, Iterable[_Path]], - encoding: Optional[str] = ...) -> List[str]: ... + def read(self, filenames: Union[_Path, Iterable[_Path]], encoding: Optional[str] = ...) -> List[str]: ... def read_file(self, f: Iterable[str], source: Optional[str] = ...) -> None: ... def read_string(self, string: str, source: str = ...) -> None: ... - def read_dict(self, dictionary: Mapping[str, Mapping[str, Any]], - source: str = ...) -> None: ... + def read_dict(self, dictionary: Mapping[str, Mapping[str, Any]], source: str = ...) -> None: ... def readfp(self, fp: Iterable[str], filename: Optional[str] = ...) -> None: ... - # These get* methods are partially applied (with the same names) in # SectionProxy; the stubs should be kept updated together - @overload def getint(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> int: ... @overload - def getint(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> Union[int, _T]: ... + def getint( + self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ... + ) -> Union[int, _T]: ... @overload def getfloat(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> float: ... @overload - def getfloat(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> Union[float, _T]: ... + def getfloat( + self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ... + ) -> Union[float, _T]: ... @overload def getboolean(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> bool: ... @overload - def getboolean(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> Union[bool, _T]: ... - - def _get_conv(self, section: str, option: str, conv: Callable[[str], _T], *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> _T: ... - + def getboolean( + self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ... + ) -> Union[bool, _T]: ... + def _get_conv( + self, + section: str, + option: str, + conv: Callable[[str], _T], + *, + raw: bool = ..., + vars: Optional[_section] = ..., + fallback: _T = ..., + ) -> _T: ... # This is incompatible with MutableMapping so we ignore the type @overload # type: ignore def get(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> str: ... - @overload - def get(self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T) -> Union[str, _T]: ... - + def get( + self, section: str, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T + ) -> Union[str, _T]: ... @overload def items(self, *, raw: bool = ..., vars: Optional[_section] = ...) -> AbstractSet[Tuple[str, SectionProxy]]: ... - @overload def items(self, section: str, raw: bool = ..., vars: Optional[_section] = ...) -> List[Tuple[str, str]]: ... - def set(self, section: str, option: str, value: Optional[str] = ...) -> None: ... - - def write(self, fp: IO[str], space_around_delimiters: bool = ...) -> None: ... - + def write(self, fp: SupportsWrite[str], space_around_delimiters: bool = ...) -> None: ... def remove_option(self, section: str, option: str) -> bool: ... - def remove_section(self, section: str) -> bool: ... - def optionxform(self, optionstr: str) -> str: ... - class ConfigParser(RawConfigParser): ... - class SafeConfigParser(ConfigParser): ... class SectionProxy(MutableMapping[str, str]): @@ -152,7 +152,6 @@ @property def name(self) -> str: ... def get(self, option: str, fallback: Optional[str] = ..., *, raw: bool = ..., vars: Optional[_section] = ..., _impl: Optional[Any] = ..., **kwargs: Any) -> str: ... # type: ignore - # These are partially-applied version of the methods with the same names in # RawConfigParser; the stubs should be kept updated together @overload @@ -162,12 +161,15 @@ @overload def getfloat(self, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> float: ... @overload - def getfloat(self, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> Union[float, _T]: ... + def getfloat( + self, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ... + ) -> Union[float, _T]: ... @overload def getboolean(self, option: str, *, raw: bool = ..., vars: Optional[_section] = ...) -> bool: ... @overload - def getboolean(self, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ...) -> Union[bool, _T]: ... - + def getboolean( + self, option: str, *, raw: bool = ..., vars: Optional[_section] = ..., fallback: _T = ... + ) -> Union[bool, _T]: ... # SectionProxy can have arbitrary attributes when custon converters are used def __getattr__(self, key: str) -> Callable[..., Any]: ... @@ -180,24 +182,20 @@ def __iter__(self) -> Iterator[str]: ... def __len__(self) -> int: ... - class Error(Exception): message: str def __init__(self, msg: str = ...) -> None: ... - class NoSectionError(Error): section: str def __init__(self, section: str) -> None: ... - class DuplicateSectionError(Error): section: str source: Optional[str] lineno: Optional[int] def __init__(self, section: str, source: Optional[str] = ..., lineno: Optional[int] = ...) -> None: ... - class DuplicateOptionError(Error): section: str option: str @@ -205,38 +203,31 @@ lineno: Optional[int] def __init__(self, section: str, option: str, source: Optional[str] = ..., lineno: Optional[str] = ...) -> None: ... - class NoOptionError(Error): section: str option: str def __init__(self, option: str, section: str) -> None: ... - class InterpolationError(Error): section: str option: str def __init__(self, option: str, section: str, msg: str) -> None: ... - class InterpolationDepthError(InterpolationError): def __init__(self, option: str, section: str, rawval: object) -> None: ... - class InterpolationMissingOptionError(InterpolationError): reference: str def __init__(self, option: str, section: str, rawval: object, reference: str) -> None: ... - class InterpolationSyntaxError(InterpolationError): ... - class ParsingError(Error): source: str errors: List[Tuple[int, str]] def __init__(self, source: Optional[str] = ..., filename: Optional[str] = ...) -> None: ... def append(self, lineno: int, line: str) -> None: ... - class MissingSectionHeaderError(ParsingError): lineno: int line: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/dumb.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/dumb.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/dumb.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/dumb.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,5 @@ - -import sys -from typing import Union, MutableMapping, Iterator, Optional, Type from types import TracebackType - -if sys.version_info >= (3, 8): - from typing import Final -else: - from typing_extensions import Final +from typing import Iterator, MutableMapping, Optional, Type, Union _KeyType = Union[str, bytes] _ValueType = Union[str, bytes] @@ -14,7 +7,6 @@ error = OSError class _Database(MutableMapping[_KeyType, bytes]): - def __init__(self, filebasename: str, mode: str, flag: str = ...) -> None: ... def sync(self) -> None: ... def iterkeys(self) -> Iterator[bytes]: ... # undocumented @@ -26,6 +18,8 @@ def __len__(self) -> int: ... def __del__(self) -> None: ... def __enter__(self) -> _Database: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def open(file: str, flag: str = ..., mode: int = ...) -> _Database: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/gnu.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/gnu.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/gnu.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/gnu.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,7 @@ - -from typing import Union, Optional, Type, Iterator, overload, List, TypeVar, Generic from types import TracebackType +from typing import List, Optional, Type, TypeVar, Union, overload -_T = TypeVar('_T') +_T = TypeVar("_T") _KeyType = Union[str, bytes] _ValueType = Union[str, bytes] @@ -20,15 +19,15 @@ def __delitem__(self, key: _KeyType) -> None: ... def __len__(self) -> int: ... def __enter__(self) -> _gdbm: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... - + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... @overload def get(self, k: _KeyType) -> Optional[bytes]: ... @overload def get(self, k: _KeyType, default: Union[bytes, _T]) -> Union[bytes, _T]: ... def keys(self) -> List[bytes]: ... def setdefault(self, k: _KeyType, default: _ValueType = ...) -> bytes: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,5 @@ -import sys from types import TracebackType -from typing import Iterator, Optional, Type, Union, MutableMapping - +from typing import Iterator, MutableMapping, Optional, Type, Union from typing_extensions import Literal _KeyType = Union[str, bytes] @@ -16,10 +14,11 @@ def __len__(self) -> int: ... def __del__(self) -> None: ... def __enter__(self) -> _Database: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... class error(Exception): ... def whichdb(filename: str) -> str: ... - -def open(file: str, flag: Literal['r', 'w', 'c', 'n'] = ..., mode: int = ...) -> _Database: ... +def open(file: str, flag: Literal["r", "w", "c", "n"] = ..., mode: int = ...) -> _Database: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/ndbm.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/ndbm.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/ndbm.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/dbm/ndbm.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,7 @@ - -from typing import Generic, Union, Iterator, Optional, Type, TypeVar, overload, List from types import TracebackType +from typing import List, Optional, Type, TypeVar, Union, overload -_T = TypeVar('_T') +_T = TypeVar("_T") _KeyType = Union[str, bytes] _ValueType = Union[str, bytes] @@ -12,7 +11,6 @@ # Actual typename dbm, not exposed by the implementation class _dbm: - def close(self) -> None: ... def __getitem__(self, item: _KeyType) -> bytes: ... def __setitem__(self, key: _KeyType, value: _ValueType) -> None: ... @@ -20,15 +18,15 @@ def __len__(self) -> int: ... def __del__(self) -> None: ... def __enter__(self) -> _dbm: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... - + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... @overload def get(self, k: _KeyType) -> Optional[bytes]: ... @overload def get(self, k: _KeyType, default: Union[bytes, _T]) -> Union[bytes, _T]: ... def keys(self) -> List[bytes]: ... def setdefault(self, k: _KeyType, default: _ValueType = ...) -> bytes: ... - # Don't exist at runtime __new__: None # type: ignore __init__: None # type: ignore diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/archive_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/archive_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/archive_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/archive_util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,12 @@ +from typing import Optional + +def make_archive( + base_name: str, + format: str, + root_dir: Optional[str] = ..., + base_dir: Optional[str] = ..., + verbose: int = ..., + dry_run: int = ..., +) -> str: ... +def make_tarball(base_name: str, base_dir: str, compress: Optional[str] = ..., verbose: int = ..., dry_run: int = ...) -> str: ... +def make_zipfile(base_name: str, base_dir: str, verbose: int = ..., dry_run: int = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/bcppcompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/bcppcompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/bcppcompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/bcppcompiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class BCPPCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/ccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/ccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/ccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/ccompiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,150 @@ +from typing import Any, Callable, List, Optional, Tuple, Union + +_Macro = Union[Tuple[str], Tuple[str, Optional[str]]] + +def gen_lib_options( + compiler: CCompiler, library_dirs: List[str], runtime_library_dirs: List[str], libraries: List[str] +) -> List[str]: ... +def gen_preprocess_options(macros: List[_Macro], include_dirs: List[str]) -> List[str]: ... +def get_default_compiler(osname: Optional[str] = ..., platform: Optional[str] = ...) -> str: ... +def new_compiler( + plat: Optional[str] = ..., compiler: Optional[str] = ..., verbose: int = ..., dry_run: int = ..., force: int = ... +) -> CCompiler: ... +def show_compilers() -> None: ... + +class CCompiler: + dry_run: bool + force: bool + verbose: bool + output_dir: Optional[str] + macros: List[_Macro] + include_dirs: List[str] + libraries: List[str] + library_dirs: List[str] + runtime_library_dirs: List[str] + objects: List[str] + def __init__(self, verbose: int = ..., dry_run: int = ..., force: int = ...) -> None: ... + def add_include_dir(self, dir: str) -> None: ... + def set_include_dirs(self, dirs: List[str]) -> None: ... + def add_library(self, libname: str) -> None: ... + def set_libraries(self, libnames: List[str]) -> None: ... + def add_library_dir(self, dir: str) -> None: ... + def set_library_dirs(self, dirs: List[str]) -> None: ... + def add_runtime_library_dir(self, dir: str) -> None: ... + def set_runtime_library_dirs(self, dirs: List[str]) -> None: ... + def define_macro(self, name: str, value: Optional[str] = ...) -> None: ... + def undefine_macro(self, name: str) -> None: ... + def add_link_object(self, object: str) -> None: ... + def set_link_objects(self, objects: List[str]) -> None: ... + def detect_language(self, sources: Union[str, List[str]]) -> Optional[str]: ... + def find_library_file(self, dirs: List[str], lib: str, debug: bool = ...) -> Optional[str]: ... + def has_function( + self, + funcname: str, + includes: Optional[List[str]] = ..., + include_dirs: Optional[List[str]] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + ) -> bool: ... + def library_dir_option(self, dir: str) -> str: ... + def library_option(self, lib: str) -> str: ... + def runtime_library_dir_option(self, dir: str) -> str: ... + def set_executables(self, **args: str) -> None: ... + def compile( + self, + sources: List[str], + output_dir: Optional[str] = ..., + macros: Optional[_Macro] = ..., + include_dirs: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + depends: Optional[List[str]] = ..., + ) -> List[str]: ... + def create_static_lib( + self, + objects: List[str], + output_libname: str, + output_dir: Optional[str] = ..., + debug: bool = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link( + self, + target_desc: str, + objects: List[str], + output_filename: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_executable( + self, + objects: List[str], + output_progname: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_shared_lib( + self, + objects: List[str], + output_libname: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def link_shared_object( + self, + objects: List[str], + output_filename: str, + output_dir: Optional[str] = ..., + libraries: Optional[List[str]] = ..., + library_dirs: Optional[List[str]] = ..., + runtime_library_dirs: Optional[List[str]] = ..., + export_symbols: Optional[List[str]] = ..., + debug: bool = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + build_temp: Optional[str] = ..., + target_lang: Optional[str] = ..., + ) -> None: ... + def preprocess( + self, + source: str, + output_file: Optional[str] = ..., + macros: Optional[List[_Macro]] = ..., + include_dirs: Optional[List[str]] = ..., + extra_preargs: Optional[List[str]] = ..., + extra_postargs: Optional[List[str]] = ..., + ) -> None: ... + def executable_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ... + def library_filename(self, libname: str, lib_type: str = ..., strip_dir: int = ..., output_dir: str = ...) -> str: ... + def object_filenames(self, source_filenames: List[str], strip_dir: int = ..., output_dir: str = ...) -> List[str]: ... + def shared_object_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ... + def execute(self, func: Callable[..., None], args: Tuple[Any, ...], msg: Optional[str] = ..., level: int = ...) -> None: ... + def spawn(self, cmd: List[str]) -> None: ... + def mkpath(self, name: str, mode: int = ...) -> None: ... + def move_file(self, src: str, dst: str) -> str: ... + def announce(self, msg: str, level: int = ...) -> None: ... + def warn(self, msg: str) -> None: ... + def debug_print(self, msg: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cmd.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cmd.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cmd.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cmd.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,67 @@ +from abc import abstractmethod +from distutils.dist import Distribution +from typing import Any, Callable, Iterable, List, Optional, Tuple, Union + +class Command: + sub_commands: List[Tuple[str, Optional[Callable[[Command], bool]]]] + def __init__(self, dist: Distribution) -> None: ... + @abstractmethod + def initialize_options(self) -> None: ... + @abstractmethod + def finalize_options(self) -> None: ... + @abstractmethod + def run(self) -> None: ... + def announce(self, msg: str, level: int = ...) -> None: ... + def debug_print(self, msg: str) -> None: ... + def ensure_string(self, option: str, default: Optional[str] = ...) -> None: ... + def ensure_string_list(self, option: Union[str, List[str]]) -> None: ... + def ensure_filename(self, option: str) -> None: ... + def ensure_dirname(self, option: str) -> None: ... + def get_command_name(self) -> str: ... + def set_undefined_options(self, src_cmd: str, *option_pairs: Tuple[str, str]) -> None: ... + def get_finalized_command(self, command: str, create: int = ...) -> Command: ... + def reinitialize_command(self, command: Union[Command, str], reinit_subcommands: int = ...) -> Command: ... + def run_command(self, command: str) -> None: ... + def get_sub_commands(self) -> List[str]: ... + def warn(self, msg: str) -> None: ... + def execute(self, func: Callable[..., Any], args: Iterable[Any], msg: Optional[str] = ..., level: int = ...) -> None: ... + def mkpath(self, name: str, mode: int = ...) -> None: ... + def copy_file( + self, + infile: str, + outfile: str, + preserve_mode: int = ..., + preserve_times: int = ..., + link: Optional[str] = ..., + level: Any = ..., + ) -> Tuple[str, bool]: ... # level is not used + def copy_tree( + self, + infile: str, + outfile: str, + preserve_mode: int = ..., + preserve_times: int = ..., + preserve_symlinks: int = ..., + level: Any = ..., + ) -> List[str]: ... # level is not used + def move_file(self, src: str, dst: str, level: Any = ...) -> str: ... # level is not used + def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ... # level is not used + def make_archive( + self, + base_name: str, + format: str, + root_dir: Optional[str] = ..., + base_dir: Optional[str] = ..., + owner: Optional[str] = ..., + group: Optional[str] = ..., + ) -> str: ... + def make_file( + self, + infiles: Union[str, List[str], Tuple[str]], + outfile: str, + func: Callable[..., Any], + args: List[Any], + exec_msg: Optional[str] = ..., + skip_msg: Optional[str] = ..., + level: Any = ..., + ) -> None: ... # level is not used diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/bdist_msi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/bdist_msi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/bdist_msi.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/bdist_msi.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,6 @@ +from distutils.cmd import Command + +class bdist_msi(Command): + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/build_py.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/build_py.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/build_py.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/build_py.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,8 @@ +from distutils.cmd import Command + +class build_py(Command): + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... + +class build_py_2to3(build_py): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/config.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/config.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,87 @@ +from distutils import log as log +from distutils.ccompiler import CCompiler +from distutils.core import Command as Command +from distutils.errors import DistutilsExecError as DistutilsExecError +from distutils.sysconfig import customize_compiler as customize_compiler +from typing import Dict, List, Optional, Pattern, Sequence, Tuple, Union + +LANG_EXT: Dict[str, str] + +class config(Command): + description: str = ... + # Tuple is full name, short name, description + user_options: Sequence[Tuple[str, Optional[str], str]] = ... + compiler: Optional[Union[str, CCompiler]] = ... + cc: Optional[str] = ... + include_dirs: Optional[Sequence[str]] = ... + libraries: Optional[Sequence[str]] = ... + library_dirs: Optional[Sequence[str]] = ... + noisy: int = ... + dump_source: int = ... + temp_files: Sequence[str] = ... + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... + def try_cpp( + self, + body: Optional[str] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def search_cpp( + self, + pattern: Union[Pattern[str], str], + body: Optional[str] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def try_compile( + self, body: str, headers: Optional[Sequence[str]] = ..., include_dirs: Optional[Sequence[str]] = ..., lang: str = ... + ) -> bool: ... + def try_link( + self, + body: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def try_run( + self, + body: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + def check_func( + self, + func: str, + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + libraries: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + decl: int = ..., + call: int = ..., + ) -> bool: ... + def check_lib( + self, + library: str, + library_dirs: Optional[Sequence[str]] = ..., + headers: Optional[Sequence[str]] = ..., + include_dirs: Optional[Sequence[str]] = ..., + other_libraries: List[str] = ..., + ) -> bool: ... + def check_header( + self, + header: str, + include_dirs: Optional[Sequence[str]] = ..., + library_dirs: Optional[Sequence[str]] = ..., + lang: str = ..., + ) -> bool: ... + +def dump_file(filename: str, head: Optional[str] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install_egg_info.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install_egg_info.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install_egg_info.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install_egg_info.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,10 @@ +from distutils.cmd import Command +from typing import ClassVar, List, Optional, Tuple + +class install_egg_info(Command): + description: ClassVar[str] + user_options: ClassVar[List[Tuple[str, Optional[str], str]]] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... + def get_outputs(self) -> List[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/install.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,12 @@ +from distutils.cmd import Command +from typing import Optional + +class install(Command): + user: bool + prefix: Optional[str] + home: Optional[str] + root: Optional[str] + install_lib: Optional[str] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/upload.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/upload.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/upload.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/command/upload.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,8 @@ +from distutils.config import PyPIRCCommand +from typing import ClassVar, List, Optional, Tuple + +class upload(PyPIRCCommand): + description: ClassVar[str] + boolean_options: ClassVar[List[str]] + def run(self) -> None: ... + def upload_file(self, command, pyversion, filename) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/config.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/config.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/config.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/config.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,17 @@ +from abc import abstractmethod +from distutils.cmd import Command +from typing import ClassVar, List, Optional, Tuple + +DEFAULT_PYPIRC: str + +class PyPIRCCommand(Command): + DEFAULT_REPOSITORY: ClassVar[str] + DEFAULT_REALM: ClassVar[str] + repository: None + realm: None + user_options: ClassVar[List[Tuple[str, Optional[str], str]]] + boolean_options: ClassVar[List[str]] + def initialize_options(self) -> None: ... + def finalize_options(self) -> None: ... + @abstractmethod + def run(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/core.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/core.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/core.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/core.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,48 @@ +from distutils.cmd import Command as Command +from distutils.dist import Distribution as Distribution +from distutils.extension import Extension as Extension +from typing import Any, List, Mapping, Optional, Tuple, Type, Union + +def setup( + *, + name: str = ..., + version: str = ..., + description: str = ..., + long_description: str = ..., + author: str = ..., + author_email: str = ..., + maintainer: str = ..., + maintainer_email: str = ..., + url: str = ..., + download_url: str = ..., + packages: List[str] = ..., + py_modules: List[str] = ..., + scripts: List[str] = ..., + ext_modules: List[Extension] = ..., + classifiers: List[str] = ..., + distclass: Type[Distribution] = ..., + script_name: str = ..., + script_args: List[str] = ..., + options: Mapping[str, Any] = ..., + license: str = ..., + keywords: Union[List[str], str] = ..., + platforms: Union[List[str], str] = ..., + cmdclass: Mapping[str, Type[Command]] = ..., + data_files: List[Tuple[str, List[str]]] = ..., + package_dir: Mapping[str, str] = ..., + obsoletes: List[str] = ..., + provides: List[str] = ..., + requires: List[str] = ..., + command_packages: List[str] = ..., + command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ..., + package_data: Mapping[str, List[str]] = ..., + include_package_data: bool = ..., + libraries: List[str] = ..., + headers: List[str] = ..., + ext_package: str = ..., + include_dirs: List[str] = ..., + password: str = ..., + fullname: str = ..., + **attrs: Any, +) -> None: ... +def run_setup(script_name: str, script_args: Optional[List[str]] = ..., stop_after: str = ...) -> Distribution: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cygwinccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cygwinccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cygwinccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/cygwinccompiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,4 @@ +from distutils.unixccompiler import UnixCCompiler + +class CygwinCCompiler(UnixCCompiler): ... +class Mingw32CCompiler(CygwinCCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/debug.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/debug.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/debug.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/debug.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +DEBUG: bool diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dep_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dep_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dep_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dep_util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,5 @@ +from typing import List, Tuple + +def newer(source: str, target: str) -> bool: ... +def newer_pairwise(sources: List[str], targets: List[str]) -> List[Tuple[str, str]]: ... +def newer_group(sources: List[str], target: str, missing: str = ...) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dir_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dir_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dir_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dir_util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,15 @@ +from typing import List + +def mkpath(name: str, mode: int = ..., verbose: int = ..., dry_run: int = ...) -> List[str]: ... +def create_tree(base_dir: str, files: List[str], mode: int = ..., verbose: int = ..., dry_run: int = ...) -> None: ... +def copy_tree( + src: str, + dst: str, + preserve_mode: int = ..., + preserve_times: int = ..., + preserve_symlinks: int = ..., + update: int = ..., + verbose: int = ..., + dry_run: int = ..., +) -> List[str]: ... +def remove_tree(directory: str, verbose: int = ..., dry_run: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dist.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/dist.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,9 @@ +from distutils.cmd import Command +from typing import Any, Dict, Iterable, Mapping, Optional, Tuple, Type + +class Distribution: + cmdclass: Dict[str, Type[Command]] + def __init__(self, attrs: Optional[Mapping[str, Any]] = ...) -> None: ... + def get_option_dict(self, command: str) -> Dict[str, Tuple[str, str]]: ... + def parse_config_files(self, filenames: Optional[Iterable[str]] = ...) -> None: ... + def get_command_obj(self, command: str, create: bool = ...) -> Optional[Command]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/errors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/errors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/errors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/errors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,19 @@ +class DistutilsError(Exception): ... +class DistutilsModuleError(DistutilsError): ... +class DistutilsClassError(DistutilsError): ... +class DistutilsGetoptError(DistutilsError): ... +class DistutilsArgError(DistutilsError): ... +class DistutilsFileError(DistutilsError): ... +class DistutilsOptionError(DistutilsError): ... +class DistutilsSetupError(DistutilsError): ... +class DistutilsPlatformError(DistutilsError): ... +class DistutilsExecError(DistutilsError): ... +class DistutilsInternalError(DistutilsError): ... +class DistutilsTemplateError(DistutilsError): ... +class DistutilsByteCompileError(DistutilsError): ... +class CCompilerError(Exception): ... +class PreprocessError(CCompilerError): ... +class CompileError(CCompilerError): ... +class LibError(CCompilerError): ... +class LinkError(CCompilerError): ... +class UnknownFileError(CCompilerError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/extension.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/extension.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/extension.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/extension.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,22 @@ +from typing import List, Optional, Tuple + +class Extension: + def __init__( + self, + name: str, + sources: List[str], + include_dirs: List[str] = ..., + define_macros: List[Tuple[str, Optional[str]]] = ..., + undef_macros: List[str] = ..., + library_dirs: List[str] = ..., + libraries: List[str] = ..., + runtime_library_dirs: List[str] = ..., + extra_objects: List[str] = ..., + extra_compile_args: List[str] = ..., + extra_link_args: List[str] = ..., + export_symbols: List[str] = ..., + swig_opts: Optional[str] = ..., # undocumented + depends: List[str] = ..., + language: str = ..., + optional: bool = ..., + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/fancy_getopt.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/fancy_getopt.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/fancy_getopt.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/fancy_getopt.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import Any, List, Mapping, Optional, Tuple, Union, overload + +_Option = Tuple[str, Optional[str], str] +_GR = Tuple[List[str], OptionDummy] + +def fancy_getopt( + options: List[_Option], negative_opt: Mapping[_Option, _Option], object: Any, args: Optional[List[str]] +) -> Union[List[str], _GR]: ... +def wrap_text(text: str, width: int) -> List[str]: ... + +class FancyGetopt: + def __init__(self, option_table: Optional[List[_Option]] = ...) -> None: ... + # TODO kinda wrong, `getopt(object=object())` is invalid + @overload + def getopt(self, args: Optional[List[str]] = ...) -> _GR: ... + @overload + def getopt(self, args: Optional[List[str]], object: Any) -> List[str]: ... + def get_option_order(self) -> List[Tuple[str, str]]: ... + def generate_help(self, header: Optional[str] = ...) -> List[str]: ... + +class OptionDummy: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/filelist.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/filelist.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/filelist.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/filelist.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +class FileList: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/file_util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/file_util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/file_util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/file_util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,14 @@ +from typing import Optional, Sequence, Tuple + +def copy_file( + src: str, + dst: str, + preserve_mode: bool = ..., + preserve_times: bool = ..., + update: bool = ..., + link: Optional[str] = ..., + verbose: bool = ..., + dry_run: bool = ..., +) -> Tuple[str, str]: ... +def move_file(src: str, dst: str, verbose: bool = ..., dry_run: bool = ...) -> str: ... +def write_file(filename: str, contents: Sequence[str]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/log.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/log.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/log.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/log.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,25 @@ +from typing import Any + +DEBUG: int +INFO: int +WARN: int +ERROR: int +FATAL: int + +class Log: + def __init__(self, threshold: int = ...) -> None: ... + def log(self, level: int, msg: str, *args: Any) -> None: ... + def debug(self, msg: str, *args: Any) -> None: ... + def info(self, msg: str, *args: Any) -> None: ... + def warn(self, msg: str, *args: Any) -> None: ... + def error(self, msg: str, *args: Any) -> None: ... + def fatal(self, msg: str, *args: Any) -> None: ... + +def log(level: int, msg: str, *args: Any) -> None: ... +def debug(msg: str, *args: Any) -> None: ... +def info(msg: str, *args: Any) -> None: ... +def warn(msg: str, *args: Any) -> None: ... +def error(msg: str, *args: Any) -> None: ... +def fatal(msg: str, *args: Any) -> None: ... +def set_threshold(level: int) -> int: ... +def set_verbosity(v: int) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/msvccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/msvccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/msvccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/msvccompiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class MSVCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/spawn.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/spawn.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/spawn.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/spawn.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,4 @@ +from typing import List, Optional + +def spawn(cmd: List[str], search_path: bool = ..., verbose: bool = ..., dry_run: bool = ...) -> None: ... +def find_executable(executable: str, path: Optional[str] = ...) -> Optional[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/sysconfig.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/sysconfig.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/sysconfig.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/sysconfig.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,14 @@ +from distutils.ccompiler import CCompiler +from typing import Mapping, Optional, Union + +PREFIX: str +EXEC_PREFIX: str + +def get_config_var(name: str) -> Union[int, str, None]: ... +def get_config_vars(*args: str) -> Mapping[str, Union[int, str]]: ... +def get_config_h_filename() -> str: ... +def get_makefile_filename() -> str: ... +def get_python_inc(plat_specific: bool = ..., prefix: Optional[str] = ...) -> str: ... +def get_python_lib(plat_specific: bool = ..., standard_lib: bool = ..., prefix: Optional[str] = ...) -> str: ... +def customize_compiler(compiler: CCompiler) -> None: ... +def set_python_build() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/text_file.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/text_file.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/text_file.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/text_file.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import IO, List, Optional, Tuple, Union + +class TextFile: + def __init__( + self, + filename: Optional[str] = ..., + file: Optional[IO[str]] = ..., + *, + strip_comments: bool = ..., + lstrip_ws: bool = ..., + rstrip_ws: bool = ..., + skip_blanks: bool = ..., + join_lines: bool = ..., + collapse_join: bool = ..., + ) -> None: ... + def open(self, filename: str) -> None: ... + def close(self) -> None: ... + def warn(self, msg: str, line: Union[List[int], Tuple[int, int], int] = ...) -> None: ... + def readline(self) -> Optional[str]: ... + def readlines(self) -> List[str]: ... + def unreadline(self, line: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/unixccompiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/unixccompiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/unixccompiler.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/unixccompiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from distutils.ccompiler import CCompiler + +class UnixCCompiler(CCompiler): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,23 @@ +from typing import Any, Callable, List, Mapping, Optional, Tuple + +def get_platform() -> str: ... +def convert_path(pathname: str) -> str: ... +def change_root(new_root: str, pathname: str) -> str: ... +def check_environ() -> None: ... +def subst_vars(s: str, local_vars: Mapping[str, str]) -> None: ... +def split_quoted(s: str) -> List[str]: ... +def execute( + func: Callable[..., None], args: Tuple[Any, ...], msg: Optional[str] = ..., verbose: bool = ..., dry_run: bool = ... +) -> None: ... +def strtobool(val: str) -> bool: ... +def byte_compile( + py_files: List[str], + optimize: int = ..., + force: bool = ..., + prefix: Optional[str] = ..., + base_dir: Optional[str] = ..., + verbose: bool = ..., + dry_run: bool = ..., + direct: Optional[bool] = ..., +) -> None: ... +def rfc822_escape(header: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/version.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/version.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/version.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/distutils/version.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,38 @@ +from abc import abstractmethod +from typing import Optional, Pattern, Tuple, TypeVar, Union + +_T = TypeVar("_T", bound=Version) + +class Version: + def __repr__(self) -> str: ... + def __eq__(self, other: object) -> bool: ... + def __lt__(self: _T, other: Union[_T, str]) -> bool: ... + def __le__(self: _T, other: Union[_T, str]) -> bool: ... + def __gt__(self: _T, other: Union[_T, str]) -> bool: ... + def __ge__(self: _T, other: Union[_T, str]) -> bool: ... + @abstractmethod + def __init__(self, vstring: Optional[str] = ...) -> None: ... + @abstractmethod + def parse(self: _T, vstring: str) -> _T: ... + @abstractmethod + def __str__(self) -> str: ... + @abstractmethod + def _cmp(self: _T, other: Union[_T, str]) -> bool: ... + +class StrictVersion(Version): + version_re: Pattern[str] + version: Tuple[int, int, int] + prerelease: Optional[Tuple[str, int]] + def __init__(self, vstring: Optional[str] = ...) -> None: ... + def parse(self: _T, vstring: str) -> _T: ... + def __str__(self) -> str: ... + def _cmp(self: _T, other: Union[_T, str]) -> bool: ... + +class LooseVersion(Version): + component_re: Pattern[str] + vstring: str + version: Tuple[Union[str, int], ...] + def __init__(self, vstring: Optional[str] = ...) -> None: ... + def parse(self: _T, vstring: str) -> _T: ... + def __str__(self) -> str: ... + def _cmp(self: _T, other: Union[_T, str]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/charset.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/charset.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/charset.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/charset.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,4 @@ -# Stubs for email.charset (Python 3.4) - -from typing import List, Optional, Iterator, Any +from typing import Any, Iterator, List, Optional QP: int # undocumented BASE64: int # undocumented @@ -17,15 +15,14 @@ def get_body_encoding(self) -> str: ... def get_output_charset(self) -> Optional[str]: ... def header_encode(self, string: str) -> str: ... - def header_encode_lines(self, string: str, - maxlengths: Iterator[int]) -> List[str]: ... + def header_encode_lines(self, string: str, maxlengths: Iterator[int]) -> List[str]: ... def body_encode(self, string: str) -> str: ... def __str__(self) -> str: ... def __eq__(self, other: Any) -> bool: ... def __ne__(self, other: Any) -> bool: ... -def add_charset(charset: str, header_enc: Optional[int] = ..., - body_enc: Optional[int] = ..., - output_charset: Optional[str] = ...) -> None: ... +def add_charset( + charset: str, header_enc: Optional[int] = ..., body_enc: Optional[int] = ..., output_charset: Optional[str] = ... +) -> None: ... def add_alias(alias: str, canonical: str) -> None: ... def add_codec(charset: str, codecname: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/contentmanager.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/contentmanager.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/contentmanager.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/contentmanager.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,11 @@ -# Stubs for email.contentmanager (Python 3.4) - -from typing import Any, Callable from email.message import Message +from typing import Any, Callable class ContentManager: def __init__(self) -> None: ... def get_content(self, msg: Message, *args: Any, **kw: Any) -> Any: ... - def set_content(self, msg: Message, obj: Any, *args: Any, - **kw: Any) -> Any: ... + def set_content(self, msg: Message, obj: Any, *args: Any, **kw: Any) -> Any: ... def add_get_handler(self, key: str, handler: Callable[..., Any]) -> None: ... - def add_set_handler(self, typekey: type, - handler: Callable[..., Any]) -> None: ... + def add_set_handler(self, typekey: type, handler: Callable[..., Any]) -> None: ... raw_data_manager: ContentManager diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/encoders.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/encoders.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/encoders.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/encoders.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for email.encoders (Python 3.4) - from email.message import Message def encode_base64(msg: Message) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/errors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/errors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/errors.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/errors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,8 @@ -# Stubs for email.errors (Python 3.4) - class MessageError(Exception): ... class MessageParseError(MessageError): ... class HeaderParseError(MessageParseError): ... class BoundaryError(MessageParseError): ... class MultipartConversionError(MessageError, TypeError): ... - class MessageDefect(ValueError): ... class NoBoundaryInMultipartDefect(MessageDefect): ... class StartBoundaryNotFoundDefect(MessageDefect): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/feedparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/feedparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/feedparser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/feedparser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,17 +1,21 @@ -# Stubs for email.feedparser (Python 3.4) - -from typing import Callable from email.message import Message from email.policy import Policy +from typing import Callable, Generic, TypeVar, overload + +_M = TypeVar("_M", bound=Message) -class FeedParser: - def __init__(self, _factory: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... +class FeedParser(Generic[_M]): + @overload + def __init__(self: FeedParser[Message], _factory: None = ..., *, policy: Policy = ...) -> None: ... + @overload + def __init__(self, _factory: Callable[[], _M], *, policy: Policy = ...) -> None: ... def feed(self, data: str) -> None: ... - def close(self) -> Message: ... + def close(self) -> _M: ... -class BytesFeedParser: - def __init__(self, _factory: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... +class BytesFeedParser(Generic[_M]): + @overload + def __init__(self: BytesFeedParser[Message], _factory: None = ..., *, policy: Policy = ...) -> None: ... + @overload + def __init__(self, _factory: Callable[[], _M], *, policy: Policy = ...) -> None: ... def feed(self, data: bytes) -> None: ... - def close(self) -> Message: ... + def close(self) -> _M: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/generator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/generator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/generator.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/generator.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,27 +1,18 @@ -# Stubs for email.generator (Python 3.4) - -from typing import BinaryIO, TextIO, Optional from email.message import Message from email.policy import Policy +from typing import BinaryIO, Optional, TextIO class Generator: def clone(self, fp: TextIO) -> Generator: ... def write(self, s: str) -> None: ... - def __init__(self, outfp: TextIO, mangle_from_: bool = ..., - maxheaderlen: int = ..., *, - policy: Policy = ...) -> None: ... - def flatten(self, msg: Message, unixfrom: bool = ..., - linesep: Optional[str] = ...) -> None: ... + def __init__(self, outfp: TextIO, mangle_from_: bool = ..., maxheaderlen: int = ..., *, policy: Policy = ...) -> None: ... + def flatten(self, msg: Message, unixfrom: bool = ..., linesep: Optional[str] = ...) -> None: ... class BytesGenerator: def clone(self, fp: BinaryIO) -> BytesGenerator: ... def write(self, s: str) -> None: ... - def __init__(self, outfp: BinaryIO, mangle_from_: bool = ..., - maxheaderlen: int = ..., *, - policy: Policy = ...) -> None: ... - def flatten(self, msg: Message, unixfrom: bool = ..., - linesep: Optional[str] = ...) -> None: ... + def __init__(self, outfp: BinaryIO, mangle_from_: bool = ..., maxheaderlen: int = ..., *, policy: Policy = ...) -> None: ... + def flatten(self, msg: Message, unixfrom: bool = ..., linesep: Optional[str] = ...) -> None: ... class DecodedGenerator(Generator): - def __init__(self, outfp: TextIO, mangle_from_: bool = ..., - maxheaderlen: int = ..., *, fmt: Optional[str] = ...) -> None: ... + def __init__(self, outfp: TextIO, mangle_from_: bool = ..., maxheaderlen: int = ..., *, fmt: Optional[str] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/header.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/header.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/header.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/header.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,26 @@ -# Stubs for email.header (Python 3.4) - -from typing import Union, Optional, Any, List, Tuple from email.charset import Charset +from typing import Any, List, Optional, Tuple, Union class Header: - def __init__(self, s: Union[bytes, str, None] = ..., - charset: Union[Charset, str, None] = ..., - maxlinelen: Optional[int] = ..., - header_name: Optional[str] = ..., continuation_ws: str = ..., - errors: str = ...) -> None: ... - def append(self, s: Union[bytes, str], - charset: Union[Charset, str, None] = ..., - errors: str = ...) -> None: ... - def encode(self, splitchars: str = ..., maxlinelen: Optional[int] = ..., - linesep: str = ...) -> str: ... + def __init__( + self, + s: Union[bytes, str, None] = ..., + charset: Union[Charset, str, None] = ..., + maxlinelen: Optional[int] = ..., + header_name: Optional[str] = ..., + continuation_ws: str = ..., + errors: str = ..., + ) -> None: ... + def append(self, s: Union[bytes, str], charset: Union[Charset, str, None] = ..., errors: str = ...) -> None: ... + def encode(self, splitchars: str = ..., maxlinelen: Optional[int] = ..., linesep: str = ...) -> str: ... def __str__(self) -> str: ... def __eq__(self, other: Any) -> bool: ... def __ne__(self, other: Any) -> bool: ... def decode_header(header: Union[Header, str]) -> List[Tuple[bytes, Optional[str]]]: ... -def make_header(decoded_seq: List[Tuple[bytes, Optional[str]]], - maxlinelen: Optional[int] = ..., - header_name: Optional[str] = ..., - continuation_ws: str = ...) -> Header: ... +def make_header( + decoded_seq: List[Tuple[bytes, Optional[str]]], + maxlinelen: Optional[int] = ..., + header_name: Optional[str] = ..., + continuation_ws: str = ..., +) -> Header: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/headerregistry.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/headerregistry.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/headerregistry.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/headerregistry.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,7 @@ -# Stubs for email.headerregistry (Python 3.4) - from datetime import datetime as _datetime -from typing import Dict, Tuple, Optional, Any, Union, Mapping from email.errors import MessageDefect from email.policy import Policy +from typing import Any, Dict, Mapping, Optional, Tuple, Union class BaseHeader(str): @property @@ -25,8 +23,7 @@ class DateHeader: datetime: _datetime @classmethod - def parse(cls, string: Union[str, _datetime], - kwds: Dict[str, Any]) -> None: ... + def parse(cls, string: Union[str, _datetime], kwds: Dict[str, Any]) -> None: ... class UniqueDateHeader(DateHeader): ... @@ -70,9 +67,7 @@ def parse(cls, string: str, kwds: Dict[str, Any]) -> None: ... class HeaderRegistry: - def __init__(self, base_class: BaseHeader = ..., - default_class: BaseHeader = ..., - use_default_map: bool = ...) -> None: ... + def __init__(self, base_class: BaseHeader = ..., default_class: BaseHeader = ..., use_default_map: bool = ...) -> None: ... def map_to_type(self, name: str, cls: BaseHeader) -> None: ... def __getitem__(self, name: str) -> BaseHeader: ... def __call__(self, name: str, value: Any) -> BaseHeader: ... @@ -83,15 +78,13 @@ domain: str @property def addr_spec(self) -> str: ... - def __init__(self, display_name: str = ..., - username: Optional[str] = ..., - domain: Optional[str] = ..., - addr_spec: Optional[str] = ...) -> None: ... + def __init__( + self, display_name: str = ..., username: Optional[str] = ..., domain: Optional[str] = ..., addr_spec: Optional[str] = ... + ) -> None: ... def __str__(self) -> str: ... class Group: display_name: Optional[str] addresses: Tuple[Address, ...] - def __init__(self, display_name: Optional[str] = ..., - addresses: Optional[Tuple[Address, ...]] = ...) -> None: ... + def __init__(self, display_name: Optional[str] = ..., addresses: Optional[Tuple[Address, ...]] = ...) -> None: ... def __str__(self) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,6 @@ -# Stubs for email (Python 3.4) - -from typing import Callable, IO from email.message import Message from email.policy import Policy +from typing import IO, Callable def message_from_string(s: str, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> Message: ... def message_from_bytes(s: bytes, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> Message: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/iterators.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/iterators.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/iterators.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/iterators.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,5 @@ -# Stubs for email.iterators (Python 3.4) - -from typing import Iterator, Optional from email.message import Message +from typing import Iterator, Optional def body_line_iterator(msg: Message, decode: bool = ...) -> Iterator[str]: ... -def typed_subpart_iterator(msg: Message, maintype: str = ..., - subtype: Optional[str] = ...) -> Iterator[str]: ... +def typed_subpart_iterator(msg: Message, maintype: str = ..., subtype: Optional[str] = ...) -> Iterator[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/message.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/message.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/message.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/message.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,10 @@ -# Stubs for email.message (Python 3.4) - -from typing import ( - List, Optional, Union, Tuple, TypeVar, Generator, Sequence, Iterator, Any -) from email.charset import Charset +from email.contentmanager import ContentManager from email.errors import MessageDefect -from email.header import Header from email.policy import Policy -from email.contentmanager import ContentManager +from typing import Any, Generator, Iterator, List, Optional, Sequence, Tuple, TypeVar, Union -_T = TypeVar('_T') +_T = TypeVar("_T") _PayloadType = Union[List[Message], str, bytes] _CharsetType = Union[Charset, str, None] @@ -27,8 +22,7 @@ def get_unixfrom(self) -> Optional[str]: ... def attach(self, payload: Message) -> None: ... def get_payload(self, i: int = ..., decode: bool = ...) -> Any: ... # returns Optional[_PayloadType] - def set_payload(self, payload: _PayloadType, - charset: _CharsetType = ...) -> None: ... + def set_payload(self, payload: _PayloadType, charset: _CharsetType = ...) -> None: ... def set_charset(self, charset: _CharsetType) -> None: ... def get_charset(self) -> _CharsetType: ... def __len__(self) -> int: ... @@ -48,14 +42,10 @@ def get_content_subtype(self) -> str: ... def get_default_type(self) -> str: ... def set_default_type(self, ctype: str) -> None: ... - def get_params(self, failobj: _T = ..., header: str = ..., - unquote: bool = ...) -> Union[List[Tuple[str, str]], _T]: ... - def get_param(self, param: str, failobj: _T = ..., header: str = ..., - unquote: bool = ...) -> Union[_T, _ParamType]: ... - def del_param(self, param: str, header: str = ..., - requote: bool = ...) -> None: ... - def set_type(self, type: str, header: str = ..., - requote: bool = ...) -> None: ... + def get_params(self, failobj: _T = ..., header: str = ..., unquote: bool = ...) -> Union[List[Tuple[str, str]], _T]: ... + def get_param(self, param: str, failobj: _T = ..., header: str = ..., unquote: bool = ...) -> Union[_T, _ParamType]: ... + def del_param(self, param: str, header: str = ..., requote: bool = ...) -> None: ... + def set_type(self, type: str, header: str = ..., requote: bool = ...) -> None: ... def get_filename(self, failobj: _T = ...) -> Union[_T, str]: ... def get_boundary(self, failobj: _T = ...) -> Union[_T, str]: ... def set_boundary(self, boundary: str) -> None: ... @@ -63,39 +53,33 @@ def get_charsets(self, failobj: _T = ...) -> Union[_T, List[str]]: ... def walk(self) -> Generator[Message, None, None]: ... def get_content_disposition(self) -> Optional[str]: ... - def as_string(self, unixfrom: bool = ..., maxheaderlen: int = ..., - policy: Optional[Policy] = ...) -> str: ... - def as_bytes(self, unixfrom: bool = ..., - policy: Optional[Policy] = ...) -> bytes: ... + def as_string(self, unixfrom: bool = ..., maxheaderlen: int = ..., policy: Optional[Policy] = ...) -> str: ... + def as_bytes(self, unixfrom: bool = ..., policy: Optional[Policy] = ...) -> bytes: ... def __bytes__(self) -> bytes: ... - def set_param(self, param: str, value: str, header: str = ..., - requote: bool = ..., charset: str = ..., - language: str = ..., replace: bool = ...) -> None: ... + def set_param( + self, + param: str, + value: str, + header: str = ..., + requote: bool = ..., + charset: str = ..., + language: str = ..., + replace: bool = ..., + ) -> None: ... def __init__(self, policy: Policy = ...) -> None: ... class MIMEPart(Message): - def get_body(self, - preferencelist: Sequence[str] = ...) -> Optional[Message]: ... + def get_body(self, preferencelist: Sequence[str] = ...) -> Optional[Message]: ... def iter_attachments(self) -> Iterator[Message]: ... def iter_parts(self) -> Iterator[Message]: ... - def get_content(self, *args: Any, - content_manager: Optional[ContentManager] = ..., - **kw: Any) -> Any: ... - def set_content(self, *args: Any, - content_manager: Optional[ContentManager] = ..., - **kw: Any) -> None: ... + def get_content(self, *args: Any, content_manager: Optional[ContentManager] = ..., **kw: Any) -> Any: ... + def set_content(self, *args: Any, content_manager: Optional[ContentManager] = ..., **kw: Any) -> None: ... def make_related(self, boundary: Optional[str] = ...) -> None: ... def make_alternative(self, boundary: Optional[str] = ...) -> None: ... def make_mixed(self, boundary: Optional[str] = ...) -> None: ... - def add_related(self, *args: Any, - content_manager: Optional[ContentManager] = ..., - **kw: Any) -> None: ... - def add_alternative(self, *args: Any, - content_manager: Optional[ContentManager] = ..., - **kw: Any) -> None: ... - def add_attachment(self, *args: Any, - content_manager: Optional[ContentManager] = ..., - **kw: Any) -> None: ... + def add_related(self, *args: Any, content_manager: Optional[ContentManager] = ..., **kw: Any) -> None: ... + def add_alternative(self, *args: Any, content_manager: Optional[ContentManager] = ..., **kw: Any) -> None: ... + def add_attachment(self, *args: Any, content_manager: Optional[ContentManager] = ..., **kw: Any) -> None: ... def clear(self) -> None: ... def clear_content(self) -> None: ... def is_attachment(self) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/application.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/application.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/application.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/application.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -# Stubs for email.mime.application (Python 3.4) - -import sys from email.mime.nonmultipart import MIMENonMultipart from email.policy import Policy from typing import Callable, Optional, Tuple, Union @@ -8,21 +5,12 @@ _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEApplication(MIMENonMultipart): - if sys.version_info >= (3, 6): - def __init__( - self, - _data: Union[str, bytes], - _subtype: str = ..., - _encoder: Callable[[MIMEApplication], None] = ..., - *, - policy: Optional[Policy] = ..., - **_params: _ParamsType, - ) -> None: ... - else: - def __init__( - self, - _data: Union[str, bytes], - _subtype: str = ..., - _encoder: Callable[[MIMEApplication], None] = ..., - **_params: _ParamsType, - ) -> None: ... + def __init__( + self, + _data: Union[str, bytes], + _subtype: str = ..., + _encoder: Callable[[MIMEApplication], None] = ..., + *, + policy: Optional[Policy] = ..., + **_params: _ParamsType, + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/audio.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/audio.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/audio.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/audio.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -# Stubs for email.mime.audio (Python 3.4) - -import sys from email.mime.nonmultipart import MIMENonMultipart from email.policy import Policy from typing import Callable, Optional, Tuple, Union @@ -8,21 +5,12 @@ _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEAudio(MIMENonMultipart): - if sys.version_info >= (3, 6): - def __init__( - self, - _audiodata: Union[str, bytes], - _subtype: Optional[str] = ..., - _encoder: Callable[[MIMEAudio], None] = ..., - *, - policy: Optional[Policy] = ..., - **_params: _ParamsType, - ) -> None: ... - else: - def __init__( - self, - _audiodata: Union[str, bytes], - _subtype: Optional[str] = ..., - _encoder: Callable[[MIMEAudio], None] = ..., - **_params: _ParamsType, - ) -> None: ... + def __init__( + self, + _audiodata: Union[str, bytes], + _subtype: Optional[str] = ..., + _encoder: Callable[[MIMEAudio], None] = ..., + *, + policy: Optional[Policy] = ..., + **_params: _ParamsType, + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/base.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/base.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/base.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/base.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,8 @@ -# Stubs for email.mime.base (Python 3.4) - import email.message -import sys from email.policy import Policy from typing import Optional, Tuple, Union _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEBase(email.message.Message): - if sys.version_info >= (3, 6): - def __init__(self, _maintype: str, _subtype: str, *, policy: Optional[Policy] = ..., **_params: _ParamsType) -> None: ... - else: - def __init__(self, _maintype: str, _subtype: str, **_params: _ParamsType) -> None: ... + def __init__(self, _maintype: str, _subtype: str, *, policy: Optional[Policy] = ..., **_params: _ParamsType) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/image.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/image.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/image.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/image.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -# Stubs for email.mime.image (Python 3.4) - -import sys from email.mime.nonmultipart import MIMENonMultipart from email.policy import Policy from typing import Callable, Optional, Tuple, Union @@ -8,21 +5,12 @@ _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEImage(MIMENonMultipart): - if sys.version_info >= (3, 6): - def __init__( - self, - _imagedata: Union[str, bytes], - _subtype: Optional[str] = ..., - _encoder: Callable[[MIMEImage], None] = ..., - *, - policy: Optional[Policy] = ..., - **_params: _ParamsType, - ) -> None: ... - else: - def __init__( - self, - _imagedata: Union[str, bytes], - _subtype: Optional[str] = ..., - _encoder: Callable[[MIMEImage], None] = ..., - **_params: _ParamsType, - ) -> None: ... + def __init__( + self, + _imagedata: Union[str, bytes], + _subtype: Optional[str] = ..., + _encoder: Callable[[MIMEImage], None] = ..., + *, + policy: Optional[Policy] = ..., + **_params: _ParamsType, + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/message.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/message.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/message.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/message.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,13 +1,7 @@ -# Stubs for email.mime.message (Python 3.4) - -import sys from email.message import Message from email.mime.nonmultipart import MIMENonMultipart from email.policy import Policy from typing import Optional class MIMEMessage(MIMENonMultipart): - if sys.version_info >= (3, 6): - def __init__(self, _msg: Message, _subtype: str = ..., *, policy: Optional[Policy] = ...) -> None: ... - else: - def __init__(self, _msg: Message, _subtype: str = ...) -> None: ... + def __init__(self, _msg: Message, _subtype: str = ..., *, policy: Optional[Policy] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/multipart.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/multipart.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/multipart.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/multipart.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -# Stubs for email.mime.multipart (Python 3.4) - -import sys from email.message import Message from email.mime.base import MIMEBase from email.policy import Policy @@ -9,21 +6,12 @@ _ParamsType = Union[str, None, Tuple[str, Optional[str], str]] class MIMEMultipart(MIMEBase): - if sys.version_info >= (3, 6): - def __init__( - self, - _subtype: str = ..., - boundary: Optional[str] = ..., - _subparts: Optional[Sequence[Message]] = ..., - *, - policy: Optional[Policy] = ..., - **_params: _ParamsType, - ) -> None: ... - else: - def __init__( - self, - _subtype: str = ..., - boundary: Optional[str] = ..., - _subparts: Optional[Sequence[Message]] = ..., - **_params: _ParamsType, - ) -> None: ... + def __init__( + self, + _subtype: str = ..., + boundary: Optional[str] = ..., + _subparts: Optional[Sequence[Message]] = ..., + *, + policy: Optional[Policy] = ..., + **_params: _ParamsType, + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/nonmultipart.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/nonmultipart.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/nonmultipart.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/nonmultipart.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for email.mime.nonmultipart (Python 3.4) - from email.mime.base import MIMEBase class MIMENonMultipart(MIMEBase): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/text.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/text.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/text.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/mime/text.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,8 @@ -# Stubs for email.mime.text (Python 3.4) - -import sys from email.mime.nonmultipart import MIMENonMultipart from email.policy import Policy from typing import Optional class MIMEText(MIMENonMultipart): - if sys.version_info >= (3, 6): - def __init__( - self, _text: str, _subtype: str = ..., _charset: Optional[str] = ..., *, policy: Optional[Policy] = ... - ) -> None: ... - else: - def __init__(self, _text: str, _subtype: str = ..., _charset: Optional[str] = ...) -> None: ... + def __init__( + self, _text: str, _subtype: str = ..., _charset: Optional[str] = ..., *, policy: Optional[Policy] = ... + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/parser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/parser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/parser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/parser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for email.parser (Python 3.4) - import email.feedparser from email.message import Message from email.policy import Policy @@ -9,25 +7,21 @@ BytesFeedParser = email.feedparser.BytesFeedParser class Parser: - def __init__(self, _class: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... + def __init__(self, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> None: ... def parse(self, fp: TextIO, headersonly: bool = ...) -> Message: ... def parsestr(self, text: str, headersonly: bool = ...) -> Message: ... class HeaderParser(Parser): - def __init__(self, _class: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... + def __init__(self, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> None: ... def parse(self, fp: TextIO, headersonly: bool = ...) -> Message: ... def parsestr(self, text: str, headersonly: bool = ...) -> Message: ... class BytesHeaderParser(BytesParser): - def __init__(self, _class: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... + def __init__(self, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> None: ... def parse(self, fp: BinaryIO, headersonly: bool = ...) -> Message: ... def parsebytes(self, text: bytes, headersonly: bool = ...) -> Message: ... class BytesParser: - def __init__(self, _class: Callable[[], Message] = ..., *, - policy: Policy = ...) -> None: ... + def __init__(self, _class: Callable[[], Message] = ..., *, policy: Policy = ...) -> None: ... def parse(self, fp: BinaryIO, headersonly: bool = ...) -> Message: ... def parsebytes(self, text: bytes, headersonly: bool = ...) -> Message: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/policy.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/policy.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/policy.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/policy.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,9 @@ -# Stubs for email.policy (Python 3.4) - from abc import abstractmethod -from typing import Any, List, Optional, Tuple, Union, Callable -from email.message import Message +from email.contentmanager import ContentManager from email.errors import MessageDefect from email.header import Header -from email.contentmanager import ContentManager +from email.message import Message +from typing import Any, Callable, List, Optional, Tuple, Union class Policy: max_line_length: Optional[int] @@ -15,28 +13,23 @@ mange_from: bool def __init__(self, **kw: Any) -> None: ... def clone(self, **kw: Any) -> Policy: ... - def handle_defect(self, obj: Message, - defect: MessageDefect) -> None: ... - def register_defect(self, obj: Message, - defect: MessageDefect) -> None: ... + def handle_defect(self, obj: Message, defect: MessageDefect) -> None: ... + def register_defect(self, obj: Message, defect: MessageDefect) -> None: ... def header_max_count(self, name: str) -> Optional[int]: ... @abstractmethod - def header_source_parse(self, sourcelines: List[str]) -> str: ... + def header_source_parse(self, sourcelines: List[str]) -> Tuple[str, str]: ... @abstractmethod - def header_store_parse(self, name: str, - value: str) -> Tuple[str, str]: ... + def header_store_parse(self, name: str, value: str) -> Tuple[str, str]: ... @abstractmethod - def header_fetch_parse(self, name: str, - value: str) -> str: ... + def header_fetch_parse(self, name: str, value: str) -> str: ... @abstractmethod def fold(self, name: str, value: str) -> str: ... @abstractmethod def fold_binary(self, name: str, value: str) -> bytes: ... class Compat32(Policy): - def header_source_parse(self, sourcelines: List[str]) -> str: ... - def header_store_parse(self, name: str, - value: str) -> Tuple[str, str]: ... + def header_source_parse(self, sourcelines: List[str]) -> Tuple[str, str]: ... + def header_store_parse(self, name: str, value: str) -> Tuple[str, str]: ... def header_fetch_parse(self, name: str, value: str) -> Union[str, Header]: ... # type: ignore def fold(self, name: str, value: str) -> str: ... def fold_binary(self, name: str, value: str) -> bytes: ... @@ -48,9 +41,8 @@ refold_source: str header_factory: Callable[[str, str], str] content_manager: ContentManager - def header_source_parse(self, sourcelines: List[str]) -> str: ... - def header_store_parse(self, name: str, - value: str) -> Tuple[str, str]: ... + def header_source_parse(self, sourcelines: List[str]) -> Tuple[str, str]: ... + def header_store_parse(self, name: str, value: str) -> Tuple[str, str]: ... def header_fetch_parse(self, name: str, value: str) -> str: ... def fold(self, name: str, value: str) -> str: ... def fold_binary(self, name: str, value: str) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/email/utils.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/email/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,7 @@ -# Stubs for email.utils (Python 3.4) - -from typing import List, Optional, Tuple, Union -from email.charset import Charset import datetime +import sys +from email.charset import Charset +from typing import List, Optional, Tuple, Union, overload _ParamType = Union[str, Tuple[Optional[str], Optional[str], str]] _PDTZ = Tuple[int, int, int, int, int, int, int, int, int, Optional[int]] @@ -10,24 +9,32 @@ def quote(str: str) -> str: ... def unquote(str: str) -> str: ... def parseaddr(address: Optional[str]) -> Tuple[str, str]: ... -def formataddr(pair: Tuple[Optional[str], str], - charset: Union[str, Charset] = ...) -> str: ... +def formataddr(pair: Tuple[Optional[str], str], charset: Union[str, Charset] = ...) -> str: ... def getaddresses(fieldvalues: List[str]) -> List[Tuple[str, str]]: ... +@overload +def parsedate(date: None) -> None: ... +@overload def parsedate(date: str) -> Optional[Tuple[int, int, int, int, int, int, int, int, int]]: ... +@overload +def parsedate_tz(date: None) -> None: ... +@overload def parsedate_tz(date: str) -> Optional[_PDTZ]: ... -def parsedate_to_datetime(date: str) -> datetime.datetime: ... + +if sys.version_info >= (3, 10): + @overload + def parsedate_to_datetime(date: None) -> None: ... + @overload + def parsedate_to_datetime(date: str) -> datetime.datetime: ... + +else: + def parsedate_to_datetime(date: str) -> datetime.datetime: ... + def mktime_tz(tuple: _PDTZ) -> int: ... -def formatdate(timeval: Optional[float] = ..., localtime: bool = ..., - usegmt: bool = ...) -> str: ... +def formatdate(timeval: Optional[float] = ..., localtime: bool = ..., usegmt: bool = ...) -> str: ... def format_datetime(dt: datetime.datetime, usegmt: bool = ...) -> str: ... def localtime(dt: Optional[datetime.datetime] = ...) -> datetime.datetime: ... -def make_msgid(idstring: Optional[str] = ..., - domain: Optional[str] = ...) -> str: ... +def make_msgid(idstring: Optional[str] = ..., domain: Optional[str] = ...) -> str: ... def decode_rfc2231(s: str) -> Tuple[Optional[str], Optional[str], str]: ... -def encode_rfc2231(s: str, charset: Optional[str] = ..., - language: Optional[str] = ...) -> str: ... -def collapse_rfc2231_value(value: _ParamType, errors: str = ..., - fallback_charset: str = ...) -> str: ... -def decode_params( - params: List[Tuple[str, str]] -) -> List[Tuple[str, _ParamType]]: ... +def encode_rfc2231(s: str, charset: Optional[str] = ..., language: Optional[str] = ...) -> str: ... +def collapse_rfc2231_value(value: _ParamType, errors: str = ..., fallback_charset: str = ...) -> str: ... +def decode_params(params: List[Tuple[str, str]]) -> List[Tuple[str, _ParamType]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/faulthandler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/faulthandler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/faulthandler.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/faulthandler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -7,6 +7,7 @@ def dump_traceback_later(timeout: float, repeat: bool = ..., file: FileDescriptorLike = ..., exit: bool = ...) -> None: ... def enable(file: FileDescriptorLike = ..., all_threads: bool = ...) -> None: ... def is_enabled() -> bool: ... + if sys.platform != "win32": def register(signum: int, file: FileDescriptorLike = ..., all_threads: bool = ..., chain: bool = ...) -> None: ... def unregister(signum: int) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/fcntl.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/fcntl.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/fcntl.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/fcntl.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,8 @@ +import sys +from _typeshed import FileDescriptorLike from array import array from typing import Any, Union, overload from typing_extensions import Literal -from _typeshed import FileDescriptorLike FASYNC: int FD_CLOEXEC: int @@ -33,6 +34,10 @@ F_SETLK64: int F_SETLKW: int F_SETLKW64: int +if sys.version_info >= (3, 9) and sys.platform == "linux": + F_OFD_GETLK: int + F_OFD_SETLK: int + F_OFD_SETLKW: int F_SETOWN: int F_SETSIG: int F_SHLCK: int @@ -75,40 +80,20 @@ LOCK_SH: int LOCK_UN: int LOCK_WRITE: int - @overload -def fcntl(__fd: FileDescriptorLike, - __cmd: int, - __arg: int = ...) -> int: ... -@overload -def fcntl(__fd: FileDescriptorLike, - __cmd: int, - __arg: bytes) -> bytes: ... +def fcntl(__fd: FileDescriptorLike, __cmd: int, __arg: int = ...) -> int: ... +@overload +def fcntl(__fd: FileDescriptorLike, __cmd: int, __arg: bytes) -> bytes: ... + _ReadOnlyBuffer = bytes _WritableBuffer = Union[bytearray, memoryview, array] @overload -def ioctl(__fd: FileDescriptorLike, - __request: int, - __arg: int = ..., - __mutate_flag: bool = ...) -> int: ... -@overload -def ioctl(__fd: FileDescriptorLike, - __request: int, - __arg: _WritableBuffer, - __mutate_flag: Literal[True] = ...) -> int: ... -@overload -def ioctl(__fd: FileDescriptorLike, - __request: int, - __arg: _WritableBuffer, - __mutate_flag: Literal[False]) -> bytes: ... -@overload -def ioctl(__fd: FileDescriptorLike, - __request: int, - __arg: _ReadOnlyBuffer, - __mutate_flag: bool = ...) -> bytes: ... +def ioctl(__fd: FileDescriptorLike, __request: int, __arg: int = ..., __mutate_flag: bool = ...) -> int: ... +@overload +def ioctl(__fd: FileDescriptorLike, __request: int, __arg: _WritableBuffer, __mutate_flag: Literal[True] = ...) -> int: ... +@overload +def ioctl(__fd: FileDescriptorLike, __request: int, __arg: _WritableBuffer, __mutate_flag: Literal[False]) -> bytes: ... +@overload +def ioctl(__fd: FileDescriptorLike, __request: int, __arg: _ReadOnlyBuffer, __mutate_flag: bool = ...) -> bytes: ... def flock(__fd: FileDescriptorLike, __operation: int) -> None: ... -def lockf(__fd: FileDescriptorLike, - __cmd: int, - __len: int = ..., - __start: int = ..., - __whence: int = ...) -> Any: ... +def lockf(__fd: FileDescriptorLike, __cmd: int, __len: int = ..., __start: int = ..., __whence: int = ...) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/functools.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/functools.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/functools.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/functools.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,17 +1,35 @@ import sys -from typing import Any, Callable, Generic, Dict, Hashable, Iterable, Mapping, Optional, Sequence, Tuple, Type, TypeVar, NamedTuple, Union, overload +from _typeshed import SupportsLessThan +from typing import ( + Any, + Callable, + Dict, + Generic, + Hashable, + Iterable, + Mapping, + NamedTuple, + Optional, + Protocol, + Sequence, + Tuple, + Type, + TypeVar, + Union, + overload, +) + +if sys.version_info >= (3, 9): + from types import GenericAlias _AnyCallable = Callable[..., Any] _T = TypeVar("_T") _S = TypeVar("_S") - @overload -def reduce(function: Callable[[_T, _S], _T], - sequence: Iterable[_S], initial: _T) -> _T: ... +def reduce(function: Callable[[_T, _S], _T], sequence: Iterable[_S], initial: _T) -> _T: ... @overload -def reduce(function: Callable[[_T, _T], _T], - sequence: Iterable[_T]) -> _T: ... +def reduce(function: Callable[[_T, _T], _T], sequence: Iterable[_T]) -> _T: ... class _CacheInfo(NamedTuple): hits: int @@ -30,17 +48,19 @@ def lru_cache(maxsize: Optional[int] = ..., typed: bool = ...) -> Callable[[Callable[..., _T]], _lru_cache_wrapper[_T]]: ... @overload def lru_cache(maxsize: Callable[..., _T], typed: bool = ...) -> _lru_cache_wrapper[_T]: ... + else: def lru_cache(maxsize: Optional[int] = ..., typed: bool = ...) -> Callable[[Callable[..., _T]], _lru_cache_wrapper[_T]]: ... WRAPPER_ASSIGNMENTS: Sequence[str] WRAPPER_UPDATES: Sequence[str] -def update_wrapper(wrapper: _AnyCallable, wrapped: _AnyCallable, assigned: Sequence[str] = ..., - updated: Sequence[str] = ...) -> _AnyCallable: ... -def wraps(wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ...) -> Callable[[_AnyCallable], _AnyCallable]: ... +def update_wrapper(wrapper: _T, wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ...) -> _T: ... +def wraps( + wrapped: _AnyCallable, assigned: Sequence[str] = ..., updated: Sequence[str] = ... +) -> Callable[[_AnyCallable], _AnyCallable]: ... def total_ordering(cls: Type[_T]) -> Type[_T]: ... -def cmp_to_key(mycmp: Callable[[_T, _T], int]) -> Callable[[_T], Any]: ... +def cmp_to_key(mycmp: Callable[[_T, _T], int]) -> Callable[[_T], SupportsLessThan]: ... class partial(Generic[_T]): func: Callable[..., _T] @@ -48,6 +68,8 @@ keywords: Dict[str, Any] def __init__(self, func: Callable[..., _T], *args: Any, **kwargs: Any) -> None: ... def __call__(self, *args: Any, **kwargs: Any) -> _T: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # With protocols, this could change into a generic protocol that defines __get__ and returns _T _Descriptor = Any @@ -56,14 +78,15 @@ func: Union[Callable[..., _T], _Descriptor] args: Tuple[Any, ...] keywords: Dict[str, Any] - @overload - def __init__(self, func: Callable[..., _T], *args: Any, **keywords: Any) -> None: ... + def __init__(self, __func: Callable[..., _T], *args: Any, **keywords: Any) -> None: ... @overload - def __init__(self, func: _Descriptor, *args: Any, **keywords: Any) -> None: ... + def __init__(self, __func: _Descriptor, *args: Any, **keywords: Any) -> None: ... def __get__(self, obj: Any, cls: Type[Any]) -> Callable[..., _T]: ... @property def __isabstractmethod__(self) -> bool: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class _SingleDispatchCallable(Generic[_T]): registry: Mapping[Any, Callable[..., _T]] @@ -87,7 +110,6 @@ @overload def register(self, cls: Any, method: Callable[..., _T]) -> Callable[..., _T]: ... def __call__(self, *args: Any, **kwargs: Any) -> _T: ... - class cached_property(Generic[_T]): func: Callable[[Any], _T] attrname: Optional[str] @@ -97,17 +119,8 @@ @overload def __get__(self, instance: _S, owner: Optional[Type[Any]] = ...) -> _T: ... def __set_name__(self, owner: Type[Any], name: str) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... if sys.version_info >= (3, 9): - class TopologicalSorter(Generic[_T]): - def __init__(self, graph: Optional[Dict[_T, Iterable[_T]]] = ...) -> None: ... - def add(self, node: _T, *predecessors: _T) -> None: ... - def prepare(self) -> None: ... - def is_active(self) -> bool: ... - def done(self, *nodes: _T) -> None: ... - def get_ready(self) -> Tuple[_T, ...]: ... - def static_order(self) -> Iterable[_T]: ... - - class CycleError(ValueError): ... - def cache(__user_function: Callable[..., _T]) -> _lru_cache_wrapper[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/gc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/gc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/gc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/gc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,6 @@ -# Stubs for gc - import sys from typing import Any, Dict, List, Optional, Tuple - DEBUG_COLLECTABLE: int DEBUG_LEAK: int DEBUG_SAVEALL: int @@ -17,16 +14,27 @@ def enable() -> None: ... def get_count() -> Tuple[int, int, int]: ... def get_debug() -> int: ... + if sys.version_info >= (3, 8): def get_objects(generation: Optional[int] = ...) -> List[Any]: ... + else: def get_objects() -> List[Any]: ... + +if sys.version_info >= (3, 7): + def freeze() -> None: ... + def unfreeze() -> None: ... + def get_freeze_count() -> int: ... + def get_referents(*objs: Any) -> List[Any]: ... def get_referrers(*objs: Any) -> List[Any]: ... def get_stats() -> List[Dict[str, Any]]: ... def get_threshold() -> Tuple[int, int, int]: ... def is_tracked(__obj: Any) -> bool: ... + +if sys.version_info >= (3, 9): + def is_finalized(__obj: Any) -> bool: ... + def isenabled() -> bool: ... def set_debug(__flags: int) -> None: ... -def set_threshold(threshold0: int, threshold1: int = ..., - threshold2: int = ...) -> None: ... +def set_threshold(threshold0: int, threshold1: int = ..., threshold2: int = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/gettext.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/gettext.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/gettext.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/gettext.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ import sys -from typing import overload, Any, Container, IO, Iterable, Optional, Sequence, Type, TypeVar, Union from _typeshed import StrPath +from typing import IO, Any, Container, Iterable, Optional, Sequence, Type, TypeVar, overload from typing_extensions import Literal class NullTranslations: @@ -26,23 +26,39 @@ CONTEXT: str VERSIONS: Sequence[int] -def find(domain: str, localedir: Optional[StrPath] = ..., languages: Optional[Iterable[str]] = ..., - all: bool = ...) -> Any: ... +def find(domain: str, localedir: Optional[StrPath] = ..., languages: Optional[Iterable[str]] = ..., all: bool = ...) -> Any: ... -_T = TypeVar('_T') +_T = TypeVar("_T") @overload -def translation(domain: str, localedir: Optional[StrPath] = ..., languages: Optional[Iterable[str]] = ..., - class_: None = ..., fallback: bool = ..., codeset: Optional[str] = ...) -> NullTranslations: ... +def translation( + domain: str, + localedir: Optional[StrPath] = ..., + languages: Optional[Iterable[str]] = ..., + class_: None = ..., + fallback: bool = ..., + codeset: Optional[str] = ..., +) -> NullTranslations: ... @overload -def translation(domain: str, localedir: Optional[StrPath] = ..., languages: Optional[Iterable[str]] = ..., - class_: Type[_T] = ..., fallback: Literal[False] = ..., codeset: Optional[str] = ...) -> _T: ... +def translation( + domain: str, + localedir: Optional[StrPath] = ..., + languages: Optional[Iterable[str]] = ..., + class_: Type[_T] = ..., + fallback: Literal[False] = ..., + codeset: Optional[str] = ..., +) -> _T: ... @overload -def translation(domain: str, localedir: Optional[StrPath] = ..., languages: Optional[Iterable[str]] = ..., - class_: Type[_T] = ..., fallback: Literal[True] = ..., codeset: Optional[str] = ...) -> Any: ... - -def install(domain: str, localedir: Optional[StrPath] = ..., codeset: Optional[str] = ..., - names: Optional[Container[str]] = ...) -> None: ... - +def translation( + domain: str, + localedir: Optional[StrPath] = ..., + languages: Optional[Iterable[str]] = ..., + class_: Type[_T] = ..., + fallback: Literal[True] = ..., + codeset: Optional[str] = ..., +) -> Any: ... +def install( + domain: str, localedir: Optional[StrPath] = ..., codeset: Optional[str] = ..., names: Optional[Container[str]] = ... +) -> None: ... def textdomain(domain: Optional[str] = ...) -> str: ... def bindtextdomain(domain: str, localedir: Optional[StrPath] = ...) -> str: ... def bind_textdomain_codeset(domain: str, codeset: Optional[str] = ...) -> str: ... @@ -54,6 +70,7 @@ def lgettext(message: str) -> str: ... def ngettext(msgid1: str, msgid2: str, n: int) -> str: ... def lngettext(msgid1: str, msgid2: str, n: int) -> str: ... + if sys.version_info >= (3, 8): def pgettext(context: str, message: str) -> str: ... def dpgettext(domain: str, context: str, message: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/hashlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/hashlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/hashlib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/hashlib.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,6 @@ -# Stubs for hashlib - import sys -from typing import AbstractSet, Optional, Union - -_DataType = Union[bytes, bytearray, memoryview] +from _typeshed import ReadableBuffer +from typing import AbstractSet, Optional class _Hash(object): digest_size: int @@ -13,75 +10,114 @@ # been present in CPython since its inception, but until Python 3.4 was not # formally specified, so may not exist on some platforms name: str - - def __init__(self, data: _DataType = ...) -> None: ... - + def __init__(self, data: ReadableBuffer = ...) -> None: ... def copy(self) -> _Hash: ... def digest(self) -> bytes: ... def hexdigest(self) -> str: ... - def update(self, __data: _DataType) -> None: ... + def update(self, __data: ReadableBuffer) -> None: ... if sys.version_info >= (3, 9): - def md5(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... - def sha1(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... - def sha224(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... - def sha256(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... - def sha384(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... - def sha512(string: _DataType = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def md5(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def sha1(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def sha224(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def sha256(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def sha384(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + def sha512(string: ReadableBuffer = ..., *, usedforsecurity: bool = ...) -> _Hash: ... + elif sys.version_info >= (3, 8): - def md5(string: _DataType = ...) -> _Hash: ... - def sha1(string: _DataType = ...) -> _Hash: ... - def sha224(string: _DataType = ...) -> _Hash: ... - def sha256(string: _DataType = ...) -> _Hash: ... - def sha384(string: _DataType = ...) -> _Hash: ... - def sha512(string: _DataType = ...) -> _Hash: ... + def md5(string: ReadableBuffer = ...) -> _Hash: ... + def sha1(string: ReadableBuffer = ...) -> _Hash: ... + def sha224(string: ReadableBuffer = ...) -> _Hash: ... + def sha256(string: ReadableBuffer = ...) -> _Hash: ... + def sha384(string: ReadableBuffer = ...) -> _Hash: ... + def sha512(string: ReadableBuffer = ...) -> _Hash: ... + else: - def md5(__string: _DataType = ...) -> _Hash: ... - def sha1(__string: _DataType = ...) -> _Hash: ... - def sha224(__string: _DataType = ...) -> _Hash: ... - def sha256(__string: _DataType = ...) -> _Hash: ... - def sha384(__string: _DataType = ...) -> _Hash: ... - def sha512(__string: _DataType = ...) -> _Hash: ... + def md5(__string: ReadableBuffer = ...) -> _Hash: ... + def sha1(__string: ReadableBuffer = ...) -> _Hash: ... + def sha224(__string: ReadableBuffer = ...) -> _Hash: ... + def sha256(__string: ReadableBuffer = ...) -> _Hash: ... + def sha384(__string: ReadableBuffer = ...) -> _Hash: ... + def sha512(__string: ReadableBuffer = ...) -> _Hash: ... -def new(name: str, data: _DataType = ...) -> _Hash: ... +def new(name: str, data: ReadableBuffer = ...) -> _Hash: ... algorithms_guaranteed: AbstractSet[str] algorithms_available: AbstractSet[str] -def pbkdf2_hmac(hash_name: str, password: _DataType, salt: _DataType, iterations: int, dklen: Optional[int] = ...) -> bytes: ... +def pbkdf2_hmac( + hash_name: str, password: ReadableBuffer, salt: ReadableBuffer, iterations: int, dklen: Optional[int] = ... +) -> bytes: ... -if sys.version_info >= (3, 6): - class _VarLenHash(object): - digest_size: int - block_size: int - name: str - - def __init__(self, data: _DataType = ...) -> None: ... - - def copy(self) -> _VarLenHash: ... - def digest(self, __length: int) -> bytes: ... - def hexdigest(self, __length: int) -> str: ... - def update(self, __data: _DataType) -> None: ... - - sha3_224 = _Hash - sha3_256 = _Hash - sha3_384 = _Hash - sha3_512 = _Hash - shake_128 = _VarLenHash - shake_256 = _VarLenHash - - def scrypt(password: _DataType, *, salt: Optional[_DataType] = ..., n: Optional[int] = ..., r: Optional[int] = ..., p: Optional[int] = ..., maxmem: int = ..., dklen: int = ...) -> bytes: ... - - class _BlakeHash(_Hash): - MAX_DIGEST_SIZE: int - MAX_KEY_SIZE: int - PERSON_SIZE: int - SALT_SIZE: int - - if sys.version_info >= (3, 9): - def __init__(self, __data: _DataType = ..., *, digest_size: int = ..., key: _DataType = ..., salt: _DataType = ..., person: _DataType = ..., fanout: int = ..., depth: int = ..., leaf_size: int = ..., node_offset: int = ..., node_depth: int = ..., inner_size: int = ..., last_node: bool = ..., usedforsecurity: bool = ...) -> None: ... - else: - def __init__(self, __data: _DataType = ..., *, digest_size: int = ..., key: _DataType = ..., salt: _DataType = ..., person: _DataType = ..., fanout: int = ..., depth: int = ..., leaf_size: int = ..., node_offset: int = ..., node_depth: int = ..., inner_size: int = ..., last_node: bool = ...) -> None: ... +class _VarLenHash(object): + digest_size: int + block_size: int + name: str + def __init__(self, data: ReadableBuffer = ...) -> None: ... + def copy(self) -> _VarLenHash: ... + def digest(self, __length: int) -> bytes: ... + def hexdigest(self, __length: int) -> str: ... + def update(self, __data: ReadableBuffer) -> None: ... + +sha3_224 = _Hash +sha3_256 = _Hash +sha3_384 = _Hash +sha3_512 = _Hash +shake_128 = _VarLenHash +shake_256 = _VarLenHash + +def scrypt( + password: ReadableBuffer, + *, + salt: Optional[ReadableBuffer] = ..., + n: Optional[int] = ..., + r: Optional[int] = ..., + p: Optional[int] = ..., + maxmem: int = ..., + dklen: int = ..., +) -> bytes: ... + +class _BlakeHash(_Hash): + MAX_DIGEST_SIZE: int + MAX_KEY_SIZE: int + PERSON_SIZE: int + SALT_SIZE: int + + if sys.version_info >= (3, 9): + def __init__( + self, + __data: ReadableBuffer = ..., + *, + digest_size: int = ..., + key: ReadableBuffer = ..., + salt: ReadableBuffer = ..., + person: ReadableBuffer = ..., + fanout: int = ..., + depth: int = ..., + leaf_size: int = ..., + node_offset: int = ..., + node_depth: int = ..., + inner_size: int = ..., + last_node: bool = ..., + usedforsecurity: bool = ..., + ) -> None: ... + else: + def __init__( + self, + __data: ReadableBuffer = ..., + *, + digest_size: int = ..., + key: ReadableBuffer = ..., + salt: ReadableBuffer = ..., + person: ReadableBuffer = ..., + fanout: int = ..., + depth: int = ..., + leaf_size: int = ..., + node_offset: int = ..., + node_depth: int = ..., + inner_size: int = ..., + last_node: bool = ..., + ) -> None: ... - blake2b = _BlakeHash - blake2s = _BlakeHash +blake2b = _BlakeHash +blake2s = _BlakeHash diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/heapq.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/heapq.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/heapq.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/heapq.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,7 @@ -# Stubs for heapq +from _typeshed import SupportsLessThan +from typing import Any, Callable, Iterable, List, Optional, TypeVar -# Based on http://docs.python.org/3.2/library/heapq.html - -from typing import TypeVar, List, Iterable, Any, Callable, Optional - -_T = TypeVar('_T') +_T = TypeVar("_T") def heappush(__heap: List[_T], __item: _T) -> None: ... def heappop(__heap: List[_T]) -> _T: ... @@ -12,7 +9,6 @@ def heapify(__heap: List[_T]) -> None: ... def heapreplace(__heap: List[_T], __item: _T) -> _T: ... def merge(*iterables: Iterable[_T], key: Optional[Callable[[_T], Any]] = ..., reverse: bool = ...) -> Iterable[_T]: ... -def nlargest(n: int, iterable: Iterable[_T], - key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ... -def nsmallest(n: int, iterable: Iterable[_T], - key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ... +def nlargest(n: int, iterable: Iterable[_T], key: Optional[Callable[[_T], SupportsLessThan]] = ...) -> List[_T]: ... +def nsmallest(n: int, iterable: Iterable[_T], key: Optional[Callable[[_T], SupportsLessThan]] = ...) -> List[_T]: ... +def _heapify_max(__x: List[_T]) -> None: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/client.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/client.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/client.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/client.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,30 @@ -from typing import ( - Any, Dict, IO, Iterable, List, Iterator, Mapping, Optional, - Protocol, Tuple, Type, TypeVar, - Union, - overload, - BinaryIO, -) import email.message import io -from socket import socket -import sys import ssl +import sys import types +from socket import socket +from typing import ( + IO, + Any, + BinaryIO, + Callable, + Dict, + Iterable, + Iterator, + List, + Mapping, + Optional, + Protocol, + Tuple, + Type, + TypeVar, + Union, + overload, +) _DataType = Union[bytes, IO[Any], Iterable[bytes], str] -_T = TypeVar('_T') +_T = TypeVar("_T") HTTP_PORT: int HTTPS_PORT: int @@ -80,6 +91,8 @@ class HTTPMessage(email.message.Message): ... +def parse_headers(fp: io.BufferedIOBase, _class: Callable[[], email.message.Message] = ...) -> HTTPMessage: ... + class HTTPResponse(io.BufferedIOBase, BinaryIO): msg: HTTPMessage headers: HTTPMessage @@ -88,8 +101,7 @@ closed: bool status: int reason: str - def __init__(self, sock: socket, debuglevel: int = ..., - method: Optional[str] = ..., url: Optional[str] = ...) -> None: ... + def __init__(self, sock: socket, debuglevel: int = ..., method: Optional[str] = ..., url: Optional[str] = ...) -> None: ... def read(self, amt: Optional[int] = ...) -> bytes: ... @overload def getheader(self, name: str) -> Optional[str]: ... @@ -100,9 +112,9 @@ def isclosed(self) -> bool: ... def __iter__(self) -> Iterator[bytes]: ... def __enter__(self) -> HTTPResponse: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[types.TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[types.TracebackType] + ) -> Optional[bool]: ... def info(self) -> email.message.Message: ... def geturl(self) -> str: ... def getcode(self) -> int: ... @@ -122,7 +134,7 @@ ) -> HTTPConnection: ... else: def __call__( - self, host: str, port: Optional[int] = ..., timeout: float = ..., source_address: Optional[Tuple[str, int]] = ..., + self, host: str, port: Optional[int] = ..., timeout: float = ..., source_address: Optional[Tuple[str, int]] = ... ) -> HTTPConnection: ... class HTTPConnection: @@ -133,53 +145,55 @@ if sys.version_info >= (3, 7): def __init__( self, - host: str, port: Optional[int] = ..., + host: str, + port: Optional[int] = ..., timeout: Optional[float] = ..., - source_address: Optional[Tuple[str, int]] = ..., blocksize: int = ... + source_address: Optional[Tuple[str, int]] = ..., + blocksize: int = ..., ) -> None: ... else: def __init__( self, - host: str, port: Optional[int] = ..., + host: str, + port: Optional[int] = ..., timeout: Optional[float] = ..., - source_address: Optional[Tuple[str, int]] = ... + source_address: Optional[Tuple[str, int]] = ..., ) -> None: ... - if sys.version_info >= (3, 6): - def request(self, method: str, url: str, - body: Optional[_DataType] = ..., - headers: Mapping[str, str] = ..., - *, encode_chunked: bool = ...) -> None: ... - else: - def request(self, method: str, url: str, - body: Optional[_DataType] = ..., - headers: Mapping[str, str] = ...) -> None: ... + def request( + self, + method: str, + url: str, + body: Optional[_DataType] = ..., + headers: Mapping[str, str] = ..., + *, + encode_chunked: bool = ..., + ) -> None: ... def getresponse(self) -> HTTPResponse: ... def set_debuglevel(self, level: int) -> None: ... - def set_tunnel(self, host: str, port: Optional[int] = ..., - headers: Optional[Mapping[str, str]] = ...) -> None: ... + def set_tunnel(self, host: str, port: Optional[int] = ..., headers: Optional[Mapping[str, str]] = ...) -> None: ... def connect(self) -> None: ... def close(self) -> None: ... - def putrequest(self, method: str, url: str, skip_host: bool = ..., - skip_accept_encoding: bool = ...) -> None: ... + def putrequest(self, method: str, url: str, skip_host: bool = ..., skip_accept_encoding: bool = ...) -> None: ... def putheader(self, header: str, *argument: str) -> None: ... - if sys.version_info >= (3, 6): - def endheaders(self, message_body: Optional[_DataType] = ..., - *, encode_chunked: bool = ...) -> None: ... - else: - def endheaders(self, message_body: Optional[_DataType] = ...) -> None: ... + def endheaders(self, message_body: Optional[_DataType] = ..., *, encode_chunked: bool = ...) -> None: ... def send(self, data: _DataType) -> None: ... class HTTPSConnection(HTTPConnection): - def __init__(self, - host: str, port: Optional[int] = ..., - key_file: Optional[str] = ..., - cert_file: Optional[str] = ..., - timeout: Optional[float] = ..., - source_address: Optional[Tuple[str, int]] = ..., - *, context: Optional[ssl.SSLContext] = ..., - check_hostname: Optional[bool] = ...) -> None: ... + def __init__( + self, + host: str, + port: Optional[int] = ..., + key_file: Optional[str] = ..., + cert_file: Optional[str] = ..., + timeout: Optional[float] = ..., + source_address: Optional[Tuple[str, int]] = ..., + *, + context: Optional[ssl.SSLContext] = ..., + check_hostname: Optional[bool] = ..., + ) -> None: ... class HTTPException(Exception): ... + error = HTTPException class NotConnected(HTTPException): ... @@ -188,13 +202,10 @@ class UnknownTransferEncoding(HTTPException): ... class UnimplementedFileMode(HTTPException): ... class IncompleteRead(HTTPException): ... - class ImproperConnectionState(HTTPException): ... class CannotSendRequest(ImproperConnectionState): ... class CannotSendHeader(ImproperConnectionState): ... class ResponseNotReady(ImproperConnectionState): ... - class BadStatusLine(HTTPException): ... class LineTooLong(HTTPException): ... - class RemoteDisconnected(ConnectionResetError, BadStatusLine): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookiejar.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookiejar.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookiejar.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookiejar.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,28 +1,22 @@ import sys -from typing import Dict, Iterable, Iterator, Optional, Sequence, Tuple, TypeVar, Union, overload from http.client import HTTPResponse +from os import PathLike +from typing import Dict, Iterable, Iterator, Optional, Sequence, Tuple, TypeVar, Union, overload from urllib.request import Request -if sys.version_info >= (3, 6): - from os import PathLike -_T = TypeVar('_T') +_T = TypeVar("_T") class LoadError(OSError): ... - class CookieJar(Iterable[Cookie]): def __init__(self, policy: Optional[CookiePolicy] = ...) -> None: ... def add_cookie_header(self, request: Request) -> None: ... - def extract_cookies(self, response: HTTPResponse, - request: Request) -> None: ... + def extract_cookies(self, response: HTTPResponse, request: Request) -> None: ... def set_policy(self, policy: CookiePolicy) -> None: ... - def make_cookies(self, response: HTTPResponse, - request: Request) -> Sequence[Cookie]: ... + def make_cookies(self, response: HTTPResponse, request: Request) -> Sequence[Cookie]: ... def set_cookie(self, cookie: Cookie) -> None: ... - def set_cookie_if_ok(self, cookie: Cookie, - request: Request) -> None: ... - def clear(self, domain: str = ..., path: str = ..., - name: str = ...) -> None: ... + def set_cookie_if_ok(self, cookie: Cookie, request: Request) -> None: ... + def clear(self, domain: str = ..., path: str = ..., name: str = ...) -> None: ... def clear_session_cookies(self) -> None: ... def __iter__(self) -> Iterator[Cookie]: ... def __len__(self) -> int: ... @@ -31,17 +25,14 @@ filename: str delayload: bool if sys.version_info >= (3, 8): - def __init__(self, filename: Union[str, PathLike[str]] = ..., delayload: bool = ..., - policy: Optional[CookiePolicy] = ...) -> None: ... + def __init__( + self, filename: Union[str, PathLike[str]] = ..., delayload: bool = ..., policy: Optional[CookiePolicy] = ... + ) -> None: ... else: - def __init__(self, filename: str = ..., delayload: bool = ..., - policy: Optional[CookiePolicy] = ...) -> None: ... - def save(self, filename: Optional[str] = ..., ignore_discard: bool = ..., - ignore_expires: bool = ...) -> None: ... - def load(self, filename: Optional[str] = ..., ignore_discard: bool = ..., - ignore_expires: bool = ...) -> None: ... - def revert(self, filename: Optional[str] = ..., ignore_discard: bool = ..., - ignore_expires: bool = ...) -> None: ... + def __init__(self, filename: str = ..., delayload: bool = ..., policy: Optional[CookiePolicy] = ...) -> None: ... + def save(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ... + def load(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ... + def revert(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ... class MozillaCookieJar(FileCookieJar): ... @@ -57,7 +48,6 @@ def domain_return_ok(self, domain: str, request: Request) -> bool: ... def path_return_ok(self, path: str, request: Request) -> bool: ... - class DefaultCookiePolicy(CookiePolicy): rfc2109_as_netscape: bool strict_domain: bool @@ -71,17 +61,21 @@ DomainRFC2965Match: int DomainLiberal: int DomainStrict: int - def __init__(self, blocked_domains: Optional[Sequence[str]] = ..., - allowed_domains: Optional[Sequence[str]] = ..., - netscape: bool = ..., - rfc2965: bool = ..., - rfc2109_as_netscape: Optional[bool] = ..., - hide_cookie2: bool = ..., strict_domain: bool = ..., - strict_rfc2965_unverifiable: bool = ..., - strict_ns_unverifiable: bool = ..., - strict_ns_domain: int = ..., - strict_ns_set_initial_dollar: bool = ..., - strict_ns_set_path: bool = ...) -> None: ... + def __init__( + self, + blocked_domains: Optional[Sequence[str]] = ..., + allowed_domains: Optional[Sequence[str]] = ..., + netscape: bool = ..., + rfc2965: bool = ..., + rfc2109_as_netscape: Optional[bool] = ..., + hide_cookie2: bool = ..., + strict_domain: bool = ..., + strict_rfc2965_unverifiable: bool = ..., + strict_ns_unverifiable: bool = ..., + strict_ns_domain: int = ..., + strict_ns_set_initial_dollar: bool = ..., + strict_ns_set_path: bool = ..., + ) -> None: ... def blocked_domains(self) -> Tuple[str, ...]: ... def set_blocked_domains(self, blocked_domains: Sequence[str]) -> None: ... def is_blocked(self, domain: str) -> bool: ... @@ -89,13 +83,13 @@ def set_allowed_domains(self, allowed_domains: Optional[Sequence[str]]) -> None: ... def is_not_allowed(self, domain: str) -> bool: ... - class Cookie: version: Optional[int] name: str value: Optional[str] port: Optional[str] path: str + path_specified: bool secure: bool expires: Optional[int] discard: bool @@ -106,14 +100,26 @@ domain: str # undocumented domain_specified: bool domain_initial_dot: bool - def __init__(self, version: Optional[int], name: str, value: Optional[str], # undocumented - port: Optional[str], port_specified: bool, - domain: str, domain_specified: bool, domain_initial_dot: bool, - path: str, path_specified: bool, - secure: bool, expires: Optional[int], discard: bool, - comment: Optional[str], comment_url: Optional[str], - rest: Dict[str, str], - rfc2109: bool = ...) -> None: ... + def __init__( + self, + version: Optional[int], + name: str, + value: Optional[str], # undocumented + port: Optional[str], + port_specified: bool, + domain: str, + domain_specified: bool, + domain_initial_dot: bool, + path: str, + path_specified: bool, + secure: bool, + expires: Optional[int], + discard: bool, + comment: Optional[str], + comment_url: Optional[str], + rest: Dict[str, str], + rfc2109: bool = ..., + ) -> None: ... def has_nonstandard_attr(self, name: str) -> bool: ... @overload def get_nonstandard_attr(self, name: str) -> Optional[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookies.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookies.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookies.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/cookies.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,8 @@ -# Stubs for http.cookies (Python 3.5) - import sys -from typing import Generic, Dict, List, Mapping, Optional, TypeVar, Union, Any +from typing import Any, Dict, Generic, List, Mapping, Optional, TypeVar, Union _DataType = Union[str, Mapping[str, Union[str, Morsel[Any]]]] -_T = TypeVar('_T') +_T = TypeVar("_T") class CookieError(Exception): ... @@ -17,8 +15,7 @@ else: def set(self, key: str, val: str, coded_val: _T, LegalChars: str = ...) -> None: ... def isReservedKey(self, K: str) -> bool: ... - def output(self, attrs: Optional[List[str]] = ..., - header: str = ...) -> str: ... + def output(self, attrs: Optional[List[str]] = ..., header: str = ...) -> str: ... def js_output(self, attrs: Optional[List[str]] = ...) -> str: ... def OutputString(self, attrs: Optional[List[str]] = ...) -> str: ... @@ -26,8 +23,7 @@ def __init__(self, input: Optional[_DataType] = ...) -> None: ... def value_decode(self, val: str) -> _T: ... def value_encode(self, val: _T) -> str: ... - def output(self, attrs: Optional[List[str]] = ..., header: str = ..., - sep: str = ...) -> str: ... + def output(self, attrs: Optional[List[str]] = ..., header: str = ..., sep: str = ...) -> str: ... def js_output(self, attrs: Optional[List[str]] = ...) -> str: ... def load(self, rawdata: _DataType) -> None: ... def __setitem__(self, key: str, value: Union[str, Morsel[_T]]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/server.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/server.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/http/server.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/http/server.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,7 @@ -# Stubs for http.server (Python 3.4) - -import sys -from typing import Any, BinaryIO, Callable, ClassVar, Dict, List, Mapping, Optional, Sequence, Tuple, Union -import socketserver import email.message +import socketserver +import sys +from typing import Any, Callable, ClassVar, Dict, List, Mapping, Optional, Sequence, Tuple, Union if sys.version_info >= (3, 7): from builtins import _PathLike @@ -11,8 +9,7 @@ class HTTPServer(socketserver.TCPServer): server_name: str server_port: int - def __init__(self, server_address: Tuple[str, int], - RequestHandlerClass: Callable[..., BaseHTTPRequestHandler]) -> None: ... + def __init__(self, server_address: Tuple[str, int], RequestHandlerClass: Callable[..., BaseHTTPRequestHandler]) -> None: ... if sys.version_info >= (3, 7): class ThreadingHTTPServer(socketserver.ThreadingMixIn, HTTPServer): @@ -36,22 +33,17 @@ responses: Mapping[int, Tuple[str, str]] weekdayname: ClassVar[Sequence[str]] = ... # Undocumented monthname: ClassVar[Sequence[Optional[str]]] = ... # Undocumented - def __init__(self, request: bytes, client_address: Tuple[str, int], - server: socketserver.BaseServer) -> None: ... + def __init__(self, request: bytes, client_address: Tuple[str, int], server: socketserver.BaseServer) -> None: ... def handle(self) -> None: ... def handle_one_request(self) -> None: ... def handle_expect_100(self) -> bool: ... - def send_error(self, code: int, message: Optional[str] = ..., - explain: Optional[str] = ...) -> None: ... - def send_response(self, code: int, - message: Optional[str] = ...) -> None: ... + def send_error(self, code: int, message: Optional[str] = ..., explain: Optional[str] = ...) -> None: ... + def send_response(self, code: int, message: Optional[str] = ...) -> None: ... def send_header(self, keyword: str, value: str) -> None: ... - def send_response_only(self, code: int, - message: Optional[str] = ...) -> None: ... + def send_response_only(self, code: int, message: Optional[str] = ...) -> None: ... def end_headers(self) -> None: ... def flush_headers(self) -> None: ... - def log_request(self, code: Union[int, str] = ..., - size: Union[int, str] = ...) -> None: ... + def log_request(self, code: Union[int, str] = ..., size: Union[int, str] = ...) -> None: ... def log_error(self, format: str, *args: Any) -> None: ... def log_message(self, format: str, *args: Any) -> None: ... def version_string(self) -> str: ... @@ -63,11 +55,15 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): extensions_map: Dict[str, str] if sys.version_info >= (3, 7): - def __init__(self, request: bytes, client_address: Tuple[str, int], - server: socketserver.BaseServer, directory: Optional[Union[str, _PathLike[str]]]) -> None: ... + def __init__( + self, + request: bytes, + client_address: Tuple[str, int], + server: socketserver.BaseServer, + directory: Optional[Union[str, _PathLike[str]]] = ..., + ) -> None: ... else: - def __init__(self, request: bytes, client_address: Tuple[str, int], - server: socketserver.BaseServer) -> None: ... + def __init__(self, request: bytes, client_address: Tuple[str, int], server: socketserver.BaseServer) -> None: ... def do_GET(self) -> None: ... def do_HEAD(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/abc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/abc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,16 @@ -from abc import ABCMeta, abstractmethod import os import sys import types -from typing import Any, IO, Iterator, Mapping, Optional, Sequence, Tuple, Union +from abc import ABCMeta, abstractmethod +from typing import IO, Any, Iterator, Mapping, Optional, Sequence, Tuple, Union # Loader is exported from this module, but for circular import reasons # exists in its own stub file (with ModuleSpec and ModuleType). -from _importlib_modulespec import Loader as Loader # Exported - -from _importlib_modulespec import ModuleSpec +from _importlib_modulespec import Loader as Loader, ModuleSpec # Exported _Path = Union[bytes, str] -class Finder(metaclass=ABCMeta): - ... - # Technically this class defines the following method, but its subclasses - # in this module violate its signature. Since this class is deprecated, it's - # easier to simply ignore that this method exists. - # @abstractmethod - # def find_module(self, fullname: str, - # path: Optional[Sequence[_Path]] = ...) -> Optional[Loader]: ... +class Finder(metaclass=ABCMeta): ... class ResourceLoader(Loader): @abstractmethod @@ -46,30 +37,20 @@ def get_source(self, fullname: str) -> Optional[str]: ... def path_stats(self, path: _Path) -> Mapping[str, Any]: ... - class MetaPathFinder(Finder): - def find_module(self, fullname: str, - path: Optional[Sequence[_Path]]) -> Optional[Loader]: - ... + def find_module(self, fullname: str, path: Optional[Sequence[_Path]]) -> Optional[Loader]: ... def invalidate_caches(self) -> None: ... # Not defined on the actual class, but expected to exist. def find_spec( - self, fullname: str, path: Optional[Sequence[_Path]], - target: Optional[types.ModuleType] = ... - ) -> Optional[ModuleSpec]: - ... + self, fullname: str, path: Optional[Sequence[_Path]], target: Optional[types.ModuleType] = ... + ) -> Optional[ModuleSpec]: ... class PathEntryFinder(Finder): def find_module(self, fullname: str) -> Optional[Loader]: ... - def find_loader( - self, fullname: str - ) -> Tuple[Optional[Loader], Sequence[_Path]]: ... + def find_loader(self, fullname: str) -> Tuple[Optional[Loader], Sequence[_Path]]: ... def invalidate_caches(self) -> None: ... # Not defined on the actual class, but expected to exist. - def find_spec( - self, fullname: str, - target: Optional[types.ModuleType] = ... - ) -> Optional[ModuleSpec]: ... + def find_spec(self, fullname: str, target: Optional[types.ModuleType] = ...) -> Optional[ModuleSpec]: ... class FileLoader(ResourceLoader, ExecutionLoader, metaclass=ABCMeta): name: str @@ -80,7 +61,6 @@ if sys.version_info >= (3, 7): _PathLike = Union[bytes, str, os.PathLike[Any]] - class ResourceReader(metaclass=ABCMeta): @abstractmethod def open_resource(self, resource: _PathLike) -> IO[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,15 @@ -from importlib.abc import Loader import types +from importlib.abc import Loader from typing import Any, Mapping, Optional, Sequence -def __import__(name: str, globals: Optional[Mapping[str, Any]] = ..., - locals: Optional[Mapping[str, Any]] = ..., - fromlist: Sequence[str] = ..., - level: int = ...) -> types.ModuleType: ... - +def __import__( + name: str, + globals: Optional[Mapping[str, Any]] = ..., + locals: Optional[Mapping[str, Any]] = ..., + fromlist: Sequence[str] = ..., + level: int = ..., +) -> types.ModuleType: ... def import_module(name: str, package: Optional[str] = ...) -> types.ModuleType: ... - def find_loader(name: str, path: Optional[str] = ...) -> Optional[Loader]: ... - def invalidate_caches() -> None: ... - def reload(module: types.ModuleType) -> types.ModuleType: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/machinery.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/machinery.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/machinery.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/machinery.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,19 @@ import importlib.abc import types -from typing import Any, Callable, List, Optional, Sequence, Tuple, Union +from typing import Callable, List, Optional, Sequence, Tuple, Union # ModuleSpec is exported from this module, but for circular import # reasons exists in its own stub file (with Loader and ModuleType). -from _importlib_modulespec import ModuleSpec as ModuleSpec, Loader # Exported +from _importlib_modulespec import Loader, ModuleSpec as ModuleSpec # Exported -class BuiltinImporter(importlib.abc.MetaPathFinder, - importlib.abc.InspectLoader): +class BuiltinImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader): # MetaPathFinder @classmethod - def find_module( - cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]] - ) -> Optional[importlib.abc.Loader]: - ... - @classmethod - def find_spec(cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]], - target: Optional[types.ModuleType] = ...) -> Optional[ModuleSpec]: - ... + def find_module(cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]]) -> Optional[importlib.abc.Loader]: ... + @classmethod + def find_spec( + cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]], target: Optional[types.ModuleType] = ... + ) -> Optional[ModuleSpec]: ... # InspectLoader @classmethod def is_package(cls, fullname: str) -> bool: ... @@ -40,16 +34,11 @@ class FrozenImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader): # MetaPathFinder @classmethod - def find_module( - cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]] - ) -> Optional[importlib.abc.Loader]: - ... - @classmethod - def find_spec(cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]], - target: Optional[types.ModuleType] = ...) -> Optional[ModuleSpec]: - ... + def find_module(cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]]) -> Optional[importlib.abc.Loader]: ... + @classmethod + def find_spec( + cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]], target: Optional[types.ModuleType] = ... + ) -> Optional[ModuleSpec]: ... # InspectLoader @classmethod def is_package(cls, fullname: str) -> bool: ... @@ -63,35 +52,27 @@ @staticmethod def module_repr(module: types.ModuleType) -> str: ... @classmethod - def create_module(cls, spec: ModuleSpec) -> Optional[types.ModuleType]: - ... + def create_module(cls, spec: ModuleSpec) -> Optional[types.ModuleType]: ... @staticmethod def exec_module(module: types.ModuleType) -> None: ... class WindowsRegistryFinder(importlib.abc.MetaPathFinder): @classmethod - def find_module( - cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]] - ) -> Optional[importlib.abc.Loader]: - ... - @classmethod - def find_spec(cls, fullname: str, - path: Optional[Sequence[importlib.abc._Path]], - target: Optional[types.ModuleType] = ...) -> Optional[ModuleSpec]: - ... + def find_module(cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]]) -> Optional[importlib.abc.Loader]: ... + @classmethod + def find_spec( + cls, fullname: str, path: Optional[Sequence[importlib.abc._Path]], target: Optional[types.ModuleType] = ... + ) -> Optional[ModuleSpec]: ... class PathFinder: @classmethod def invalidate_caches(cls) -> None: ... @classmethod - def find_spec(cls, fullname: str, - path: Optional[Sequence[Union[bytes, str]]] = ..., - target: Optional[types.ModuleType] = ...) -> Optional[ModuleSpec]: ... + def find_spec( + cls, fullname: str, path: Optional[Sequence[Union[bytes, str]]] = ..., target: Optional[types.ModuleType] = ... + ) -> Optional[ModuleSpec]: ... @classmethod - def find_module(cls, fullname: str, - path: Optional[Sequence[Union[bytes, str]]] = ...) -> Optional[Loader]: ... - + def find_module(cls, fullname: str, path: Optional[Sequence[Union[bytes, str]]] = ...) -> Optional[Loader]: ... SOURCE_SUFFIXES: List[str] DEBUG_BYTECODE_SUFFIXES: List[str] @@ -103,22 +84,14 @@ class FileFinder(importlib.abc.PathEntryFinder): path: str - def __init__( - self, path: str, - *loader_details: Tuple[importlib.abc.Loader, List[str]] - ) -> None: ... + def __init__(self, path: str, *loader_details: Tuple[importlib.abc.Loader, List[str]]) -> None: ... @classmethod def path_hook( cls, *loader_details: Tuple[importlib.abc.Loader, List[str]] ) -> Callable[[str], importlib.abc.PathEntryFinder]: ... -class SourceFileLoader(importlib.abc.FileLoader, - importlib.abc.SourceLoader): - ... - -class SourcelessFileLoader(importlib.abc.FileLoader, - importlib.abc.SourceLoader): - ... +class SourceFileLoader(importlib.abc.FileLoader, importlib.abc.SourceLoader): ... +class SourcelessFileLoader(importlib.abc.FileLoader, importlib.abc.SourceLoader): ... class ExtensionFileLoader(importlib.abc.ExecutionLoader): def get_filename(self, fullname: str) -> importlib.abc._Path: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/resources.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/resources.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/resources.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/resources.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,18 @@ import sys + # This is a >=3.7 module, so we conditionally include its source. if sys.version_info >= (3, 7): import os - from pathlib import Path from types import ModuleType - from typing import ContextManager, Iterator, Union, BinaryIO, TextIO + from typing import BinaryIO, ContextManager, Iterator, TextIO, Union Package = Union[str, ModuleType] Resource = Union[str, os.PathLike] - def open_binary(package: Package, resource: Resource) -> BinaryIO: ... - def open_text(package: Package, - resource: Resource, - encoding: str = ..., - errors: str = ...) -> TextIO: ... + def open_text(package: Package, resource: Resource, encoding: str = ..., errors: str = ...) -> TextIO: ... def read_binary(package: Package, resource: Resource) -> bytes: ... - def read_text(package: Package, - resource: Resource, - encoding: str = ..., - errors: str = ...) -> str: ... + def read_text(package: Package, resource: Resource, encoding: str = ..., errors: str = ...) -> str: ... def path(package: Package, resource: Resource) -> ContextManager[Path]: ... def is_resource(package: Package, name: str) -> bool: ... def contents(package: Package) -> Iterator[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/importlib/util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,48 +1,35 @@ import importlib.abc import importlib.machinery -import sys +import os import types from typing import Any, Callable, List, Optional, Union -def module_for_loader( - fxn: Callable[..., types.ModuleType] -) -> Callable[..., types.ModuleType]: ... -def set_loader( - fxn: Callable[..., types.ModuleType] -) -> Callable[..., types.ModuleType]: ... -def set_package( - fxn: Callable[..., types.ModuleType] -) -> Callable[..., types.ModuleType]: ... - +def module_for_loader(fxn: Callable[..., types.ModuleType]) -> Callable[..., types.ModuleType]: ... +def set_loader(fxn: Callable[..., types.ModuleType]) -> Callable[..., types.ModuleType]: ... +def set_package(fxn: Callable[..., types.ModuleType]) -> Callable[..., types.ModuleType]: ... def resolve_name(name: str, package: str) -> str: ... MAGIC_NUMBER: bytes -def cache_from_source(path: str, debug_override: Optional[bool] = ..., *, - optimization: Optional[Any] = ...) -> str: ... +def cache_from_source(path: str, debug_override: Optional[bool] = ..., *, optimization: Optional[Any] = ...) -> str: ... def source_from_cache(path: str) -> str: ... def decode_source(source_bytes: bytes) -> str: ... -def find_spec( - name: str, package: Optional[str] = ... -) -> Optional[importlib.machinery.ModuleSpec]: ... +def find_spec(name: str, package: Optional[str] = ...) -> Optional[importlib.machinery.ModuleSpec]: ... def spec_from_loader( - name: str, loader: Optional[importlib.abc.Loader], *, - origin: Optional[str] = ..., loader_state: Optional[Any] = ..., - is_package: Optional[bool] = ... + name: str, + loader: Optional[importlib.abc.Loader], + *, + origin: Optional[str] = ..., + loader_state: Optional[Any] = ..., + is_package: Optional[bool] = ..., ) -> importlib.machinery.ModuleSpec: ... - -if sys.version_info >= (3, 6): - import os - _Path = Union[str, bytes, os.PathLike] -else: - _Path = str - def spec_from_file_location( - name: str, location: _Path, *, + name: str, + location: Union[str, bytes, os.PathLike], + *, loader: Optional[importlib.abc.Loader] = ..., - submodule_search_locations: Optional[List[str]] = ... + submodule_search_locations: Optional[List[str]] = ..., ) -> importlib.machinery.ModuleSpec: ... - def module_from_spec(spec: importlib.machinery.ModuleSpec) -> types.ModuleType: ... class LazyLoader(importlib.abc.Loader): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_importlib_modulespec.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_importlib_modulespec.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_importlib_modulespec.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_importlib_modulespec.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -14,9 +14,15 @@ def load_module(self, fullname: str) -> ModuleType: ... class ModuleSpec: - def __init__(self, name: str, loader: Optional[Loader], *, - origin: Optional[str] = ..., loader_state: Any = ..., - is_package: Optional[bool] = ...) -> None: ... + def __init__( + self, + name: str, + loader: Optional[Loader], + *, + origin: Optional[str] = ..., + loader_state: Any = ..., + is_package: Optional[bool] = ..., + ) -> None: ... name: str loader: Optional[_Loader] origin: Optional[str] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_imp.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_imp.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_imp.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_imp.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,9 @@ -# Stubs for _imp (Python 3.6) - import types +from importlib.machinery import ModuleSpec from typing import Any, List -from importlib.machinery import ModuleSpec def create_builtin(__spec: ModuleSpec) -> types.ModuleType: ... def create_dynamic(__spec: ModuleSpec, __file: Any = ...) -> None: ... - def acquire_lock() -> None: ... def exec_builtin(__mod: types.ModuleType) -> int: ... def exec_dynamic(__mod: types.ModuleType) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/inspect.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/inspect.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/inspect.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/inspect.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,24 @@ -import sys import enum -from typing import (AbstractSet, Any, Callable, Dict, Generator, List, Mapping, - NamedTuple, Optional, Sequence, Tuple, Type, Union, - ) -from types import (CodeType, FrameType, FunctionType, MethodType, ModuleType, - TracebackType, - ) +import sys from collections import OrderedDict +from types import CodeType, FrameType, FunctionType, MethodType, ModuleType, TracebackType +from typing import ( + AbstractSet, + Any, + Callable, + ClassVar, + Dict, + Generator, + List, + Mapping, + NamedTuple, + Optional, + Sequence, + Tuple, + Type, + Union, +) +from typing_extensions import Literal # # Types and members @@ -21,8 +33,7 @@ indecorator: bool decoratorhasargs: bool last: int - def tokeneater(self, type: int, token: str, srowcol: Tuple[int, int], - erowcol: Tuple[int, int], line: str) -> None: ... + def tokeneater(self, type: int, token: str, srowcol: Tuple[int, int], erowcol: Tuple[int, int], line: str) -> None: ... CO_OPTIMIZED: int CO_NEWLOCALS: int @@ -33,36 +44,35 @@ CO_NOFREE: int CO_COROUTINE: int CO_ITERABLE_COROUTINE: int -if sys.version_info >= (3, 6): - CO_ASYNC_GENERATOR: int +CO_ASYNC_GENERATOR: int TPFLAGS_IS_ABSTRACT: int -if sys.version_info < (3, 6): - class ModuleInfo(NamedTuple): - name: str - suffix: str - mode: str - module_type: int - def getmoduleinfo(path: str) -> Optional[ModuleInfo]: ... - -def getmembers(object: object, - predicate: Optional[Callable[[Any], bool]] = ..., - ) -> List[Tuple[str, Any]]: ... +def getmembers(object: object, predicate: Optional[Callable[[Any], bool]] = ...) -> List[Tuple[str, Any]]: ... def getmodulename(path: str) -> Optional[str]: ... - def ismodule(object: object) -> bool: ... def isclass(object: object) -> bool: ... def ismethod(object: object) -> bool: ... def isfunction(object: object) -> bool: ... -def isgeneratorfunction(object: object) -> bool: ... -def isgenerator(object: object) -> bool: ... -def iscoroutinefunction(object: object) -> bool: ... +if sys.version_info >= (3, 8): + def isgeneratorfunction(obj: object) -> bool: ... + def iscoroutinefunction(obj: object) -> bool: ... + +else: + def isgeneratorfunction(object: object) -> bool: ... + def iscoroutinefunction(object: object) -> bool: ... + +def isgenerator(object: object) -> bool: ... def iscoroutine(object: object) -> bool: ... def isawaitable(object: object) -> bool: ... -if sys.version_info >= (3, 6): + +if sys.version_info >= (3, 8): + def isasyncgenfunction(obj: object) -> bool: ... + +else: def isasyncgenfunction(object: object) -> bool: ... - def isasyncgen(object: object) -> bool: ... + +def isasyncgen(object: object) -> bool: ... def istraceback(object: object) -> bool: ... def isframe(object: object) -> bool: ... def iscode(object: object) -> bool: ... @@ -74,38 +84,31 @@ def isgetsetdescriptor(object: object) -> bool: ... def ismemberdescriptor(object: object) -> bool: ... - # # Retrieving source code # _SourceObjectType = Union[ModuleType, Type[Any], MethodType, FunctionType, TracebackType, FrameType, CodeType, Callable[..., Any]] def findsource(object: _SourceObjectType) -> Tuple[List[str], int]: ... -def getabsfile(object: _SourceObjectType) -> str: ... +def getabsfile(object: _SourceObjectType, _filename: Optional[str] = ...) -> str: ... def getblock(lines: Sequence[str]) -> Sequence[str]: ... def getdoc(object: object) -> Optional[str]: ... def getcomments(object: object) -> Optional[str]: ... def getfile(object: _SourceObjectType) -> str: ... -def getmodule(object: object) -> Optional[ModuleType]: ... +def getmodule(object: object, _filename: Optional[str] = ...) -> Optional[ModuleType]: ... def getsourcefile(object: _SourceObjectType) -> Optional[str]: ... def getsourcelines(object: _SourceObjectType) -> Tuple[List[str], int]: ... def getsource(object: _SourceObjectType) -> str: ... def cleandoc(doc: str) -> str: ... def indentsize(line: str) -> int: ... - # # Introspecting callables with the Signature object # -def signature(obj: Callable[..., Any], - *, - follow_wrapped: bool = ...) -> Signature: ... +def signature(obj: Callable[..., Any], *, follow_wrapped: bool = ...) -> Signature: ... class Signature: - def __init__(self, - parameters: Optional[Sequence[Parameter]] = ..., - *, - return_annotation: Any = ...) -> None: ... + def __init__(self, parameters: Optional[Sequence[Parameter]] = ..., *, return_annotation: Any = ...) -> None: ... # TODO: can we be more specific here? empty: object = ... @@ -113,57 +116,48 @@ # TODO: can we be more specific here? return_annotation: Any - def bind(self, *args: Any, **kwargs: Any) -> BoundArguments: ... def bind_partial(self, *args: Any, **kwargs: Any) -> BoundArguments: ... - def replace(self, - *, - parameters: Optional[Sequence[Parameter]] = ..., - return_annotation: Any = ...) -> Signature: ... - + def replace(self, *, parameters: Optional[Sequence[Parameter]] = ..., return_annotation: Any = ...) -> Signature: ... @classmethod def from_callable(cls, obj: Callable[..., Any], *, follow_wrapped: bool = ...) -> Signature: ... # The name is the same as the enum's name in CPython class _ParameterKind(enum.IntEnum): + POSITIONAL_ONLY: int + POSITIONAL_OR_KEYWORD: int + VAR_POSITIONAL: int + KEYWORD_ONLY: int + VAR_KEYWORD: int + if sys.version_info >= (3, 8): description: str class Parameter: - def __init__(self, - name: str, - kind: _ParameterKind, - *, - default: Any = ..., - annotation: Any = ...) -> None: ... + def __init__(self, name: str, kind: _ParameterKind, *, default: Any = ..., annotation: Any = ...) -> None: ... empty: Any = ... name: str default: Any annotation: Any kind: _ParameterKind - POSITIONAL_ONLY: _ParameterKind = ... - POSITIONAL_OR_KEYWORD: _ParameterKind = ... - VAR_POSITIONAL: _ParameterKind = ... - KEYWORD_ONLY: _ParameterKind = ... - VAR_KEYWORD: _ParameterKind = ... - - def replace(self, - *, - name: Optional[str] = ..., - kind: Optional[_ParameterKind] = ..., - default: Any = ..., - annotation: Any = ...) -> Parameter: ... + POSITIONAL_ONLY: ClassVar[Literal[_ParameterKind.POSITIONAL_ONLY]] + POSITIONAL_OR_KEYWORD: ClassVar[Literal[_ParameterKind.POSITIONAL_OR_KEYWORD]] + VAR_POSITIONAL: ClassVar[Literal[_ParameterKind.VAR_POSITIONAL]] + KEYWORD_ONLY: ClassVar[Literal[_ParameterKind.KEYWORD_ONLY]] + VAR_KEYWORD: ClassVar[Literal[_ParameterKind.VAR_KEYWORD]] + def replace( + self, *, name: Optional[str] = ..., kind: Optional[_ParameterKind] = ..., default: Any = ..., annotation: Any = ... + ) -> Parameter: ... class BoundArguments: arguments: OrderedDict[str, Any] args: Tuple[Any, ...] kwargs: Dict[str, Any] signature: Signature - + def __init__(self, signature: Signature, arguments: OrderedDict[str, Any]) -> None: ... def apply_defaults(self) -> None: ... - # # Classes and functions # @@ -207,46 +201,42 @@ def getargvalues(frame: FrameType) -> ArgInfo: ... def formatannotation(annotation: object, base_module: Optional[str] = ...) -> str: ... def formatannotationrelativeto(object: object) -> Callable[[object], str]: ... -def formatargspec(args: List[str], - varargs: Optional[str] = ..., - varkw: Optional[str] = ..., - defaults: Optional[Tuple[Any, ...]] = ..., - kwonlyargs: Optional[Sequence[str]] = ..., - kwonlydefaults: Optional[Dict[str, Any]] = ..., - annotations: Dict[str, Any] = ..., - formatarg: Callable[[str], str] = ..., - formatvarargs: Callable[[str], str] = ..., - formatvarkw: Callable[[str], str] = ..., - formatvalue: Callable[[Any], str] = ..., - formatreturns: Callable[[Any], str] = ..., - formatannotation: Callable[[Any], str] = ..., - ) -> str: ... -def formatargvalues(args: List[str], - varargs: Optional[str], - varkw: Optional[str], - locals: Optional[Dict[str, Any]], - formatarg: Optional[Callable[[str], str]] = ..., - formatvarargs: Optional[Callable[[str], str]] = ..., - formatvarkw: Optional[Callable[[str], str]] = ..., - formatvalue: Optional[Callable[[Any], str]] = ..., - ) -> str: ... +def formatargspec( + args: List[str], + varargs: Optional[str] = ..., + varkw: Optional[str] = ..., + defaults: Optional[Tuple[Any, ...]] = ..., + kwonlyargs: Optional[Sequence[str]] = ..., + kwonlydefaults: Optional[Dict[str, Any]] = ..., + annotations: Dict[str, Any] = ..., + formatarg: Callable[[str], str] = ..., + formatvarargs: Callable[[str], str] = ..., + formatvarkw: Callable[[str], str] = ..., + formatvalue: Callable[[Any], str] = ..., + formatreturns: Callable[[Any], str] = ..., + formatannotation: Callable[[Any], str] = ..., +) -> str: ... +def formatargvalues( + args: List[str], + varargs: Optional[str], + varkw: Optional[str], + locals: Optional[Dict[str, Any]], + formatarg: Optional[Callable[[str], str]] = ..., + formatvarargs: Optional[Callable[[str], str]] = ..., + formatvarkw: Optional[Callable[[str], str]] = ..., + formatvalue: Optional[Callable[[Any], str]] = ..., +) -> str: ... def getmro(cls: type) -> Tuple[type, ...]: ... - -def getcallargs(__func: Callable[..., Any], - *args: Any, - **kwds: Any) -> Dict[str, Any]: ... +def getcallargs(__func: Callable[..., Any], *args: Any, **kwds: Any) -> Dict[str, Any]: ... class ClosureVars(NamedTuple): nonlocals: Mapping[str, Any] globals: Mapping[str, Any] builtins: Mapping[str, Any] unbound: AbstractSet[str] -def getclosurevars(func: Callable[..., Any]) -> ClosureVars: ... - -def unwrap(func: Callable[..., Any], - *, - stop: Optional[Callable[[Any], Any]] = ...) -> Any: ... +def getclosurevars(func: Callable[..., Any]) -> ClosureVars: ... +def unwrap(func: Callable[..., Any], *, stop: Optional[Callable[[Any], Any]] = ...) -> Any: ... # # The interpreter stack @@ -281,7 +271,6 @@ def getattr_static(obj: object, attr: str, default: Optional[Any] = ...) -> Any: ... - # # Current State of Generators and Coroutines # @@ -293,6 +282,7 @@ GEN_RUNNING: str GEN_SUSPENDED: str GEN_CLOSED: str + def getgeneratorstate(generator: Generator[Any, Any, Any]) -> str: ... CORO_CREATED: str @@ -301,7 +291,6 @@ CORO_CLOSED: str # TODO can we be more specific than "object"? def getcoroutinestate(coroutine: object) -> str: ... - def getgeneratorlocals(generator: Generator[Any, Any, Any]) -> Dict[str, Any]: ... # TODO can we be more specific than "object"? diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/io.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/io.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/io.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/io.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,13 +1,9 @@ -from typing import ( - List, BinaryIO, TextIO, Iterator, Union, Optional, Callable, Tuple, Type, Any, IO, Iterable, TypeVar -) import builtins import codecs import sys -from mmap import mmap +from _typeshed import ReadableBuffer, WriteableBuffer from types import TracebackType - -_bytearray_like = Union[bytearray, mmap] +from typing import IO, Any, BinaryIO, Callable, Iterable, Iterator, List, Optional, TextIO, Tuple, Type, TypeVar, Union DEFAULT_BUFFER_SIZE: int @@ -15,7 +11,7 @@ SEEK_CUR: int SEEK_END: int -_T = TypeVar('_T', bound=IOBase) +_T = TypeVar("_T", bound=IOBase) open = builtins.open @@ -23,14 +19,16 @@ def open_code(path: str) -> IO[bytes]: ... BlockingIOError = builtins.BlockingIOError + class UnsupportedOperation(OSError, ValueError): ... class IOBase: def __iter__(self) -> Iterator[bytes]: ... def __next__(self) -> bytes: ... def __enter__(self: _T) -> _T: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... def close(self) -> None: ... def fileno(self) -> int: ... def flush(self) -> None: ... @@ -42,7 +40,7 @@ def tell(self) -> int: ... def truncate(self, __size: Optional[int] = ...) -> int: ... def writable(self) -> bool: ... - def writelines(self, __lines: Iterable[Union[bytes, bytearray]]) -> None: ... + def writelines(self, __lines: Iterable[ReadableBuffer]) -> None: ... def readline(self, __size: Optional[int] = ...) -> bytes: ... def __del__(self) -> None: ... @property @@ -51,16 +49,16 @@ class RawIOBase(IOBase): def readall(self) -> bytes: ... - def readinto(self, __buffer: bytearray) -> Optional[int]: ... - def write(self, __b: Union[bytes, bytearray]) -> Optional[int]: ... + def readinto(self, __buffer: WriteableBuffer) -> Optional[int]: ... + def write(self, __b: ReadableBuffer) -> Optional[int]: ... def read(self, __size: int = ...) -> Optional[bytes]: ... class BufferedIOBase(IOBase): raw: RawIOBase # This is not part of the BufferedIOBase API and may not exist on some implementations. def detach(self) -> RawIOBase: ... - def readinto(self, __buffer: _bytearray_like) -> int: ... - def write(self, __buffer: Union[bytes, bytearray]) -> int: ... - def readinto1(self, __buffer: _bytearray_like) -> int: ... + def readinto(self, __buffer: WriteableBuffer) -> int: ... + def write(self, __buffer: ReadableBuffer) -> int: ... + def readinto1(self, __buffer: WriteableBuffer) -> int: ... def read(self, __size: Optional[int] = ...) -> bytes: ... def read1(self, __size: int = ...) -> bytes: ... @@ -73,9 +71,11 @@ file: Union[str, bytes, int], mode: str = ..., closefd: bool = ..., - opener: Optional[Callable[[Union[int, str], str], int]] = ... + opener: Optional[Callable[[Union[int, str], str], int]] = ..., ) -> None: ... - def write(self, __b: bytes) -> int: ... + @property + def closefd(self) -> bool: ... + def write(self, __b: ReadableBuffer) -> int: ... def read(self, __size: int = ...) -> bytes: ... def __enter__(self: _T) -> _T: ... @@ -105,7 +105,7 @@ class BufferedWriter(BufferedIOBase, BinaryIO): def __enter__(self: _T) -> _T: ... def __init__(self, raw: RawIOBase, buffer_size: int = ...) -> None: ... - def write(self, __buffer: Union[bytes, bytearray]) -> int: ... + def write(self, __buffer: ReadableBuffer) -> int: ... class BufferedRandom(BufferedReader, BufferedWriter): def __enter__(self: _T) -> _T: ... @@ -117,9 +117,8 @@ def read1(self, __size: int) -> bytes: ... # type: ignore class BufferedRWPair(BufferedIOBase): - def __init__(self, reader: RawIOBase, writer: RawIOBase, - buffer_size: int = ...) -> None: ... - + def __init__(self, reader: RawIOBase, writer: RawIOBase, buffer_size: int = ...) -> None: ... + def peek(self, __size: int = ...) -> bytes: ... class TextIOBase(IOBase): encoding: str @@ -129,14 +128,13 @@ def __next__(self) -> str: ... # type: ignore def detach(self) -> BinaryIO: ... def write(self, __s: str) -> int: ... - def writelines(self, __lines: List[str]) -> None: ... # type: ignore + def writelines(self, __lines: Iterable[str]) -> None: ... # type: ignore def readline(self, __size: int = ...) -> str: ... # type: ignore def readlines(self, __hint: int = ...) -> List[str]: ... # type: ignore def read(self, __size: Optional[int] = ...) -> str: ... def tell(self) -> int: ... class TextIOWrapper(TextIOBase, TextIO): - line_buffering: bool def __init__( self, buffer: IO[bytes], @@ -144,11 +142,17 @@ errors: Optional[str] = ..., newline: Optional[str] = ..., line_buffering: bool = ..., - write_through: bool = ... + write_through: bool = ..., ) -> None: ... @property def buffer(self) -> BinaryIO: ... + @property + def closed(self) -> bool: ... + @property + def line_buffering(self) -> bool: ... if sys.version_info >= (3, 7): + @property + def write_through(self) -> bool: ... def reconfigure( self, *, @@ -156,21 +160,19 @@ errors: Optional[str] = ..., newline: Optional[str] = ..., line_buffering: Optional[bool] = ..., - write_through: Optional[bool] = ... + write_through: Optional[bool] = ..., ) -> None: ... - closed: bool # These are inherited from TextIOBase, but must exist in the stub to satisfy mypy. def __enter__(self: _T) -> _T: ... def __iter__(self) -> Iterator[str]: ... # type: ignore def __next__(self) -> str: ... # type: ignore - def writelines(self, __lines: List[str]) -> None: ... # type: ignore + def writelines(self, __lines: Iterable[str]) -> None: ... # type: ignore def readline(self, __size: int = ...) -> str: ... # type: ignore def readlines(self, __hint: int = ...) -> List[str]: ... # type: ignore def seek(self, __cookie: int, __whence: int = ...) -> int: ... class StringIO(TextIOWrapper): - def __init__(self, initial_value: Optional[str] = ..., - newline: Optional[str] = ...) -> None: ... + def __init__(self, initial_value: Optional[str] = ..., newline: Optional[str] = ...) -> None: ... # StringIO does not contain a "name" field. This workaround is necessary # to allow StringIO sub-classes to add this field, as it is defined # as a read-only property on IO[]. @@ -178,6 +180,7 @@ def getvalue(self) -> str: ... class IncrementalNewlineDecoder(codecs.IncrementalDecoder): - def __init__(self, decoder: Optional[codecs.IncrementalDecoder], - translate: bool, errors: str = ...) -> None: ... + def __init__(self, decoder: Optional[codecs.IncrementalDecoder], translate: bool, errors: str = ...) -> None: ... def decode(self, input: Union[bytes, str], final: bool = ...) -> str: ... + @property + def newlines(self) -> Optional[Union[str, Tuple[str, ...]]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ipaddress.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ipaddress.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ipaddress.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ipaddress.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,5 @@ -from typing import (Any, Container, Generic, Iterable, Iterator, Optional, - overload, SupportsInt, Text, Tuple, TypeVar) - import sys +from typing import Any, Container, Generic, Iterable, Iterator, Optional, SupportsInt, Tuple, TypeVar, overload # Undocumented length constants IPV4LENGTH: int @@ -23,11 +21,11 @@ def __lt__(self: _T, other: _T) -> bool: ... def __ne__(self, other: Any) -> bool: ... @property - def compressed(self) -> Text: ... + def compressed(self) -> str: ... @property - def exploded(self) -> Text: ... + def exploded(self) -> str: ... @property - def reverse_pointer(self) -> Text: ... + def reverse_pointer(self) -> str: ... @property def version(self) -> int: ... @@ -86,7 +84,7 @@ def max_prefixlen(self) -> int: ... @property def num_addresses(self) -> int: ... - def overlaps(self, other: _BaseNetwork) -> bool: ... + def overlaps(self, other: _BaseNetwork[_A]) -> bool: ... @property def prefixlen(self) -> int: ... if sys.version_info >= (3, 7): @@ -95,11 +93,11 @@ def subnets(self: _T, prefixlen_diff: int = ..., new_prefix: Optional[int] = ...) -> Iterator[_T]: ... def supernet(self: _T, prefixlen_diff: int = ..., new_prefix: Optional[int] = ...) -> _T: ... @property - def with_hostmask(self) -> Text: ... + def with_hostmask(self) -> str: ... @property - def with_netmask(self) -> Text: ... + def with_netmask(self) -> str: ... @property - def with_prefixlen(self) -> Text: ... + def with_prefixlen(self) -> str: ... @property def hostmask(self) -> _A: ... @@ -110,11 +108,11 @@ @property def ip(self) -> _A: ... @property - def with_hostmask(self) -> Text: ... + def with_hostmask(self) -> str: ... @property - def with_netmask(self) -> Text: ... + def with_netmask(self) -> str: ... @property - def with_prefixlen(self) -> Text: ... + def with_prefixlen(self) -> str: ... class IPv4Address(_BaseAddress): ... class IPv4Network(_BaseNetwork[IPv4Address]): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/itertools.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/itertools.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/itertools.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/itertools.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,13 @@ -# Stubs for itertools - -# Based on http://docs.python.org/3.2/library/itertools.html - -from typing import (Iterator, TypeVar, Iterable, overload, Any, Callable, Tuple, - Generic, Optional) import sys +from typing import Any, Callable, Generic, Iterable, Iterator, Optional, Tuple, TypeVar, overload +from typing_extensions import Literal -_T = TypeVar('_T') -_S = TypeVar('_S') -_N = TypeVar('_N', int, float) +_T = TypeVar("_T") +_S = TypeVar("_S") +_N = TypeVar("_N", int, float) Predicate = Callable[[_T], object] -def count(start: _N = ..., - step: _N = ...) -> Iterator[_N]: ... # more general types? +def count(start: _N = ..., step: _N = ...) -> Iterator[_N]: ... # more general types? class cycle(Iterator[_T], Generic[_T]): def __init__(self, iterable: Iterable[_T]) -> None: ... @@ -26,15 +21,12 @@ if sys.version_info >= (3, 8): @overload - def accumulate(iterable: Iterable[_T], - func: Callable[[_T, _T], _T] = ...) -> Iterator[_T]: ... + def accumulate(iterable: Iterable[_T], func: Callable[[_T, _T], _T] = ...) -> Iterator[_T]: ... @overload - def accumulate(iterable: Iterable[_T], - func: Callable[[_S, _T], _S], - initial: Optional[_S]) -> Iterator[_S]: ... + def accumulate(iterable: Iterable[_T], func: Callable[[_S, _T], _S], initial: Optional[_S]) -> Iterator[_S]: ... + else: - def accumulate(iterable: Iterable[_T], - func: Callable[[_T, _T], _T] = ...) -> Iterator[_T]: ... + def accumulate(iterable: Iterable[_T], func: Callable[[_T, _T], _T] = ...) -> Iterator[_T]: ... class chain(Iterator[_T], Generic[_T]): def __init__(self, *iterables: Iterable[_T]) -> None: ... @@ -44,78 +36,72 @@ def from_iterable(iterable: Iterable[Iterable[_S]]) -> Iterator[_S]: ... def compress(data: Iterable[_T], selectors: Iterable[Any]) -> Iterator[_T]: ... -def dropwhile(predicate: Predicate[_T], - iterable: Iterable[_T]) -> Iterator[_T]: ... -def filterfalse(predicate: Optional[Predicate[_T]], - iterable: Iterable[_T]) -> Iterator[_T]: ... - +def dropwhile(predicate: Predicate[_T], iterable: Iterable[_T]) -> Iterator[_T]: ... +def filterfalse(predicate: Optional[Predicate[_T]], iterable: Iterable[_T]) -> Iterator[_T]: ... @overload def groupby(iterable: Iterable[_T], key: None = ...) -> Iterator[Tuple[_T, Iterator[_T]]]: ... @overload def groupby(iterable: Iterable[_T], key: Callable[[_T], _S]) -> Iterator[Tuple[_S, Iterator[_T]]]: ... - @overload def islice(iterable: Iterable[_T], stop: Optional[int]) -> Iterator[_T]: ... @overload -def islice(iterable: Iterable[_T], start: Optional[int], stop: Optional[int], - step: Optional[int] = ...) -> Iterator[_T]: ... - +def islice(iterable: Iterable[_T], start: Optional[int], stop: Optional[int], step: Optional[int] = ...) -> Iterator[_T]: ... def starmap(func: Callable[..., _S], iterable: Iterable[Iterable[Any]]) -> Iterator[_S]: ... -def takewhile(predicate: Predicate[_T], - iterable: Iterable[_T]) -> Iterator[_T]: ... +def takewhile(predicate: Predicate[_T], iterable: Iterable[_T]) -> Iterator[_T]: ... def tee(iterable: Iterable[_T], n: int = ...) -> Tuple[Iterator[_T], ...]: ... -def zip_longest(*p: Iterable[Any], - fillvalue: Any = ...) -> Iterator[Any]: ... - -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_T3 = TypeVar('_T3') -_T4 = TypeVar('_T4') -_T5 = TypeVar('_T5') -_T6 = TypeVar('_T6') +def zip_longest(*p: Iterable[Any], fillvalue: Any = ...) -> Iterator[Any]: ... +_T1 = TypeVar("_T1") +_T2 = TypeVar("_T2") +_T3 = TypeVar("_T3") +_T4 = TypeVar("_T4") +_T5 = TypeVar("_T5") +_T6 = TypeVar("_T6") @overload def product(iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ... @overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... +def product(iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ... @overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4], - iter5: Iterable[_T5]) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... -@overload -def product(iter1: Iterable[_T1], - iter2: Iterable[_T2], - iter3: Iterable[_T3], - iter4: Iterable[_T4], - iter5: Iterable[_T5], - iter6: Iterable[_T6]) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ... -@overload -def product(iter1: Iterable[Any], - iter2: Iterable[Any], - iter3: Iterable[Any], - iter4: Iterable[Any], - iter5: Iterable[Any], - iter6: Iterable[Any], - iter7: Iterable[Any], - *iterables: Iterable[Any]) -> Iterator[Tuple[Any, ...]]: ... +def product(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ... +@overload +def product( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ... +@overload +def product( + iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4], iter5: Iterable[_T5] +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ... +@overload +def product( + iter1: Iterable[_T1], + iter2: Iterable[_T2], + iter3: Iterable[_T3], + iter4: Iterable[_T4], + iter5: Iterable[_T5], + iter6: Iterable[_T6], +) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ... +@overload +def product( + iter1: Iterable[Any], + iter2: Iterable[Any], + iter3: Iterable[Any], + iter4: Iterable[Any], + iter5: Iterable[Any], + iter6: Iterable[Any], + iter7: Iterable[Any], + *iterables: Iterable[Any], +) -> Iterator[Tuple[Any, ...]]: ... @overload def product(*iterables: Iterable[Any], repeat: int = ...) -> Iterator[Tuple[Any, ...]]: ... - -def permutations(iterable: Iterable[_T], - r: Optional[int] = ...) -> Iterator[Tuple[_T, ...]]: ... -def combinations(iterable: Iterable[_T], - r: int) -> Iterator[Tuple[_T, ...]]: ... -def combinations_with_replacement(iterable: Iterable[_T], - r: int) -> Iterator[Tuple[_T, ...]]: ... +def permutations(iterable: Iterable[_T], r: Optional[int] = ...) -> Iterator[Tuple[_T, ...]]: ... +@overload +def combinations(iterable: Iterable[_T], r: Literal[2]) -> Iterator[Tuple[_T, _T]]: ... +@overload +def combinations(iterable: Iterable[_T], r: Literal[3]) -> Iterator[Tuple[_T, _T, _T]]: ... +@overload +def combinations(iterable: Iterable[_T], r: Literal[4]) -> Iterator[Tuple[_T, _T, _T, _T]]: ... +@overload +def combinations(iterable: Iterable[_T], r: Literal[5]) -> Iterator[Tuple[_T, _T, _T, _T, _T]]: ... +@overload +def combinations(iterable: Iterable[_T], r: int) -> Iterator[Tuple[_T, ...]]: ... +def combinations_with_replacement(iterable: Iterable[_T], r: int) -> Iterator[Tuple[_T, ...]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/decoder.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/decoder.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/decoder.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/decoder.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ -import sys from typing import Any, Callable, Dict, List, Optional, Tuple class JSONDecodeError(ValueError): @@ -13,30 +12,18 @@ object_hook: Callable[[Dict[str, Any]], Any] parse_float: Callable[[str], Any] parse_int: Callable[[str], Any] - parse_constant = ... # Callable[[str], Any] + parse_constant: Callable[[str], Any] = ... strict: bool object_pairs_hook: Callable[[List[Tuple[str, Any]]], Any] - - if sys.version_info >= (3, 6): - def __init__( - self, - *, - object_hook: Optional[Callable[[Dict[str, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - strict: bool = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[str, Any]]], Any]] = ... - ) -> None: ... - else: - def __init__( - self, - object_hook: Optional[Callable[[Dict[str, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - strict: bool = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[str, Any]]], Any]] = ..., - ) -> None: ... + def __init__( + self, + *, + object_hook: Optional[Callable[[Dict[str, Any]], Any]] = ..., + parse_float: Optional[Callable[[str], Any]] = ..., + parse_int: Optional[Callable[[str], Any]] = ..., + parse_constant: Optional[Callable[[str], Any]] = ..., + strict: bool = ..., + object_pairs_hook: Optional[Callable[[List[Tuple[str, Any]]], Any]] = ..., + ) -> None: ... def decode(self, s: str, _w: Callable[..., Any] = ...) -> Any: ... # _w is undocumented def raw_decode(self, s: str, idx: int = ...) -> Tuple[Any, int]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/encoder.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/encoder.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/encoder.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/encoder.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ -import sys from typing import Any, Callable, Iterator, Optional, Tuple class JSONEncoder: @@ -11,32 +10,18 @@ allow_nan: bool sort_keys: bool indent: int - - if sys.version_info >= (3, 6): - def __init__( - self, - *, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - sort_keys: bool = ..., - indent: Optional[int] = ..., - separators: Optional[Tuple[str, str]] = ..., - default: Optional[Callable[..., Any]] = ... - ) -> None: ... - else: - def __init__( - self, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - sort_keys: bool = ..., - indent: Optional[int] = ..., - separators: Optional[Tuple[str, str]] = ..., - default: Optional[Callable[..., Any]] = ..., - ) -> None: ... + def __init__( + self, + *, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + sort_keys: bool = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + default: Optional[Callable[..., Any]] = ..., + ) -> None: ... def default(self, o: Any) -> Any: ... def encode(self, o: Any) -> str: ... def iterencode(self, o: Any, _one_shot: bool = ...) -> Iterator[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,58 +1,57 @@ -import sys -from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union, Type from _typeshed import SupportsRead +from typing import IO, Any, Callable, Dict, List, Optional, Tuple, Type, Union -from .decoder import JSONDecoder as JSONDecoder +from .decoder import JSONDecodeError as JSONDecodeError, JSONDecoder as JSONDecoder from .encoder import JSONEncoder as JSONEncoder -from .decoder import JSONDecodeError as JSONDecodeError -def dumps(obj: Any, - *, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - cls: Optional[Type[JSONEncoder]] = ..., - indent: Union[None, int, str] = ..., - separators: Optional[Tuple[str, str]] = ..., - default: Optional[Callable[[Any], Any]] = ..., - sort_keys: bool = ..., - **kwds: Any) -> str: ... - -def dump(obj: Any, - fp: IO[str], - *, - skipkeys: bool = ..., - ensure_ascii: bool = ..., - check_circular: bool = ..., - allow_nan: bool = ..., - cls: Optional[Type[JSONEncoder]] = ..., - indent: Union[None, int, str] = ..., - separators: Optional[Tuple[str, str]] = ..., - default: Optional[Callable[[Any], Any]] = ..., - sort_keys: bool = ..., - **kwds: Any) -> None: ... - -if sys.version_info >= (3, 6): - _LoadsString = Union[str, bytes] -else: - _LoadsString = str -def loads(s: _LoadsString, - *, - cls: Optional[Type[JSONDecoder]] = ..., - object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., - **kwds: Any) -> Any: ... - -def load(fp: SupportsRead[_LoadsString], - *, - cls: Optional[Type[JSONDecoder]] = ..., - object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., - parse_float: Optional[Callable[[str], Any]] = ..., - parse_int: Optional[Callable[[str], Any]] = ..., - parse_constant: Optional[Callable[[str], Any]] = ..., - object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., - **kwds: Any) -> Any: ... +def dumps( + obj: Any, + *, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Optional[Type[JSONEncoder]] = ..., + indent: Union[None, int, str] = ..., + separators: Optional[Tuple[str, str]] = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any, +) -> str: ... +def dump( + obj: Any, + fp: IO[str], + *, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Optional[Type[JSONEncoder]] = ..., + indent: Union[None, int, str] = ..., + separators: Optional[Tuple[str, str]] = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any, +) -> None: ... +def loads( + s: Union[str, bytes], + *, + cls: Optional[Type[JSONDecoder]] = ..., + object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., + parse_float: Optional[Callable[[str], Any]] = ..., + parse_int: Optional[Callable[[str], Any]] = ..., + parse_constant: Optional[Callable[[str], Any]] = ..., + object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., + **kwds: Any, +) -> Any: ... +def load( + fp: SupportsRead[Union[str, bytes]], + *, + cls: Optional[Type[JSONDecoder]] = ..., + object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ..., + parse_float: Optional[Callable[[str], Any]] = ..., + parse_int: Optional[Callable[[str], Any]] = ..., + parse_constant: Optional[Callable[[str], Any]] = ..., + object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ..., + **kwds: Any, +) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/tool.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/tool.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/json/tool.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/json/tool.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +def main() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_json.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_json.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_json.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_json.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,6 +1,4 @@ -"""Stub file for the '_json' module.""" - -from typing import Any, Tuple, Optional, Dict, Callable +from typing import Any, Callable, Dict, Optional, Tuple class make_encoder: sort_keys: Any @@ -11,9 +9,18 @@ default: Any encoder: Any item_separator: Any - def __init__(self, markers: Optional[Dict[int, Any]], default: Callable[[Any], Any], encoder: Callable[[str], str], - indent: Optional[int], key_separator: str, item_separator: str, sort_keys: bool, skipkeys: bool, - allow_nan: bool) -> None: ... + def __init__( + self, + markers: Optional[Dict[int, Any]], + default: Callable[[Any], Any], + encoder: Callable[[str], str], + indent: Optional[int], + key_separator: str, + item_separator: str, + sort_keys: bool, + skipkeys: bool, + allow_nan: bool, + ) -> None: ... def __call__(self, obj: object, _current_indent_level: int) -> Any: ... class make_scanner: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/lzma.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/lzma.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/lzma.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/lzma.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ import io +from _typeshed import AnyPath, ReadableBuffer from typing import IO, Any, Mapping, Optional, Sequence, TextIO, TypeVar, Union, overload -from _typeshed import AnyPath from typing_extensions import Literal _OpenBinaryWritingMode = Literal["w", "wb", "x", "xb", "a", "ab"] @@ -88,7 +88,7 @@ def read(self, size: Optional[int] = ...) -> bytes: ... def read1(self, size: int = ...) -> bytes: ... def readline(self, size: Optional[int] = ...) -> bytes: ... - def write(self, data: bytes) -> int: ... + def write(self, data: ReadableBuffer) -> int: ... def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/connection.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/connection.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/connection.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/connection.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ -from typing import Any, Iterable, List, Optional, Tuple, Type, Union import socket import sys import types +from typing import Any, Iterable, List, Optional, Tuple, Type, Union if sys.version_info >= (3, 8): from typing import SupportsIndex @@ -14,7 +14,6 @@ def __init__(self, handle: SupportsIndex, readable: bool = ..., writable: bool = ...) -> None: ... else: def __init__(self, handle: int, readable: bool = ..., writable: bool = ...) -> None: ... - @property def closed(self) -> bool: ... # undocumented @property @@ -23,17 +22,16 @@ def writable(self) -> bool: ... # undocumented def fileno(self) -> int: ... def close(self) -> None: ... - def send_bytes(self, - buf: bytes, - offset: int = ..., - size: Optional[int] = ...) -> None: ... + def send_bytes(self, buf: bytes, offset: int = ..., size: Optional[int] = ...) -> None: ... def send(self, obj: Any) -> None: ... def recv_bytes(self, maxlength: Optional[int] = ...) -> bytes: ... def recv_bytes_into(self, buf: Any, offset: int = ...) -> int: ... def recv(self) -> Any: ... def poll(self, timeout: Optional[float] = ...) -> bool: ... def __enter__(self) -> _ConnectionBase: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], exc_tb: Optional[types.TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], exc_tb: Optional[types.TracebackType] + ) -> None: ... class Connection(_ConnectionBase): ... @@ -41,7 +39,9 @@ class PipeConnection(_ConnectionBase): ... class Listener: - def __init__(self, address: Optional[_Address] = ..., family: Optional[str] = ..., backlog: int = ..., authkey: Optional[bytes] = ...) -> None: ... + def __init__( + self, address: Optional[_Address] = ..., family: Optional[str] = ..., backlog: int = ..., authkey: Optional[bytes] = ... + ) -> None: ... def accept(self) -> Connection: ... def close(self) -> None: ... @property @@ -49,10 +49,14 @@ @property def last_accepted(self) -> Optional[_Address]: ... def __enter__(self) -> Listener: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], exc_tb: Optional[types.TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], exc_tb: Optional[types.TracebackType] + ) -> None: ... def deliver_challenge(connection: Connection, authkey: bytes) -> None: ... def answer_challenge(connection: Connection, authkey: bytes) -> None: ... -def wait(object_list: Iterable[Union[Connection, socket.socket, int]], timeout: Optional[float] = ...) -> List[Union[Connection, socket.socket, int]]: ... +def wait( + object_list: Iterable[Union[Connection, socket.socket, int]], timeout: Optional[float] = ... +) -> List[Union[Connection, socket.socket, int]]: ... def Client(address: _Address, family: Optional[str] = ..., authkey: Optional[bytes] = ...) -> Connection: ... def Pipe(duplex: bool = ...) -> Tuple[Connection, Connection]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/context.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/context.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/context.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/context.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,20 +1,16 @@ -from logging import Logger import multiprocessing -from multiprocessing import synchronize -from multiprocessing import queues -from multiprocessing.process import BaseProcess import sys -from typing import Any, Callable, Iterable, Optional, List, Sequence, Type, Union, overload +from logging import Logger +from multiprocessing import queues, sharedctypes, synchronize +from multiprocessing.process import BaseProcess +from typing import Any, Callable, Iterable, List, Optional, Sequence, Type, Union, overload from typing_extensions import Literal _LockLike = Union[synchronize.Lock, synchronize.RLock] class ProcessError(Exception): ... - class BufferTooShort(ProcessError): ... - class TimeoutError(ProcessError): ... - class AuthenticationError(ProcessError): ... class BaseContext(object): @@ -26,7 +22,6 @@ # N.B. The methods below are applied at runtime to generate # multiprocessing.*, so the signatures should be identical (modulo self). - @staticmethod def current_process() -> BaseProcess: ... if sys.version_info >= (3, 8): @@ -39,20 +34,15 @@ def Manager(self) -> Any: ... # TODO: change return to Pipe once a stub exists in multiprocessing.connection def Pipe(self, duplex: bool = ...) -> Any: ... - - def Barrier(self, - parties: int, - action: Optional[Callable[..., Any]] = ..., - timeout: Optional[float] = ...) -> synchronize.Barrier: ... - def BoundedSemaphore(self, - value: int = ...) -> synchronize.BoundedSemaphore: ... - def Condition(self, - lock: Optional[_LockLike] = ...) -> synchronize.Condition: ... - def Event(self, lock: Optional[_LockLike] = ...) -> synchronize.Event: ... + def Barrier( + self, parties: int, action: Optional[Callable[..., Any]] = ..., timeout: Optional[float] = ... + ) -> synchronize.Barrier: ... + def BoundedSemaphore(self, value: int = ...) -> synchronize.BoundedSemaphore: ... + def Condition(self, lock: Optional[_LockLike] = ...) -> synchronize.Condition: ... + def Event(self) -> synchronize.Event: ... def Lock(self) -> synchronize.Lock: ... def RLock(self) -> synchronize.RLock: ... def Semaphore(self, value: int = ...) -> synchronize.Semaphore: ... - def Queue(self, maxsize: int = ...) -> queues.Queue[Any]: ... def JoinableQueue(self, maxsize: int = ...) -> queues.JoinableQueue[Any]: ... def SimpleQueue(self) -> queues.SimpleQueue[Any]: ... @@ -61,7 +51,7 @@ processes: Optional[int] = ..., initializer: Optional[Callable[..., Any]] = ..., initargs: Iterable[Any] = ..., - maxtasksperchild: Optional[int] = ... + maxtasksperchild: Optional[int] = ..., ) -> multiprocessing.pool.Pool: ... # TODO: typecode_or_type param is a ctype with a base class of _SimpleCData or array.typecode Need to figure out # how to handle the ctype @@ -73,30 +63,18 @@ def RawArray(self, typecode_or_type: Any, size_or_initializer: Union[int, Sequence[Any]]) -> Any: ... # TODO: typecode_or_type param is a ctype with a base class of _SimpleCData or array.typecode Need to figure out # how to handle the ctype - # TODO: change return to Value once a stub exists in multiprocessing.sharedctypes - def Value( - self, - typecode_or_type: Any, - *args: Any, - lock: bool = ... - ) -> Any: ... + def Value(self, typecode_or_type: Any, *args: Any, lock: bool = ...) -> sharedctypes._Value: ... # TODO: typecode_or_type param is a ctype with a base class of _SimpleCData or array.typecode Need to figure out # how to handle the ctype - # TODO: change return to Array once a stub exists in multiprocessing.sharedctypes def Array( - self, - typecode_or_type: Any, - size_or_initializer: Union[int, Sequence[Any]], - *, - lock: bool = ... - ) -> Any: ... + self, typecode_or_type: Any, size_or_initializer: Union[int, Sequence[Any]], *, lock: bool = ... + ) -> sharedctypes._Array: ... def freeze_support(self) -> None: ... def get_logger(self) -> Logger: ... def log_to_stderr(self, level: Optional[str] = ...) -> Logger: ... def allow_connection_pickling(self) -> None: ... def set_executable(self, executable: str) -> None: ... def set_forkserver_preload(self, module_names: List[str]) -> None: ... - if sys.platform != "win32": @overload def get_context(self, method: None = ...) -> DefaultContext: ... @@ -115,7 +93,6 @@ def get_context(self, method: Literal["spawn"]) -> SpawnContext: ... @overload def get_context(self, method: str) -> BaseContext: ... - def get_start_method(self, allow_none: bool = ...) -> str: ... def set_start_method(self, method: Optional[str], force: bool = ...) -> None: ... @property @@ -131,45 +108,39 @@ class DefaultContext(BaseContext): Process: Type[multiprocessing.Process] - def __init__(self, context: BaseContext) -> None: ... def set_start_method(self, method: Optional[str], force: bool = ...) -> None: ... def get_start_method(self, allow_none: bool = ...) -> str: ... def get_all_start_methods(self) -> List[str]: ... -if sys.platform != 'win32': +if sys.platform != "win32": class ForkProcess(BaseProcess): _start_method: str @staticmethod def _Popen(process_obj: BaseProcess) -> Any: ... - class SpawnProcess(BaseProcess): _start_method: str @staticmethod def _Popen(process_obj: BaseProcess) -> SpawnProcess: ... - class ForkServerProcess(BaseProcess): _start_method: str @staticmethod def _Popen(process_obj: BaseProcess) -> Any: ... - class ForkContext(BaseContext): _name: str Process: Type[ForkProcess] - class SpawnContext(BaseContext): _name: str Process: Type[SpawnProcess] - class ForkServerContext(BaseContext): _name: str Process: Type[ForkServerProcess] + else: class SpawnProcess(BaseProcess): _start_method: str @staticmethod def _Popen(process_obj: BaseProcess) -> Any: ... - class SpawnContext(BaseContext): _name: str Process: Type[SpawnProcess] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/connection.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/connection.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/connection.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/connection.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,12 @@ -from typing import Any, List, Optional, Tuple, TypeVar - from queue import Queue +from types import TracebackType +from typing import Any, List, Optional, Tuple, Type, TypeVar, Union families: List[None] -_TConnection = TypeVar('_TConnection', bound=Connection) -_TListener = TypeVar('_TListener', bound=Listener) +_TConnection = TypeVar("_TConnection", bound=Connection) +_TListener = TypeVar("_TListener", bound=Listener) +_Address = Union[str, Tuple[str, int]] class Connection(object): _in: Any @@ -15,8 +16,10 @@ send: Any send_bytes: Any def __enter__(self: _TConnection) -> _TConnection: ... - def __exit__(self, exc_type, exc_value, exc_tb) -> None: ... - def __init__(self, _in, _out) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... + def __init__(self, _in: Any, _out: Any) -> None: ... def close(self) -> None: ... def poll(self, timeout: float = ...) -> bool: ... @@ -25,11 +28,12 @@ @property def address(self) -> Optional[Queue[Any]]: ... def __enter__(self: _TListener) -> _TListener: ... - def __exit__(self, exc_type, exc_value, exc_tb) -> None: ... - def __init__(self, address=..., family=..., backlog=...) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... + def __init__(self, address: Optional[_Address] = ..., family: Optional[int] = ..., backlog: int = ...) -> None: ... def accept(self) -> Connection: ... def close(self) -> None: ... - -def Client(address) -> Connection: ... +def Client(address: _Address) -> Connection: ... def Pipe(duplex: bool = ...) -> Tuple[Connection, Connection]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/dummy/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,8 @@ -from typing import Any, Optional, List - import array import threading import weakref - from queue import Queue as Queue +from typing import Any, Callable, Iterable, List, Mapping, Optional, Sequence JoinableQueue = Queue Barrier = threading.Barrier @@ -21,7 +19,14 @@ _pid: None _start_called: int exitcode: Optional[int] - def __init__(self, group=..., target=..., name=..., args=..., kwargs=...) -> None: ... + def __init__( + self, + group: Any = ..., + target: Optional[Callable[..., Any]] = ..., + name: Optional[str] = ..., + args: Iterable[Any] = ..., + kwargs: Mapping[str, Any] = ..., + ) -> None: ... Process = DummyProcess @@ -34,12 +39,13 @@ _typecode: Any _value: Any value: Any - def __init__(self, typecode, value, lock=...) -> None: ... - + def __init__(self, typecode: Any, value: Any, lock: Any = ...) -> None: ... -def Array(typecode, sequence, lock=...) -> array.array[Any]: ... +def Array(typecode: Any, sequence: Sequence[Any], lock: Any = ...) -> array.array[Any]: ... def Manager() -> Any: ... -def Pool(processes=..., initializer=..., initargs=...) -> Any: ... +def Pool( + processes: Optional[int] = ..., initializer: Optional[Callable[..., Any]] = ..., initargs: Iterable[Any] = ... +) -> Any: ... def active_children() -> List[Any]: ... def current_process() -> threading.Thread: ... def freeze_support() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,6 @@ import sys -from typing import Any, Callable, Iterable, Optional, List, Union, Sequence, Tuple, Type, overload -from typing_extensions import Literal -from ctypes import _CData from logging import Logger -from multiprocessing import connection, pool, spawn, synchronize +from multiprocessing import connection, pool, sharedctypes, synchronize from multiprocessing.context import ( AuthenticationError as AuthenticationError, BaseContext, @@ -16,9 +13,12 @@ ) from multiprocessing.managers import SyncManager from multiprocessing.process import active_children as active_children, current_process as current_process -from multiprocessing.queues import Queue as Queue, SimpleQueue as SimpleQueue, JoinableQueue as JoinableQueue + +# These are technically functions that return instances of these Queue classes. See #4313 for discussion +from multiprocessing.queues import JoinableQueue as JoinableQueue, Queue as Queue, SimpleQueue as SimpleQueue from multiprocessing.spawn import freeze_support as freeze_support -from multiprocessing.spawn import set_executable as set_executable +from typing import Any, Callable, Iterable, List, Optional, Sequence, Tuple, Union, overload +from typing_extensions import Literal if sys.version_info >= (3, 8): from multiprocessing.process import parent_process as parent_process @@ -26,54 +26,33 @@ if sys.platform != "win32": from multiprocessing.context import ForkContext, ForkServerContext - # N.B. The functions below are generated at runtime by partially applying # multiprocessing.context.BaseContext's methods, so the two signatures should # be identical (modulo self). # Sychronization primitives _LockLike = Union[synchronize.Lock, synchronize.RLock] -def Barrier(parties: int, - action: Optional[Callable[..., Any]] = ..., - timeout: Optional[float] = ...) -> synchronize.Barrier: ... + +def Barrier(parties: int, action: Optional[Callable[..., Any]] = ..., timeout: Optional[float] = ...) -> synchronize.Barrier: ... def BoundedSemaphore(value: int = ...) -> synchronize.BoundedSemaphore: ... def Condition(lock: Optional[_LockLike] = ...) -> synchronize.Condition: ... -def Event(lock: Optional[_LockLike] = ...) -> synchronize.Event: ... +def Event() -> synchronize.Event: ... def Lock() -> synchronize.Lock: ... def RLock() -> synchronize.RLock: ... def Semaphore(value: int = ...) -> synchronize.Semaphore: ... - def Pipe(duplex: bool = ...) -> Tuple[connection.Connection, connection.Connection]: ... - -def Pool(processes: Optional[int] = ..., - initializer: Optional[Callable[..., Any]] = ..., - initargs: Iterable[Any] = ..., - maxtasksperchild: Optional[int] = ...) -> pool.Pool: ... - -class Array: - value: Any = ... - - def __init__(self, typecode_or_type: Union[str, Type[_CData]], size_or_initializer: Union[int, Sequence[Any]], *, lock: Union[bool, _LockLike] = ...) -> None: ... - def acquire(self) -> bool: ... - def release(self) -> bool: ... - def get_lock(self) -> _LockLike: ... - def get_obj(self) -> Any: ... - - @overload - def __getitem__(self, key: int) -> Any: ... - @overload - def __getitem__(self, key: slice) -> List[Any]: ... - def __getslice__(self, start: int, stop: int) -> Any: ... - def __setitem__(self, key: int, value: Any) -> None: ... - - -class Value(): - value: Any = ... - def __init__(self, typecode_or_type: Union[str, Type[_CData]], *args: Any, lock: Union[bool, _LockLike] = ...) -> None: ... - def get_lock(self) -> _LockLike: ... - def get_obj(self) -> Any: ... - def acquire(self) -> bool: ... - def release(self) -> bool: ... +def Pool( + processes: Optional[int] = ..., + initializer: Optional[Callable[..., Any]] = ..., + initargs: Iterable[Any] = ..., + maxtasksperchild: Optional[int] = ..., +) -> pool.Pool: ... + +# Functions Array and Value are copied from context.pyi. +# See https://github.com/python/typeshed/blob/ac234f25927634e06d9c96df98d72d54dd80dfc4/stdlib/2and3/turtle.pyi#L284-L291 +# for rationale +def Array(typecode_or_type: Any, size_or_initializer: Union[int, Sequence[Any]], *, lock: bool = ...) -> sharedctypes._Array: ... +def Value(typecode_or_type: Any, *args: Any, lock: bool = ...) -> sharedctypes._Value: ... # ----- multiprocessing function stubs ----- def allow_connection_pickling() -> None: ... @@ -81,12 +60,12 @@ def get_logger() -> Logger: ... def log_to_stderr(level: Optional[Union[str, int]] = ...) -> Logger: ... def Manager() -> SyncManager: ... +def set_executable(executable: str) -> None: ... def set_forkserver_preload(module_names: List[str]) -> None: ... def get_all_start_methods() -> List[str]: ... def get_start_method(allow_none: bool = ...) -> Optional[str]: ... def set_start_method(method: str, force: Optional[bool] = ...) -> None: ... - if sys.platform != "win32": @overload def get_context(method: None = ...) -> DefaultContext: ... @@ -98,6 +77,7 @@ def get_context(method: Literal["forkserver"]) -> ForkServerContext: ... @overload def get_context(method: str) -> BaseContext: ... + else: @overload def get_context(method: None = ...) -> DefaultContext: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/managers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/managers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/managers.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/managers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,22 +1,39 @@ -# Stubs for multiprocessing.managers - # NOTE: These are incomplete! import queue import sys import threading from typing import ( - Any, Callable, ContextManager, Dict, Iterable, Generic, List, Mapping, Optional, - Sequence, Tuple, TypeVar, Union, AnyStr, + Any, + AnyStr, + Callable, + ContextManager, + Dict, + Generic, + Iterable, + List, + Mapping, + Optional, + Sequence, + Tuple, + TypeVar, + Union, ) + from .context import BaseContext if sys.version_info >= (3, 8): - from .shared_memory import ShareableList, SharedMemory, _SLT + from .shared_memory import _SLT, ShareableList, SharedMemory + + _SharedMemory = SharedMemory + _ShareableList = ShareableList -_T = TypeVar('_T') -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") class Namespace: def __init__(self, **kwds: Any) -> None: ... @@ -29,28 +46,32 @@ typeid: Optional[Union[str, bytes]] address: Tuple[Union[str, bytes], int] id: Optional[Union[str, bytes, int]] - def __init__(self, typeid: Optional[Union[bytes, str]], address: Tuple[Union[str, bytes], int], - id: Optional[Union[str, bytes, int]]) -> None: ... + def __init__( + self, typeid: Optional[Union[bytes, str]], address: Tuple[Union[str, bytes], int], id: Optional[Union[str, bytes, int]] + ) -> None: ... def __repr__(self) -> str: ... - def __getstate__(self) -> Tuple[Optional[Union[str, bytes]], Tuple[Union[str, bytes], int], - Optional[Union[str, bytes, int]]]: ... - def __setstate__(self, state: Tuple[Optional[Union[str, bytes]], Tuple[Union[str, bytes], int], - Optional[Union[str, bytes, int]]]) -> None: ... + def __getstate__( + self, + ) -> Tuple[Optional[Union[str, bytes]], Tuple[Union[str, bytes], int], Optional[Union[str, bytes, int]]]: ... + def __setstate__( + self, state: Tuple[Optional[Union[str, bytes]], Tuple[Union[str, bytes], int], Optional[Union[str, bytes, int]]] + ) -> None: ... class BaseProxy(object): _address_to_local: Dict[Any, Any] _mutex: Any - if sys.version_info >= (3, 6): - def __init__(self, token: Any, serializer: str, manager: Any = ..., - authkey: Optional[AnyStr] = ..., exposed: Any = ..., - incref: bool = ..., manager_owned: bool = ...) -> None: ... - else: - def __init__(self, token: Any, serializer: str, manager: Any = ..., - authkey: Optional[AnyStr] = ..., exposed: Any = ..., - incref: bool = ...) -> None: ... + def __init__( + self, + token: Any, + serializer: str, + manager: Any = ..., + authkey: Optional[AnyStr] = ..., + exposed: Any = ..., + incref: bool = ..., + manager_owned: bool = ..., + ) -> None: ... def __deepcopy__(self, memo: Optional[Any]) -> Any: ... - def _callmethod(self, methodname: str, args: Tuple[Any, ...] = ..., - kwds: Dict[Any, Any] = ...) -> None: ... + def _callmethod(self, methodname: str, args: Tuple[Any, ...] = ..., kwds: Dict[Any, Any] = ...) -> None: ... def _getvalue(self) -> Any: ... def __reduce__(self) -> Tuple[Any, Tuple[Any, Any, str, Dict[Any, Any]]]: ... @@ -58,6 +79,8 @@ def get(self) -> _T: ... def set(self, value: _T) -> None: ... value: _T + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # Returned by BaseManager.get_server() class Server: @@ -80,11 +103,15 @@ @property def address(self) -> Any: ... @classmethod - def register(cls, typeid: str, callable: Optional[Callable[..., Any]] = ..., - proxytype: Any = ..., - exposed: Optional[Sequence[str]] = ..., - method_to_typeid: Optional[Mapping[str, str]] = ..., - create_method: bool = ...) -> None: ... + def register( + cls, + typeid: str, + callable: Optional[Callable[..., Any]] = ..., + proxytype: Any = ..., + exposed: Optional[Sequence[str]] = ..., + method_to_typeid: Optional[Mapping[str, str]] = ..., + create_method: bool = ..., + ) -> None: ... class SyncManager(BaseManager, ContextManager[SyncManager]): def BoundedSemaphore(self, value: Any = ...) -> threading.BoundedSemaphore: ... @@ -106,5 +133,5 @@ class SharedMemoryServer(Server): ... class SharedMemoryManager(BaseManager): def get_server(self) -> SharedMemoryServer: ... - def SharedMemory(self, size: int) -> SharedMemory: ... # noqa: F811 - def ShareableList(self, sequence: Optional[Iterable[_SLT]]) -> ShareableList[_SLT]: ... # noqa: F811 + def SharedMemory(self, size: int) -> _SharedMemory: ... + def ShareableList(self, sequence: Optional[Iterable[_SLT]]) -> _ShareableList[_SLT]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/pool.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/pool.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/pool.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/pool.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,20 @@ -from typing import Any, Callable, ContextManager, Iterable, Mapping, Optional, List, TypeVar, Generic, Iterator +import sys +from typing import Any, Callable, ContextManager, Generic, Iterable, Iterator, List, Mapping, Optional, TypeVar -_PT = TypeVar('_PT', bound=Pool) -_S = TypeVar('_S') -_T = TypeVar('_T') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_PT = TypeVar("_PT", bound=Pool) +_S = TypeVar("_S") +_T = TypeVar("_T") class ApplyResult(Generic[_T]): def get(self, timeout: Optional[float] = ...) -> _T: ... def wait(self, timeout: Optional[float] = ...) -> None: ... def ready(self) -> bool: ... def successful(self) -> bool: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # alias created during issue #17805 AsyncResult = ApplyResult @@ -23,59 +29,54 @@ class IMapUnorderedIterator(IMapIterator[_T]): ... class Pool(ContextManager[Pool]): - def __init__(self, processes: Optional[int] = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Iterable[Any] = ..., - maxtasksperchild: Optional[int] = ..., - context: Optional[Any] = ...) -> None: ... - def apply(self, - func: Callable[..., _T], - args: Iterable[Any] = ..., - kwds: Mapping[str, Any] = ...) -> _T: ... - def apply_async(self, - func: Callable[..., _T], - args: Iterable[Any] = ..., - kwds: Mapping[str, Any] = ..., - callback: Optional[Callable[[_T], None]] = ..., - error_callback: Optional[Callable[[BaseException], None]] = ...) -> AsyncResult[_T]: ... - def map(self, - func: Callable[[_S], _T], - iterable: Iterable[_S] = ..., - chunksize: Optional[int] = ...) -> List[_T]: ... - def map_async(self, func: Callable[[_S], _T], - iterable: Iterable[_S] = ..., - chunksize: Optional[int] = ..., - callback: Optional[Callable[[_T], None]] = ..., - error_callback: Optional[Callable[[BaseException], None]] = ...) -> MapResult[_T]: ... - def imap(self, - func: Callable[[_S], _T], - iterable: Iterable[_S] = ..., - chunksize: Optional[int] = ...) -> IMapIterator[_T]: ... - def imap_unordered(self, - func: Callable[[_S], _T], - iterable: Iterable[_S] = ..., - chunksize: Optional[int] = ...) -> IMapIterator[_T]: ... - def starmap(self, - func: Callable[..., _T], - iterable: Iterable[Iterable[Any]] = ..., - chunksize: Optional[int] = ...) -> List[_T]: ... - def starmap_async(self, - func: Callable[..., _T], - iterable: Iterable[Iterable[Any]] = ..., - chunksize: Optional[int] = ..., - callback: Optional[Callable[[_T], None]] = ..., - error_callback: Optional[Callable[[BaseException], None]] = ...) -> AsyncResult[List[_T]]: ... + def __init__( + self, + processes: Optional[int] = ..., + initializer: Optional[Callable[..., None]] = ..., + initargs: Iterable[Any] = ..., + maxtasksperchild: Optional[int] = ..., + context: Optional[Any] = ..., + ) -> None: ... + def apply(self, func: Callable[..., _T], args: Iterable[Any] = ..., kwds: Mapping[str, Any] = ...) -> _T: ... + def apply_async( + self, + func: Callable[..., _T], + args: Iterable[Any] = ..., + kwds: Mapping[str, Any] = ..., + callback: Optional[Callable[[_T], None]] = ..., + error_callback: Optional[Callable[[BaseException], None]] = ..., + ) -> AsyncResult[_T]: ... + def map(self, func: Callable[[_S], _T], iterable: Iterable[_S], chunksize: Optional[int] = ...) -> List[_T]: ... + def map_async( + self, + func: Callable[[_S], _T], + iterable: Iterable[_S], + chunksize: Optional[int] = ..., + callback: Optional[Callable[[_T], None]] = ..., + error_callback: Optional[Callable[[BaseException], None]] = ..., + ) -> MapResult[_T]: ... + def imap(self, func: Callable[[_S], _T], iterable: Iterable[_S], chunksize: Optional[int] = ...) -> IMapIterator[_T]: ... + def imap_unordered( + self, func: Callable[[_S], _T], iterable: Iterable[_S], chunksize: Optional[int] = ... + ) -> IMapIterator[_T]: ... + def starmap(self, func: Callable[..., _T], iterable: Iterable[Iterable[Any]], chunksize: Optional[int] = ...) -> List[_T]: ... + def starmap_async( + self, + func: Callable[..., _T], + iterable: Iterable[Iterable[Any]], + chunksize: Optional[int] = ..., + callback: Optional[Callable[[_T], None]] = ..., + error_callback: Optional[Callable[[BaseException], None]] = ..., + ) -> AsyncResult[List[_T]]: ... def close(self) -> None: ... def terminate(self) -> None: ... def join(self) -> None: ... def __enter__(self: _PT) -> _PT: ... - class ThreadPool(Pool, ContextManager[ThreadPool]): - - def __init__(self, processes: Optional[int] = ..., - initializer: Optional[Callable[..., Any]] = ..., - initargs: Iterable[Any] = ...) -> None: ... + def __init__( + self, processes: Optional[int] = ..., initializer: Optional[Callable[..., Any]] = ..., initargs: Iterable[Any] = ... + ) -> None: ... # undocumented RUN: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/process.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/process.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/process.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/process.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -34,5 +34,6 @@ def current_process() -> BaseProcess: ... def active_children() -> List[BaseProcess]: ... + if sys.version_info >= (3, 8): def parent_process() -> Optional[BaseProcess]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/queues.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/queues.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/queues.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/queues.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,11 @@ +import queue +import sys from typing import Any, Generic, Optional, TypeVar -import queue +if sys.version_info >= (3, 9): + from types import GenericAlias -_T = TypeVar('_T') +_T = TypeVar("_T") class Queue(queue.Queue[_T]): # FIXME: `ctx` is a circular dependency and it's not actually optional. @@ -28,3 +31,5 @@ def empty(self) -> bool: ... def get(self) -> _T: ... def put(self, item: _T) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/sharedctypes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/sharedctypes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/sharedctypes.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/sharedctypes.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,43 @@ +from ctypes import _CData +from multiprocessing.context import BaseContext +from multiprocessing.synchronize import _LockLike +from typing import Any, List, Optional, Sequence, Type, Union, overload + +class _Array: + value: Any = ... + def __init__( + self, + typecode_or_type: Union[str, Type[_CData]], + size_or_initializer: Union[int, Sequence[Any]], + *, + lock: Union[bool, _LockLike] = ..., + ) -> None: ... + def acquire(self) -> bool: ... + def release(self) -> bool: ... + def get_lock(self) -> _LockLike: ... + def get_obj(self) -> Any: ... + @overload + def __getitem__(self, key: int) -> Any: ... + @overload + def __getitem__(self, key: slice) -> List[Any]: ... + def __getslice__(self, start: int, stop: int) -> Any: ... + def __setitem__(self, key: int, value: Any) -> None: ... + +class _Value: + value: Any = ... + def __init__(self, typecode_or_type: Union[str, Type[_CData]], *args: Any, lock: Union[bool, _LockLike] = ...) -> None: ... + def get_lock(self) -> _LockLike: ... + def get_obj(self) -> Any: ... + def acquire(self) -> bool: ... + def release(self) -> bool: ... + +def Array( + typecode_or_type: Union[str, Type[_CData]], + size_or_initializer: Union[int, Sequence[Any]], + *, + lock: Union[bool, _LockLike] = ..., + ctx: Optional[BaseContext] = ..., +) -> _Array: ... +def Value( + typecode_or_type: Union[str, Type[_CData]], *args: Any, lock: Union[bool, _LockLike] = ..., ctx: Optional[BaseContext] = ... +) -> _Value: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/shared_memory.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/shared_memory.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/shared_memory.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/shared_memory.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,8 @@ import sys -from typing import Generic, Iterable, Optional, Tuple, TypeVar +from typing import Any, Generic, Iterable, Optional, Tuple, TypeVar + +if sys.version_info >= (3, 9): + from types import GenericAlias _S = TypeVar("_S") _SLT = TypeVar("_SLT", int, float, bool, str, bytes, None) @@ -15,7 +18,6 @@ def size(self) -> int: ... def close(self) -> None: ... def unlink(self) -> None: ... - class ShareableList(Generic[_SLT]): shm: SharedMemory def __init__(self, sequence: Optional[Iterable[_SLT]] = ..., *, name: Optional[str] = ...) -> None: ... @@ -27,3 +29,5 @@ def format(self) -> str: ... def count(self, value: _SLT) -> int: ... def index(self, value: _SLT) -> int: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/spawn.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/spawn.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/spawn.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/spawn.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Dict, List, Mapping, Optional, Sequence from types import ModuleType +from typing import Any, Dict, List, Mapping, Optional, Sequence WINEXE: bool WINSERVICE: bool @@ -10,9 +10,12 @@ def freeze_support() -> None: ... def get_command_line(**kwds: Any) -> List[str]: ... def spawn_main(pipe_handle: int, parent_pid: Optional[int] = ..., tracker_fd: Optional[int] = ...) -> None: ... + # undocumented def _main(fd: int) -> Any: ... def get_preparation_data(name: str) -> Dict[str, Any]: ... + old_main_modules: List[ModuleType] + def prepare(data: Mapping[str, Any]) -> None: ... def import_main_path(main_path: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/synchronize.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/synchronize.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/synchronize.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/multiprocessing/synchronize.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,46 +1,32 @@ -from typing import Any, Callable, ContextManager, Optional, Union - -from multiprocessing.context import BaseContext -import threading import sys +import threading +from multiprocessing.context import BaseContext +from typing import Any, Callable, ContextManager, Optional, Union _LockLike = Union[Lock, RLock] class Barrier(threading.Barrier): - def __init__(self, - parties: int, - action: Optional[Callable[..., Any]] = ..., - timeout: Optional[float] = ..., - * - ctx: BaseContext) -> None: ... + def __init__( + self, parties: int, action: Optional[Callable[..., Any]] = ..., timeout: Optional[float] = ..., *ctx: BaseContext + ) -> None: ... class BoundedSemaphore(Semaphore): def __init__(self, value: int = ..., *, ctx: BaseContext) -> None: ... class Condition(ContextManager[bool]): - def __init__(self, - lock: Optional[_LockLike] = ..., - *, - ctx: BaseContext) -> None: ... + def __init__(self, lock: Optional[_LockLike] = ..., *, ctx: BaseContext) -> None: ... if sys.version_info >= (3, 7): def notify(self, n: int = ...) -> None: ... else: def notify(self) -> None: ... def notify_all(self) -> None: ... def wait(self, timeout: Optional[float] = ...) -> bool: ... - def wait_for(self, - predicate: Callable[[], bool], - timeout: Optional[float] = ...) -> bool: ... - def acquire(self, - block: bool = ..., - timeout: Optional[float] = ...) -> bool: ... + def wait_for(self, predicate: Callable[[], bool], timeout: Optional[float] = ...) -> bool: ... + def acquire(self, block: bool = ..., timeout: Optional[float] = ...) -> bool: ... def release(self) -> None: ... class Event(ContextManager[bool]): - def __init__(self, - lock: Optional[_LockLike] = ..., - *, - ctx: BaseContext) -> None: ... + def __init__(self, lock: Optional[_LockLike] = ..., *, ctx: BaseContext) -> None: ... def is_set(self) -> bool: ... def set(self) -> None: ... def clear(self) -> None: ... @@ -57,7 +43,5 @@ # Not part of public API class SemLock(ContextManager[bool]): - def acquire(self, - block: bool = ..., - timeout: Optional[float] = ...) -> bool: ... + def acquire(self, block: bool = ..., timeout: Optional[float] = ...) -> bool: ... def release(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ntpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ntpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/ntpath.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/ntpath.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,144 @@ +import os +import sys +from _typeshed import AnyPath, BytesPath, StrPath +from genericpath import exists as exists +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Tuple, TypeVar, overload + +_T = TypeVar("_T") + +if sys.version_info >= (3, 6): + from builtins import _PathLike + +# ----- os.path variables ----- +supports_unicode_filenames: bool +# aliases (also in os) +curdir: str +pardir: str +sep: str +if sys.platform == "win32": + altsep: str +else: + altsep: Optional[str] +extsep: str +pathsep: str +defpath: str +devnull: str + +# ----- os.path function stubs ----- +if sys.version_info >= (3, 6): + # Overloads are necessary to work around python/mypy#3644. + @overload + def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def abspath(path: AnyStr) -> AnyStr: ... + @overload + def basename(p: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def basename(p: AnyStr) -> AnyStr: ... + @overload + def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def dirname(p: AnyStr) -> AnyStr: ... + @overload + def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def expanduser(path: AnyStr) -> AnyStr: ... + @overload + def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def expandvars(path: AnyStr) -> AnyStr: ... + @overload + def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def normcase(s: AnyStr) -> AnyStr: ... + @overload + def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def normpath(path: AnyStr) -> AnyStr: ... + if sys.platform == "win32": + @overload + def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def realpath(path: AnyStr) -> AnyStr: ... + else: + @overload + def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def realpath(filename: AnyStr) -> AnyStr: ... + +else: + def abspath(path: AnyStr) -> AnyStr: ... + def basename(p: AnyStr) -> AnyStr: ... + def dirname(p: AnyStr) -> AnyStr: ... + def expanduser(path: AnyStr) -> AnyStr: ... + def expandvars(path: AnyStr) -> AnyStr: ... + def normcase(s: AnyStr) -> AnyStr: ... + def normpath(path: AnyStr) -> AnyStr: ... + if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... + else: + def realpath(filename: AnyStr) -> AnyStr: ... + +if sys.version_info >= (3, 6): + # In reality it returns str for sequences of StrPath and bytes for sequences + # of BytesPath, but mypy does not accept such a signature. + def commonpath(paths: Sequence[AnyPath]) -> Any: ... + +elif sys.version_info >= (3, 5): + def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... + +# NOTE: Empty lists results in '' (str) regardless of contained type. +# So, fall back to Any +def commonprefix(m: Sequence[AnyPath]) -> Any: ... +def lexists(path: AnyPath) -> bool: ... + +# These return float if os.stat_float_times() == True, +# but int is a subclass of float. +def getatime(filename: AnyPath) -> float: ... +def getmtime(filename: AnyPath) -> float: ... +def getctime(filename: AnyPath) -> float: ... +def getsize(filename: AnyPath) -> int: ... +def isabs(s: AnyPath) -> bool: ... +def isfile(path: AnyPath) -> bool: ... +def isdir(s: AnyPath) -> bool: ... +def islink(path: AnyPath) -> bool: ... +def ismount(path: AnyPath) -> bool: ... + +if sys.version_info >= (3, 6): + @overload + def join(a: StrPath, *paths: StrPath) -> str: ... + @overload + def join(a: BytesPath, *paths: BytesPath) -> bytes: ... + +else: + def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... + +@overload +def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... +@overload +def relpath(path: StrPath, start: Optional[StrPath] = ...) -> str: ... +def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... +def sameopenfile(fp1: int, fp2: int) -> bool: ... +def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... + +if sys.version_info >= (3, 6): + @overload + def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +else: + def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +if sys.version_info < (3, 7) and sys.platform == "win32": + def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_operator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_operator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_operator.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_operator.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,63 +1,60 @@ -# Stubs for _operator (Python 3.5) - -from typing import AnyStr - # In reality the import is the other way around, but this way we can keep the operator stub in 2and3 from operator import ( - truth as truth, + abs as abs, + add as add, + and_ as and_, + attrgetter as attrgetter, + concat as concat, contains as contains, - indexOf as indexOf, countOf as countOf, - is_ as is_, - is_not as is_not, - index as index, - add as add, - sub as sub, - mul as mul, + delitem as delitem, + eq as eq, floordiv as floordiv, - truediv as truediv, - mod as mod, - neg as neg, - pos as pos, - abs as abs, - inv as inv, - invert as invert, - length_hint as length_hint, - lshift as lshift, - rshift as rshift, - not_ as not_, - and_ as and_, - xor as xor, - or_ as or_, + ge as ge, + getitem as getitem, + gt as gt, iadd as iadd, - isub as isub, - imul as imul, + iand as iand, + iconcat as iconcat, ifloordiv as ifloordiv, - itruediv as itruediv, - imod as imod, ilshift as ilshift, - irshift as irshift, - iand as iand, - ixor as ixor, + imatmul as imatmul, + imod as imod, + imul as imul, + index as index, + indexOf as indexOf, + inv as inv, + invert as invert, ior as ior, - concat as concat, - iconcat as iconcat, - getitem as getitem, - setitem as setitem, - delitem as delitem, - pow as pow, ipow as ipow, - eq as eq, - ne as ne, - lt as lt, - le as le, - gt as gt, - ge as ge, + irshift as irshift, + is_ as is_, + is_not as is_not, + isub as isub, itemgetter as itemgetter, - attrgetter as attrgetter, - methodcaller as methodcaller, + itruediv as itruediv, + ixor as ixor, + le as le, + length_hint as length_hint, + lshift as lshift, + lt as lt, matmul as matmul, - imatmul as imatmul, + methodcaller as methodcaller, + mod as mod, + mul as mul, + ne as ne, + neg as neg, + not_ as not_, + or_ as or_, + pos as pos, + pow as pow, + rshift as rshift, + setitem as setitem, + sub as sub, + truediv as truediv, + truth as truth, + xor as xor, ) +from typing import AnyStr def _compare_digest(__a: AnyStr, __b: AnyStr) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/os/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/os/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/os/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/os/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,46 @@ -from io import TextIOWrapper as _TextIOWrapper -from posix import listdir as listdir, times_result import sys +from _typeshed import ( + AnyPath, + FileDescriptorLike, + OpenBinaryMode, + OpenBinaryModeReading, + OpenBinaryModeUpdating, + OpenBinaryModeWriting, + OpenTextMode, +) +from builtins import OSError, _PathLike +from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper as _TextIOWrapper +from posix import listdir as listdir, times_result from typing import ( - Mapping, MutableMapping, Dict, List, Any, Tuple, Iterable, Iterator, NoReturn, overload, Union, AnyStr, - Optional, Generic, Set, Callable, Text, Sequence, NamedTuple, ContextManager, TypeVar + IO, + Any, + AnyStr, + BinaryIO, + Callable, + ContextManager, + Dict, + Generic, + Iterable, + Iterator, + List, + Mapping, + MutableMapping, + NoReturn, + Optional, + Sequence, + Set, + Tuple, + TypeVar, + Union, + overload, ) -from _typeshed import AnyPath +from typing_extensions import Literal -from builtins import OSError as error from . import path as path +if sys.version_info >= (3, 9): + from types import GenericAlias + # We need to use something from path, or flake8 and pytype get unhappy _supports_unicode_filenames = path.supports_unicode_filenames @@ -17,6 +48,8 @@ # ----- os variables ----- +error = OSError + supports_bytes_environ: bool supports_dir_fd: Set[Callable[..., Any]] @@ -24,7 +57,7 @@ supports_effective_ids: Set[Callable[..., Any]] supports_follow_symlinks: Set[Callable[..., Any]] -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only PRIO_PROCESS: int PRIO_PGRP: int @@ -85,7 +118,7 @@ SEEK_SET: int SEEK_CUR: int SEEK_END: int -if sys.platform != 'win32': +if sys.platform != "win32": SEEK_DATA: int # some flavors of Unix SEEK_HOLE: int # some flavors of Unix @@ -99,27 +132,27 @@ # We don't use sys.platform for O_* flags to denote platform-dependent APIs because some codes, # including tests for mypy, use a more finer way than sys.platform before using these APIs # See https://github.com/python/typeshed/pull/2286 for discussions -O_DSYNC: int # Unix only -O_RSYNC: int # Unix only -O_SYNC: int # Unix only -O_NDELAY: int # Unix only +O_DSYNC: int # Unix only +O_RSYNC: int # Unix only +O_SYNC: int # Unix only +O_NDELAY: int # Unix only O_NONBLOCK: int # Unix only -O_NOCTTY: int # Unix only +O_NOCTTY: int # Unix only O_CLOEXEC: int # Unix only -O_SHLOCK: int # Unix only -O_EXLOCK: int # Unix only -O_BINARY: int # Windows only +O_SHLOCK: int # Unix only +O_EXLOCK: int # Unix only +O_BINARY: int # Windows only O_NOINHERIT: int # Windows only O_SHORT_LIVED: int # Windows only O_TEMPORARY: int # Windows only -O_RANDOM: int # Windows only +O_RANDOM: int # Windows only O_SEQUENTIAL: int # Windows only -O_TEXT: int # Windows only -O_ASYNC: int # Gnu extension if in C library -O_DIRECT: int # Gnu extension if in C library +O_TEXT: int # Windows only +O_ASYNC: int # Gnu extension if in C library +O_DIRECT: int # Gnu extension if in C library O_DIRECTORY: int # Gnu extension if in C library -O_NOFOLLOW: int # Gnu extension if in C library -O_NOATIME: int # Gnu extension if in C library +O_NOFOLLOW: int # Gnu extension if in C library +O_NOATIME: int # Gnu extension if in C library O_PATH: int # Gnu extension if in C library O_TMPFILE: int # Gnu extension if in C library O_LARGEFILE: int # Gnu extension if in C library @@ -127,7 +160,7 @@ curdir: str pardir: str sep: str -if sys.platform == 'win32': +if sys.platform == "win32": altsep: str else: altsep: Optional[str] @@ -155,7 +188,7 @@ if sys.platform != "win32": environb: _Environ[bytes] -if sys.platform != 'win32': +if sys.platform != "win32": confstr_names: Dict[str, int] pathconf_names: Dict[str, int] sysconf_names: Dict[str, int] @@ -181,12 +214,12 @@ P_NOWAIT: int P_NOWAITO: int P_WAIT: int -if sys.platform == 'win32': +if sys.platform == "win32": P_DETACH: int P_OVERLAY: int # wait()/waitpid() options -if sys.platform != 'win32': +if sys.platform != "win32": WNOHANG: int # Unix only WCONTINUED: int # some Unix systems WUNTRACED: int # Unix only @@ -216,14 +249,11 @@ st_ctime_ns: int # platform dependent (time of most recent metadata change on Unix, or the time of creation on Windows) in nanoseconds if sys.version_info >= (3, 8) and sys.platform == "win32": st_reparse_tag: int - if sys.version_info >= (3, 5) and sys.platform == "win32": + if sys.platform == "win32": st_file_attributes: int - def __getitem__(self, i: int) -> int: ... - # not documented def __init__(self, tuple: Tuple[int, ...]) -> None: ... - # On some Unix systems (such as Linux), the following attributes may also # be available: st_blocks: int # number of blocks allocated for file @@ -241,43 +271,36 @@ st_creator: int st_type: int -if sys.version_info >= (3, 6): - from builtins import _PathLike as PathLike # See comment in builtins +PathLike = _PathLike # See comment in builtins _FdOrAnyPath = Union[int, AnyPath] -if sys.version_info >= (3, 6): - class DirEntry(PathLike[AnyStr]): - # This is what the scandir interator yields - # The constructor is hidden - - name: AnyStr - path: AnyStr - def inode(self) -> int: ... - def is_dir(self, *, follow_symlinks: bool = ...) -> bool: ... - def is_file(self, *, follow_symlinks: bool = ...) -> bool: ... - def is_symlink(self) -> bool: ... - def stat(self, *, follow_symlinks: bool = ...) -> stat_result: ... +class DirEntry(Generic[AnyStr]): + # This is what the scandir interator yields + # The constructor is hidden + + name: AnyStr + path: AnyStr + def inode(self) -> int: ... + def is_dir(self, *, follow_symlinks: bool = ...) -> bool: ... + def is_file(self, *, follow_symlinks: bool = ...) -> bool: ... + def is_symlink(self) -> bool: ... + def stat(self, *, follow_symlinks: bool = ...) -> stat_result: ... + def __fspath__(self) -> AnyStr: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... - def __fspath__(self) -> AnyStr: ... -else: - class DirEntry(Generic[AnyStr]): - # This is what the scandir interator yields - # The constructor is hidden - - name: AnyStr - path: AnyStr - def inode(self) -> int: ... - def is_dir(self, *, follow_symlinks: bool = ...) -> bool: ... - def is_file(self, *, follow_symlinks: bool = ...) -> bool: ... - def is_symlink(self) -> bool: ... - def stat(self, *, follow_symlinks: bool = ...) -> stat_result: ... - - -if sys.platform != 'win32': +if sys.platform != "win32": + _Tuple10Int = Tuple[int, int, int, int, int, int, int, int, int, int] + _Tuple11Int = Tuple[int, int, int, int, int, int, int, int, int, int, int] if sys.version_info >= (3, 7): # f_fsid was added in https://github.com/python/cpython/pull/4571 - class statvfs_result(NamedTuple): # Unix only + class statvfs_result(_Tuple10Int): # Unix only + def __new__(cls, seq: Union[_Tuple10Int, _Tuple11Int], dict: Dict[str, int] = ...) -> statvfs_result: ... + n_fields: int + n_sequence_fields: int + n_unnamed_fields: int + f_bsize: int f_frsize: int f_blocks: int @@ -288,9 +311,13 @@ f_favail: int f_flag: int f_namemax: int - f_fsid: int + f_fsid: int = ... else: - class statvfs_result(NamedTuple): # Unix only + class statvfs_result(_Tuple10Int): # Unix only + n_fields: int + n_sequence_fields: int + n_unnamed_fields: int + f_bsize: int f_frsize: int f_blocks: int @@ -302,27 +329,17 @@ f_flag: int f_namemax: int - # ----- os function stubs ----- -if sys.version_info >= (3, 6): - def fsencode(filename: Union[str, bytes, PathLike[Any]]) -> bytes: ... -else: - def fsencode(filename: Union[str, bytes]) -> bytes: ... - -if sys.version_info >= (3, 6): - def fsdecode(filename: Union[str, bytes, PathLike[Any]]) -> str: ... -else: - def fsdecode(filename: Union[str, bytes]) -> str: ... - -if sys.version_info >= (3, 6): - @overload - def fspath(path: str) -> str: ... - @overload - def fspath(path: bytes) -> bytes: ... - @overload - def fspath(path: PathLike[Any]) -> Any: ... - +def fsencode(filename: Union[str, bytes, PathLike[Any]]) -> bytes: ... +def fsdecode(filename: Union[str, bytes, PathLike[Any]]) -> str: ... +@overload +def fspath(path: str) -> str: ... +@overload +def fspath(path: bytes) -> bytes: ... +@overload +def fspath(path: PathLike[AnyStr]) -> AnyStr: ... def get_exec_path(env: Optional[Mapping[str, str]] = ...) -> List[str]: ... + # NOTE: get_exec_path(): returns List[bytes] when env not None def getlogin() -> str: ... def getpid() -> int: ... @@ -330,7 +347,7 @@ def strerror(__code: int) -> str: ... def umask(__mask: int) -> int: ... -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only def ctermid() -> str: ... def getegid() -> int: ... @@ -365,43 +382,123 @@ def uname() -> uname_result: ... @overload -def getenv(key: Text) -> Optional[str]: ... +def getenv(key: str) -> Optional[str]: ... @overload -def getenv(key: Text, default: _T) -> Union[str, _T]: ... +def getenv(key: str, default: _T) -> Union[str, _T]: ... if sys.platform != "win32": @overload def getenvb(key: bytes) -> Optional[bytes]: ... @overload def getenvb(key: bytes, default: _T = ...) -> Union[bytes, _T]: ... -def putenv(__name: Union[bytes, Text], __value: Union[bytes, Text]) -> None: ... + +def putenv(__name: Union[bytes, str], __value: Union[bytes, str]) -> None: ... + if sys.platform != "win32": - def unsetenv(__name: Union[bytes, Text]) -> None: ... + def unsetenv(__name: Union[bytes, str]) -> None: ... -# Return IO or TextIO -def fdopen(fd: int, mode: str = ..., buffering: int = ..., encoding: Optional[str] = ..., - errors: str = ..., newline: str = ..., closefd: bool = ...) -> Any: ... +_Opener = Callable[[str, int], int] +@overload +def fdopen( + fd: int, + mode: OpenTextMode = ..., + buffering: int = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> _TextIOWrapper: ... +@overload +def fdopen( + fd: int, + mode: OpenBinaryMode, + buffering: Literal[0], + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> FileIO: ... +@overload +def fdopen( + fd: int, + mode: OpenBinaryModeUpdating, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> BufferedRandom: ... +@overload +def fdopen( + fd: int, + mode: OpenBinaryModeWriting, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> BufferedWriter: ... +@overload +def fdopen( + fd: int, + mode: OpenBinaryModeReading, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> BufferedReader: ... +@overload +def fdopen( + fd: int, + mode: OpenBinaryMode, + buffering: int, + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> BinaryIO: ... +@overload +def fdopen( + fd: int, + mode: str, + buffering: int = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., +) -> IO[Any]: ... def close(fd: int) -> None: ... def closerange(__fd_low: int, __fd_high: int) -> None: ... def device_encoding(fd: int) -> Optional[str]: ... def dup(__fd: int) -> int: ... + if sys.version_info >= (3, 7): def dup2(fd: int, fd2: int, inheritable: bool = ...) -> int: ... + else: def dup2(fd: int, fd2: int, inheritable: bool = ...) -> None: ... + def fstat(fd: int) -> stat_result: ... -def fsync(fd: int) -> None: ... +def fsync(fd: FileDescriptorLike) -> None: ... def lseek(__fd: int, __position: int, __how: int) -> int: ... def open(path: AnyPath, flags: int, mode: int = ..., *, dir_fd: Optional[int] = ...) -> int: ... def pipe() -> Tuple[int, int]: ... def read(__fd: int, __length: int) -> bytes: ... -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only def fchmod(fd: int, mode: int) -> None: ... def fchown(fd: int, uid: int, gid: int) -> None: ... if sys.platform != "darwin": - def fdatasync(fd: int) -> None: ... # Unix only, not Mac + def fdatasync(fd: FileDescriptorLike) -> None: ... # Unix only, not Mac def fpathconf(__fd: int, __name: Union[str, int]) -> int: ... def fstatvfs(__fd: int) -> statvfs_result: ... def ftruncate(__fd: int, __length: int) -> None: ... @@ -419,119 +516,118 @@ @overload def sendfile(__out_fd: int, __in_fd: int, offset: Optional[int], count: int) -> int: ... @overload - def sendfile(__out_fd: int, __in_fd: int, offset: int, count: int, - headers: Sequence[bytes] = ..., trailers: Sequence[bytes] = ..., flags: int = ...) -> int: ... # FreeBSD and Mac OS X only + def sendfile( + __out_fd: int, + __in_fd: int, + offset: int, + count: int, + headers: Sequence[bytes] = ..., + trailers: Sequence[bytes] = ..., + flags: int = ..., + ) -> int: ... # FreeBSD and Mac OS X only def readv(__fd: int, __buffers: Sequence[bytearray]) -> int: ... def writev(__fd: int, __buffers: Sequence[bytes]) -> int: ... class terminal_size(Tuple[int, int]): columns: int lines: int -def get_terminal_size(fd: int = ...) -> terminal_size: ... +def get_terminal_size(fd: int = ...) -> terminal_size: ... def get_inheritable(__fd: int) -> bool: ... def set_inheritable(__fd: int, __inheritable: bool) -> None: ... -if sys.platform != 'win32': +if sys.platform != "win32": # Unix only def tcgetpgrp(__fd: int) -> int: ... def tcsetpgrp(__fd: int, __pgid: int) -> None: ... def ttyname(__fd: int) -> str: ... + def write(__fd: int, __data: bytes) -> int: ... def access( - path: _FdOrAnyPath, - mode: int, - *, - dir_fd: Optional[int] = ..., - effective_ids: bool = ..., - follow_symlinks: bool = ..., + path: _FdOrAnyPath, mode: int, *, dir_fd: Optional[int] = ..., effective_ids: bool = ..., follow_symlinks: bool = ... ) -> bool: ... def chdir(path: _FdOrAnyPath) -> None: ... if sys.platform != "win32": - def fchdir(fd: int) -> None: ... + def fchdir(fd: FileDescriptorLike) -> None: ... + def getcwd() -> str: ... def getcwdb() -> bytes: ... def chmod(path: _FdOrAnyPath, mode: int, *, dir_fd: Optional[int] = ..., follow_symlinks: bool = ...) -> None: ... -if sys.platform != 'win32': + +if sys.platform != "win32": def chflags(path: AnyPath, flags: int, follow_symlinks: bool = ...) -> None: ... # some flavors of Unix - def chown(path: _FdOrAnyPath, uid: int, gid: int, *, dir_fd: Optional[int] = ..., follow_symlinks: bool = ...) -> None: ... # Unix only -if sys.platform != 'win32': + def chown( + path: _FdOrAnyPath, uid: int, gid: int, *, dir_fd: Optional[int] = ..., follow_symlinks: bool = ... + ) -> None: ... # Unix only + +if sys.platform != "win32": # Unix only def chroot(path: AnyPath) -> None: ... def lchflags(path: AnyPath, flags: int) -> None: ... def lchmod(path: AnyPath, mode: int) -> None: ... def lchown(path: AnyPath, uid: int, gid: int) -> None: ... + def link( - src: AnyPath, - dst: AnyPath, - *, - src_dir_fd: Optional[int] = ..., - dst_dir_fd: Optional[int] = ..., - follow_symlinks: bool = ..., + src: AnyPath, dst: AnyPath, *, src_dir_fd: Optional[int] = ..., dst_dir_fd: Optional[int] = ..., follow_symlinks: bool = ... ) -> None: ... - def lstat(path: AnyPath, *, dir_fd: Optional[int] = ...) -> stat_result: ... def mkdir(path: AnyPath, mode: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... -if sys.platform != 'win32': + +if sys.platform != "win32": def mkfifo(path: AnyPath, mode: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... # Unix only + def makedirs(name: AnyPath, mode: int = ..., exist_ok: bool = ...) -> None: ... + if sys.platform != "win32": def mknod(path: AnyPath, mode: int = ..., device: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... def major(__device: int) -> int: ... def minor(__device: int) -> int: ... def makedev(__major: int, __minor: int) -> int: ... def pathconf(path: _FdOrAnyPath, name: Union[str, int]) -> int: ... # Unix only -if sys.version_info >= (3, 6): - def readlink(path: Union[AnyStr, PathLike[AnyStr]], *, dir_fd: Optional[int] = ...) -> AnyStr: ... -else: - def readlink(path: AnyStr, *, dir_fd: Optional[int] = ...) -> AnyStr: ... + +def readlink(path: Union[AnyStr, PathLike[AnyStr]], *, dir_fd: Optional[int] = ...) -> AnyStr: ... def remove(path: AnyPath, *, dir_fd: Optional[int] = ...) -> None: ... def removedirs(name: AnyPath) -> None: ... def rename(src: AnyPath, dst: AnyPath, *, src_dir_fd: Optional[int] = ..., dst_dir_fd: Optional[int] = ...) -> None: ... def renames(old: AnyPath, new: AnyPath) -> None: ... def replace(src: AnyPath, dst: AnyPath, *, src_dir_fd: Optional[int] = ..., dst_dir_fd: Optional[int] = ...) -> None: ... def rmdir(path: AnyPath, *, dir_fd: Optional[int] = ...) -> None: ... + +class _ScandirIterator(Iterator[DirEntry[AnyStr]], ContextManager[_ScandirIterator[AnyStr]]): + def __next__(self) -> DirEntry[AnyStr]: ... + def close(self) -> None: ... + if sys.version_info >= (3, 7): - class _ScandirIterator(Iterator[DirEntry[AnyStr]], ContextManager[_ScandirIterator[AnyStr]]): - def __next__(self) -> DirEntry[AnyStr]: ... - def close(self) -> None: ... @overload def scandir(path: None = ...) -> _ScandirIterator[str]: ... @overload def scandir(path: int) -> _ScandirIterator[str]: ... @overload def scandir(path: Union[AnyStr, PathLike[AnyStr]]) -> _ScandirIterator[AnyStr]: ... -elif sys.version_info >= (3, 6): - class _ScandirIterator(Iterator[DirEntry[AnyStr]], ContextManager[_ScandirIterator[AnyStr]]): - def __next__(self) -> DirEntry[AnyStr]: ... - def close(self) -> None: ... + +else: @overload def scandir(path: None = ...) -> _ScandirIterator[str]: ... @overload def scandir(path: Union[AnyStr, PathLike[AnyStr]]) -> _ScandirIterator[AnyStr]: ... -else: - @overload - def scandir(path: None = ...) -> Iterator[DirEntry[str]]: ... - @overload - def scandir(path: AnyStr) -> Iterator[DirEntry[AnyStr]]: ... + def stat(path: _FdOrAnyPath, *, dir_fd: Optional[int] = ..., follow_symlinks: bool = ...) -> stat_result: ... + if sys.version_info < (3, 7): @overload def stat_float_times() -> bool: ... @overload def stat_float_times(__newvalue: bool) -> None: ... -if sys.platform != 'win32': + +if sys.platform != "win32": def statvfs(path: _FdOrAnyPath) -> statvfs_result: ... # Unix only -def symlink( - src: AnyPath, - dst: AnyPath, - target_is_directory: bool = ..., - *, - dir_fd: Optional[int] = ..., -) -> None: ... -if sys.platform != 'win32': + +def symlink(src: AnyPath, dst: AnyPath, target_is_directory: bool = ..., *, dir_fd: Optional[int] = ...) -> None: ... + +if sys.platform != "win32": def sync() -> None: ... # Unix only + def truncate(path: _FdOrAnyPath, length: int) -> None: ... # Unix only up to version 3.4 def unlink(path: AnyPath, *, dir_fd: Optional[int] = ...) -> None: ... def utime( @@ -545,61 +641,82 @@ _OnError = Callable[[OSError], Any] -if sys.version_info >= (3, 6): - def walk(top: Union[AnyStr, PathLike[AnyStr]], topdown: bool = ..., - onerror: Optional[_OnError] = ..., - followlinks: bool = ...) -> Iterator[Tuple[AnyStr, List[AnyStr], - List[AnyStr]]]: ... -else: - def walk(top: AnyStr, topdown: bool = ..., onerror: Optional[_OnError] = ..., - followlinks: bool = ...) -> Iterator[Tuple[AnyStr, List[AnyStr], - List[AnyStr]]]: ... -if sys.platform != 'win32': +def walk( + top: Union[AnyStr, PathLike[AnyStr]], topdown: bool = ..., onerror: Optional[_OnError] = ..., followlinks: bool = ... +) -> Iterator[Tuple[AnyStr, List[AnyStr], List[AnyStr]]]: ... + +if sys.platform != "win32": if sys.version_info >= (3, 7): @overload - def fwalk(top: Union[str, PathLike[str]] = ..., topdown: bool = ..., - onerror: Optional[_OnError] = ..., *, follow_symlinks: bool = ..., - dir_fd: Optional[int] = ...) -> Iterator[Tuple[str, List[str], List[str], int]]: ... + def fwalk( + top: Union[str, PathLike[str]] = ..., + topdown: bool = ..., + onerror: Optional[_OnError] = ..., + *, + follow_symlinks: bool = ..., + dir_fd: Optional[int] = ..., + ) -> Iterator[Tuple[str, List[str], List[str], int]]: ... @overload - def fwalk(top: bytes, topdown: bool = ..., - onerror: Optional[_OnError] = ..., *, follow_symlinks: bool = ..., - dir_fd: Optional[int] = ...) -> Iterator[Tuple[bytes, List[bytes], List[bytes], int]]: ... - elif sys.version_info >= (3, 6): - def fwalk(top: Union[str, PathLike[str]] = ..., topdown: bool = ..., - onerror: Optional[_OnError] = ..., *, follow_symlinks: bool = ..., - dir_fd: Optional[int] = ...) -> Iterator[Tuple[str, List[str], List[str], int]]: ... + def fwalk( + top: bytes, + topdown: bool = ..., + onerror: Optional[_OnError] = ..., + *, + follow_symlinks: bool = ..., + dir_fd: Optional[int] = ..., + ) -> Iterator[Tuple[bytes, List[bytes], List[bytes], int]]: ... else: - def fwalk(top: str = ..., topdown: bool = ..., - onerror: Optional[_OnError] = ..., *, follow_symlinks: bool = ..., - dir_fd: Optional[int] = ...) -> Iterator[Tuple[str, List[str], List[str], int]]: ... + def fwalk( + top: Union[str, PathLike[str]] = ..., + topdown: bool = ..., + onerror: Optional[_OnError] = ..., + *, + follow_symlinks: bool = ..., + dir_fd: Optional[int] = ..., + ) -> Iterator[Tuple[str, List[str], List[str], int]]: ... if sys.platform == "linux": def getxattr(path: _FdOrAnyPath, attribute: AnyPath, *, follow_symlinks: bool = ...) -> bytes: ... def listxattr(path: _FdOrAnyPath, *, follow_symlinks: bool = ...) -> List[str]: ... def removexattr(path: _FdOrAnyPath, attribute: AnyPath, *, follow_symlinks: bool = ...) -> None: ... - def setxattr(path: _FdOrAnyPath, attribute: AnyPath, value: bytes, flags: int = ..., *, - follow_symlinks: bool = ...) -> None: ... + def setxattr( + path: _FdOrAnyPath, attribute: AnyPath, value: bytes, flags: int = ..., *, follow_symlinks: bool = ... + ) -> None: ... def abort() -> NoReturn: ... + # These are defined as execl(file, *args) but the first *arg is mandatory. -def execl(file: AnyPath, __arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> NoReturn: ... -def execlp(file: AnyPath, __arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> NoReturn: ... +def execl(file: AnyPath, __arg0: AnyPath, *args: AnyPath) -> NoReturn: ... +def execlp(file: AnyPath, __arg0: AnyPath, *args: AnyPath) -> NoReturn: ... # These are: execle(file, *args, env) but env is pulled from the last element of the args. -def execle(file: AnyPath, __arg0: Union[bytes, Text], *args: Any) -> NoReturn: ... -def execlpe(file: AnyPath, __arg0: Union[bytes, Text], *args: Any) -> NoReturn: ... +def execle(file: AnyPath, __arg0: AnyPath, *args: Any) -> NoReturn: ... +def execlpe(file: AnyPath, __arg0: AnyPath, *args: Any) -> NoReturn: ... # The docs say `args: tuple or list of strings` # The implementation enforces tuple or list so we can't use Sequence. -_ExecVArgs = Union[Tuple[Union[bytes, Text], ...], List[bytes], List[Text], List[Union[bytes, Text]]] +# Not separating out PathLike[str] and PathLike[bytes] here because it doesn't make much difference +# in practice, and doing so would explode the number of combinations in this already long union. +# All these combinations are necessary due to List being invariant. +_ExecVArgs = Union[ + Tuple[AnyPath, ...], + List[bytes], + List[str], + List[PathLike[Any]], + List[Union[bytes, str]], + List[Union[bytes, PathLike[Any]]], + List[Union[str, PathLike[Any]]], + List[Union[bytes, str, PathLike[Any]]], +] _ExecEnv = Union[Mapping[bytes, Union[bytes, str]], Mapping[str, Union[bytes, str]]] + def execv(__path: AnyPath, __argv: _ExecVArgs) -> NoReturn: ... def execve(path: _FdOrAnyPath, argv: _ExecVArgs, env: _ExecEnv) -> NoReturn: ... def execvp(file: AnyPath, args: _ExecVArgs) -> NoReturn: ... def execvpe(file: AnyPath, args: _ExecVArgs, env: _ExecEnv) -> NoReturn: ... - def _exit(status: int) -> NoReturn: ... def kill(__pid: int, __signal: int) -> None: ... -if sys.platform != 'win32': + +if sys.platform != "win32": # Unix only def fork() -> int: ... def forkpty() -> Tuple[int, int]: ... # some flavors of Unix @@ -610,31 +727,32 @@ class _wrap_close(_TextIOWrapper): def close(self) -> Optional[int]: ... # type: ignore + def popen(cmd: str, mode: str = ..., buffering: int = ...) -> _wrap_close: ... +def spawnl(mode: int, file: AnyPath, arg0: AnyPath, *args: AnyPath) -> int: ... +def spawnle(mode: int, file: AnyPath, arg0: AnyPath, *args: Any) -> int: ... # Imprecise sig + +if sys.platform != "win32": + def spawnv(mode: int, file: AnyPath, args: _ExecVArgs) -> int: ... + def spawnve(mode: int, file: AnyPath, args: _ExecVArgs, env: _ExecEnv) -> int: ... -def spawnl(mode: int, file: AnyPath, arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> int: ... -def spawnle(mode: int, file: AnyPath, arg0: Union[bytes, Text], - *args: Any) -> int: ... # Imprecise sig -if sys.platform != "win32": - def spawnv(mode: int, file: AnyPath, args: List[Union[bytes, Text]]) -> int: ... - def spawnve(mode: int, file: AnyPath, args: List[Union[bytes, Text]], - env: _ExecEnv) -> int: ... else: - def spawnv(__mode: int, __path: AnyPath, __argv: List[Union[bytes, Text]]) -> int: ... - def spawnve(__mode: int, __path: AnyPath, __argv: List[Union[bytes, Text]], - __env: _ExecEnv) -> int: ... + def spawnv(__mode: int, __path: AnyPath, __argv: _ExecVArgs) -> int: ... + def spawnve(__mode: int, __path: AnyPath, __argv: _ExecVArgs, __env: _ExecEnv) -> int: ... + def system(command: AnyPath) -> int: ... def times() -> times_result: ... def waitpid(__pid: int, __options: int) -> Tuple[int, int]: ... -if sys.platform == 'win32': +if sys.platform == "win32": def startfile(path: AnyPath, operation: Optional[str] = ...) -> None: ... + else: # Unix only - def spawnlp(mode: int, file: AnyPath, arg0: Union[bytes, Text], *args: Union[bytes, Text]) -> int: ... - def spawnlpe(mode: int, file: AnyPath, arg0: Union[bytes, Text], *args: Any) -> int: ... # Imprecise signature - def spawnvp(mode: int, file: AnyPath, args: List[Union[bytes, Text]]) -> int: ... - def spawnvpe(mode: int, file: AnyPath, args: List[Union[bytes, Text]], env: _ExecEnv) -> int: ... + def spawnlp(mode: int, file: AnyPath, arg0: AnyPath, *args: AnyPath) -> int: ... + def spawnlpe(mode: int, file: AnyPath, arg0: AnyPath, *args: Any) -> int: ... # Imprecise signature + def spawnvp(mode: int, file: AnyPath, args: _ExecVArgs) -> int: ... + def spawnvpe(mode: int, file: AnyPath, args: _ExecVArgs, env: _ExecEnv) -> int: ... def wait() -> Tuple[int, int]: ... # Unix only from posix import waitid_result def waitid(idtype: int, ident: int, options: int) -> waitid_result: ... @@ -649,7 +767,7 @@ def WSTOPSIG(status: int) -> int: ... def WTERMSIG(status: int) -> int: ... -if sys.platform != 'win32': +if sys.platform != "win32": from posix import sched_param def sched_get_priority_min(policy: int) -> int: ... # some flavors of Unix def sched_get_priority_max(policy: int) -> int: ... # some flavors of Unix @@ -663,14 +781,16 @@ def sched_getaffinity(pid: int) -> Set[int]: ... # some flavors of Unix def cpu_count() -> Optional[int]: ... -if sys.platform != 'win32': + +if sys.platform != "win32": # Unix only def confstr(__name: Union[str, int]) -> Optional[str]: ... def getloadavg() -> Tuple[float, float, float]: ... def sysconf(__name: Union[str, int]) -> int: ... -if sys.version_info >= (3, 6): - if sys.platform == "linux": - def getrandom(size: int, flags: int = ...) -> bytes: ... + +if sys.platform == "linux": + def getrandom(size: int, flags: int = ...) -> bytes: ... + def urandom(__size: int) -> bytes: ... if sys.version_info >= (3, 7) and sys.platform != "win32": @@ -685,6 +805,7 @@ if sys.platform == "win32": class _AddedDllDirectory: path: Optional[str] + def __init__(self, path: Optional[str], cookie: _T, remove_dll_directory: Callable[[_T], Any]) -> None: ... def close(self) -> None: ... def __enter__(self: _T) -> _T: ... def __exit__(self, *args: Any) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/os/path.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/os/path.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/os/path.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/os/path.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,10 @@ -# NB: path.pyi and stdlib/2 and stdlib/3 must remain consistent! import os import sys -from typing import overload, List, Any, AnyStr, Sequence, Tuple, TypeVar, Text, Callable, Optional +from _typeshed import AnyPath, BytesPath, StrPath from genericpath import exists as exists -from _typeshed import StrPath, BytesPath, AnyPath +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Tuple, TypeVar, overload -_T = TypeVar('_T') +_T = TypeVar("_T") if sys.version_info >= (3, 6): from builtins import _PathLike @@ -16,7 +15,7 @@ curdir: str pardir: str sep: str -if sys.platform == 'win32': +if sys.platform == "win32": altsep: str else: altsep: Optional[str] @@ -56,7 +55,7 @@ def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... @overload def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': + if sys.platform == "win32": @overload def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... @overload @@ -75,7 +74,7 @@ def expandvars(path: AnyStr) -> AnyStr: ... def normcase(s: AnyStr) -> AnyStr: ... def normpath(path: AnyStr) -> AnyStr: ... - if sys.platform == 'win32': + if sys.platform == "win32": def realpath(path: AnyStr) -> AnyStr: ... else: def realpath(filename: AnyStr) -> AnyStr: ... @@ -84,14 +83,13 @@ # In reality it returns str for sequences of StrPath and bytes for sequences # of BytesPath, but mypy does not accept such a signature. def commonpath(paths: Sequence[AnyPath]) -> Any: ... + elif sys.version_info >= (3, 5): def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... # NOTE: Empty lists results in '' (str) regardless of contained type. -# Also, in Python 2 mixed sequences of Text and bytes results in either Text or bytes # So, fall back to Any def commonprefix(m: Sequence[AnyPath]) -> Any: ... - def lexists(path: AnyPath) -> bool: ... # These return float if os.stat_float_times() == True, @@ -99,7 +97,6 @@ def getatime(filename: AnyPath) -> float: ... def getmtime(filename: AnyPath) -> float: ... def getctime(filename: AnyPath) -> float: ... - def getsize(filename: AnyPath) -> int: ... def isabs(s: AnyPath) -> bool: ... def isfile(path: AnyPath) -> bool: ... @@ -107,34 +104,19 @@ def islink(path: AnyPath) -> bool: ... def ismount(path: AnyPath) -> bool: ... -if sys.version_info < (3, 0): - # Make sure signatures are disjunct, and allow combinations of bytes and unicode. - # (Since Python 2 allows that, too) - # Note that e.g. os.path.join("a", "b", "c", "d", u"e") will still result in - # a type error. - @overload - def join(__p1: bytes, *p: bytes) -> bytes: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: bytes, __p4: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: bytes, __p3: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: bytes, __p2: Text, *p: AnyPath) -> Text: ... - @overload - def join(__p1: Text, *p: AnyPath) -> Text: ... -elif sys.version_info >= (3, 6): +if sys.version_info >= (3, 6): @overload - def join(a: StrPath, *paths: StrPath) -> Text: ... + def join(a: StrPath, *paths: StrPath) -> str: ... @overload def join(a: BytesPath, *paths: BytesPath) -> bytes: ... + else: def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... @overload def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... @overload -def relpath(path: StrPath, start: Optional[StrPath] = ...) -> Text: ... - +def relpath(path: StrPath, start: Optional[StrPath] = ...) -> str: ... def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... def sameopenfile(fp1: int, fp2: int) -> bool: ... def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... @@ -152,13 +134,11 @@ def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... @overload def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + else: def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... -if sys.version_info < (3, 7) and sys.platform == 'win32': +if sys.version_info < (3, 7) and sys.platform == "win32": def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated - -if sys.version_info < (3,): - def walk(path: AnyStr, visit: Callable[[_T, AnyStr, List[AnyStr]], Any], arg: _T) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/pathlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/pathlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/pathlib.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/pathlib.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,22 @@ -from _typeshed import OpenBinaryMode, OpenTextMode -from typing import (Any, BinaryIO, Generator, IO, List, Optional, Sequence, - TextIO, Tuple, Type, TypeVar, Union, overload) -from types import TracebackType import os import sys +from _typeshed import OpenBinaryMode, OpenBinaryModeReading, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenTextMode +from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper +from types import TracebackType +from typing import IO, Any, BinaryIO, Generator, List, Optional, Sequence, TextIO, Tuple, Type, TypeVar, Union, overload +from typing_extensions import Literal + +if sys.version_info >= (3, 9): + from types import GenericAlias -_P = TypeVar('_P', bound=PurePath) +_P = TypeVar("_P", bound=PurePath) if sys.version_info >= (3, 6): _PurePathBase = os.PathLike[str] + _PathLike = os.PathLike[str] else: _PurePathBase = object + _PathLike = PurePath class PurePath(_PurePathBase): parts: Tuple[str, ...] @@ -21,25 +27,14 @@ suffix: str suffixes: List[str] stem: str - if sys.version_info < (3, 5): - def __init__(self, *pathsegments: str) -> None: ... - elif sys.version_info < (3, 6): - def __new__(cls: Type[_P], *args: Union[str, PurePath]) -> _P: ... - else: - def __new__(cls: Type[_P], *args: Union[str, os.PathLike[str]]) -> _P: ... + def __new__(cls: Type[_P], *args: Union[str, _PathLike]) -> _P: ... def __hash__(self) -> int: ... def __lt__(self, other: PurePath) -> bool: ... def __le__(self, other: PurePath) -> bool: ... def __gt__(self, other: PurePath) -> bool: ... def __ge__(self, other: PurePath) -> bool: ... - if sys.version_info < (3, 6): - def __truediv__(self: _P, key: Union[str, PurePath]) -> _P: ... - def __rtruediv__(self: _P, key: Union[str, PurePath]) -> _P: ... - else: - def __truediv__(self: _P, key: Union[str, os.PathLike[str]]) -> _P: ... - def __rtruediv__(self: _P, key: Union[str, os.PathLike[str]]) -> _P: ... - if sys.version_info < (3,): - def __div__(self: _P, key: Union[str, PurePath]) -> _P: ... + def __truediv__(self: _P, key: Union[str, _PathLike]) -> _P: ... + def __rtruediv__(self: _P, key: Union[str, _PathLike]) -> _P: ... def __bytes__(self) -> bytes: ... def as_posix(self) -> str: ... def as_uri(self) -> str: ... @@ -48,32 +43,28 @@ if sys.version_info >= (3, 9): def is_relative_to(self, *other: Union[str, os.PathLike[str]]) -> bool: ... def match(self, path_pattern: str) -> bool: ... - if sys.version_info < (3, 6): - def relative_to(self: _P, *other: Union[str, PurePath]) -> _P: ... - else: - def relative_to(self: _P, *other: Union[str, os.PathLike[str]]) -> _P: ... + def relative_to(self: _P, *other: Union[str, _PathLike]) -> _P: ... def with_name(self: _P, name: str) -> _P: ... if sys.version_info >= (3, 9): def with_stem(self: _P, stem: str) -> _P: ... def with_suffix(self: _P, suffix: str) -> _P: ... - if sys.version_info < (3, 6): - def joinpath(self: _P, *other: Union[str, PurePath]) -> _P: ... - else: - def joinpath(self: _P, *other: Union[str, os.PathLike[str]]) -> _P: ... - + def joinpath(self: _P, *other: Union[str, _PathLike]) -> _P: ... @property def parents(self: _P) -> Sequence[_P]: ... @property def parent(self: _P) -> _P: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, type: Any) -> GenericAlias: ... class PurePosixPath(PurePath): ... class PureWindowsPath(PurePath): ... class Path(PurePath): + def __new__(cls: Type[_P], *args: Union[str, _PathLike], **kwargs: Any) -> _P: ... def __enter__(self) -> Path: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_value: Optional[BaseException], - traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> Optional[bool]: ... @classmethod def cwd(cls: Type[_P]) -> _P: ... def stat(self) -> os.stat_result: ... @@ -93,21 +84,66 @@ def iterdir(self) -> Generator[Path, None, None]: ... def lchmod(self, mode: int) -> None: ... def lstat(self) -> os.stat_result: ... - if sys.version_info < (3, 5): - def mkdir(self, mode: int = ..., - parents: bool = ...) -> None: ... - else: - def mkdir(self, mode: int = ..., parents: bool = ..., - exist_ok: bool = ...) -> None: ... + def mkdir(self, mode: int = ..., parents: bool = ..., exist_ok: bool = ...) -> None: ... + # Adapted from builtins.open + # Text mode: always returns a TextIOWrapper + @overload + def open( + self, + mode: OpenTextMode = ..., + buffering: int = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + ) -> TextIOWrapper: ... + # Unbuffered binary mode: returns a FileIO + @overload + def open( + self, mode: OpenBinaryMode, buffering: Literal[0], encoding: None = ..., errors: None = ..., newline: None = ... + ) -> FileIO: ... + # Buffering is on: return BufferedRandom, BufferedReader, or BufferedWriter + @overload + def open( + self, + mode: OpenBinaryModeUpdating, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + ) -> BufferedRandom: ... + @overload + def open( + self, + mode: OpenBinaryModeWriting, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + ) -> BufferedWriter: ... @overload - def open(self, mode: OpenTextMode = ..., buffering: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ..., - newline: Optional[str] = ...) -> TextIO: ... + def open( + self, + mode: OpenBinaryModeReading, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + ) -> BufferedReader: ... + # Buffering cannot be determined: fall back to BinaryIO @overload - def open(self, mode: OpenBinaryMode, buffering: int = ..., encoding: None = ..., errors: None = ..., - newline: None = ...) -> BinaryIO: ... + def open( + self, mode: OpenBinaryMode, buffering: int, encoding: None = ..., errors: None = ..., newline: None = ... + ) -> BinaryIO: ... + # Fallback if mode is not specified @overload - def open(self, mode: str, buffering: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ..., - newline: Optional[str] = ...) -> IO[Any]: ... + def open( + self, + mode: str, + buffering: int = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + ) -> IO[Any]: ... def owner(self) -> str: ... if sys.version_info >= (3, 9): def readlink(self: _P) -> _P: ... @@ -117,42 +153,26 @@ else: def rename(self, target: Union[str, PurePath]) -> None: ... def replace(self, target: Union[str, PurePath]) -> None: ... - if sys.version_info < (3, 6): - def resolve(self: _P) -> _P: ... - else: - def resolve(self: _P, strict: bool = ...) -> _P: ... + def resolve(self: _P, strict: bool = ...) -> _P: ... def rglob(self, pattern: str) -> Generator[Path, None, None]: ... def rmdir(self) -> None: ... - def symlink_to(self, target: Union[str, Path], - target_is_directory: bool = ...) -> None: ... + def symlink_to(self, target: Union[str, Path], target_is_directory: bool = ...) -> None: ... def touch(self, mode: int = ..., exist_ok: bool = ...) -> None: ... if sys.version_info >= (3, 8): def unlink(self, missing_ok: bool = ...) -> None: ... else: def unlink(self) -> None: ... - - if sys.version_info >= (3, 5): - @classmethod - def home(cls: Type[_P]) -> _P: ... - if sys.version_info < (3, 6): - def __new__(cls: Type[_P], *args: Union[str, PurePath], - **kwargs: Any) -> _P: ... - else: - def __new__(cls: Type[_P], *args: Union[str, os.PathLike[str]], - **kwargs: Any) -> _P: ... - - def absolute(self: _P) -> _P: ... - def expanduser(self: _P) -> _P: ... - def read_bytes(self) -> bytes: ... - def read_text(self, encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> str: ... - def samefile(self, other_path: Union[str, bytes, int, Path]) -> bool: ... - def write_bytes(self, data: bytes) -> int: ... - def write_text(self, data: str, encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> int: ... + @classmethod + def home(cls: Type[_P]) -> _P: ... + def absolute(self: _P) -> _P: ... + def expanduser(self: _P) -> _P: ... + def read_bytes(self) -> bytes: ... + def read_text(self, encoding: Optional[str] = ..., errors: Optional[str] = ...) -> str: ... + def samefile(self, other_path: Union[str, bytes, int, Path]) -> bool: ... + def write_bytes(self, data: bytes) -> int: ... + def write_text(self, data: str, encoding: Optional[str] = ..., errors: Optional[str] = ...) -> int: ... if sys.version_info >= (3, 8): def link_to(self, target: Union[str, bytes, os.PathLike[str]]) -> None: ... - class PosixPath(Path, PurePosixPath): ... class WindowsPath(Path, PureWindowsPath): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/pipes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/pipes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/pipes.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/pipes.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,15 @@ +import os + +class Template: + def __init__(self) -> None: ... + def reset(self) -> None: ... + def clone(self) -> Template: ... + def debug(self, flag: bool) -> None: ... + def append(self, cmd: str, kind: str) -> None: ... + def prepend(self, cmd: str, kind: str) -> None: ... + def open(self, file: str, rw: str) -> os._wrap_close: ... + def copy(self, file: str, rw: str) -> os._wrap_close: ... + +# Not documented, but widely used. +# Documented as shlex.quote since 3.3. +def quote(s: str) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/posixpath.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/posixpath.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/posixpath.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/posixpath.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,144 @@ +import os +import sys +from _typeshed import AnyPath, BytesPath, StrPath +from genericpath import exists as exists +from typing import Any, AnyStr, Callable, List, Optional, Sequence, Tuple, TypeVar, overload + +_T = TypeVar("_T") + +if sys.version_info >= (3, 6): + from builtins import _PathLike + +# ----- os.path variables ----- +supports_unicode_filenames: bool +# aliases (also in os) +curdir: str +pardir: str +sep: str +if sys.platform == "win32": + altsep: str +else: + altsep: Optional[str] +extsep: str +pathsep: str +defpath: str +devnull: str + +# ----- os.path function stubs ----- +if sys.version_info >= (3, 6): + # Overloads are necessary to work around python/mypy#3644. + @overload + def abspath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def abspath(path: AnyStr) -> AnyStr: ... + @overload + def basename(p: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def basename(p: AnyStr) -> AnyStr: ... + @overload + def dirname(p: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def dirname(p: AnyStr) -> AnyStr: ... + @overload + def expanduser(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def expanduser(path: AnyStr) -> AnyStr: ... + @overload + def expandvars(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def expandvars(path: AnyStr) -> AnyStr: ... + @overload + def normcase(s: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def normcase(s: AnyStr) -> AnyStr: ... + @overload + def normpath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def normpath(path: AnyStr) -> AnyStr: ... + if sys.platform == "win32": + @overload + def realpath(path: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def realpath(path: AnyStr) -> AnyStr: ... + else: + @overload + def realpath(filename: _PathLike[AnyStr]) -> AnyStr: ... + @overload + def realpath(filename: AnyStr) -> AnyStr: ... + +else: + def abspath(path: AnyStr) -> AnyStr: ... + def basename(p: AnyStr) -> AnyStr: ... + def dirname(p: AnyStr) -> AnyStr: ... + def expanduser(path: AnyStr) -> AnyStr: ... + def expandvars(path: AnyStr) -> AnyStr: ... + def normcase(s: AnyStr) -> AnyStr: ... + def normpath(path: AnyStr) -> AnyStr: ... + if sys.platform == "win32": + def realpath(path: AnyStr) -> AnyStr: ... + else: + def realpath(filename: AnyStr) -> AnyStr: ... + +if sys.version_info >= (3, 6): + # In reality it returns str for sequences of StrPath and bytes for sequences + # of BytesPath, but mypy does not accept such a signature. + def commonpath(paths: Sequence[AnyPath]) -> Any: ... + +elif sys.version_info >= (3, 5): + def commonpath(paths: Sequence[AnyStr]) -> AnyStr: ... + +# NOTE: Empty lists results in '' (str) regardless of contained type. +# So, fall back to Any +def commonprefix(m: Sequence[AnyPath]) -> Any: ... +def lexists(path: AnyPath) -> bool: ... + +# These return float if os.stat_float_times() == True, +# but int is a subclass of float. +def getatime(filename: AnyPath) -> float: ... +def getmtime(filename: AnyPath) -> float: ... +def getctime(filename: AnyPath) -> float: ... +def getsize(filename: AnyPath) -> int: ... +def isabs(s: AnyPath) -> bool: ... +def isfile(path: AnyPath) -> bool: ... +def isdir(s: AnyPath) -> bool: ... +def islink(path: AnyPath) -> bool: ... +def ismount(path: AnyPath) -> bool: ... + +if sys.version_info >= (3, 6): + @overload + def join(a: StrPath, *paths: StrPath) -> str: ... + @overload + def join(a: BytesPath, *paths: BytesPath) -> bytes: ... + +else: + def join(a: AnyStr, *paths: AnyStr) -> AnyStr: ... + +@overload +def relpath(path: BytesPath, start: Optional[BytesPath] = ...) -> bytes: ... +@overload +def relpath(path: StrPath, start: Optional[StrPath] = ...) -> str: ... +def samefile(f1: AnyPath, f2: AnyPath) -> bool: ... +def sameopenfile(fp1: int, fp2: int) -> bool: ... +def samestat(s1: os.stat_result, s2: os.stat_result) -> bool: ... + +if sys.version_info >= (3, 6): + @overload + def split(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitdrive(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitext(p: _PathLike[AnyStr]) -> Tuple[AnyStr, AnyStr]: ... + @overload + def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +else: + def split(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + def splitdrive(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + def splitext(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... + +if sys.version_info < (3, 7) and sys.platform == "win32": + def splitunc(p: AnyStr) -> Tuple[AnyStr, AnyStr]: ... # deprecated diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/posix.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/posix.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/posix.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/posix.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,7 @@ -# Stubs for posix - -# NOTE: These are incomplete! - import sys -from typing import List, NamedTuple, Optional, overload - +from builtins import _PathLike # See comment in builtins from os import stat_result as stat_result - -if sys.version_info >= (3, 6): - from builtins import _PathLike # See comment in builtins +from typing import Dict, List, NamedTuple, Optional, overload class uname_result(NamedTuple): sysname: str @@ -34,6 +27,11 @@ class sched_param(NamedTuple): sched_priority: int +CLD_CONTINUED: int +CLD_DUMPED: int +CLD_EXITED: int +CLD_TRAPPED: int + EX_CANTCREAT: int EX_CONFIG: int EX_DATAERR: int @@ -57,9 +55,13 @@ W_OK: int X_OK: int -if sys.version_info >= (3, 6): - GRND_NONBLOCK: int - GRND_RANDOM: int +F_LOCK: int +F_TEST: int +F_TLOCK: int +F_ULOCK: int + +GRND_NONBLOCK: int +GRND_RANDOM: int NGROUPS_MAX: int O_APPEND: int @@ -83,6 +85,39 @@ O_TRUNC: int O_WRONLY: int +POSIX_FADV_DONTNEED: int +POSIX_FADV_NOREUSE: int +POSIX_FADV_NORMAL: int +POSIX_FADV_RANDOM: int +POSIX_FADV_SEQUENTIAL: int +POSIX_FADV_WILLNEED: int + +PRIO_PGRP: int +PRIO_PROCESS: int +PRIO_USER: int + +P_ALL: int +P_PGID: int +P_PID: int + +RTLD_DEEPBIND: int +RTLD_GLOBAL: int +RTLD_LAZY: int +RTLD_LOCAL: int +RTLD_NODELETE: int +RTLD_NOLOAD: int +RTLD_NOW: int + +SCHED_BATCH: int +SCHED_FIFO: int +SCHED_IDLE: int +SCHED_OTHER: int +SCHED_RESET_ON_FORK: int +SCHED_RR: int + +SEEK_DATA: int +SEEK_HOLE: int + ST_APPEND: int ST_MANDLOCK: int ST_NOATIME: int @@ -97,30 +132,34 @@ TMP_MAX: int WCONTINUED: int -WCOREDUMP: int -WEXITSTATUS: int -WIFCONTINUED: int -WIFEXITED: int -WIFSIGNALED: int -WIFSTOPPED: int + +def WCOREDUMP(__status: int) -> bool: ... +def WEXITSTATUS(status: int) -> int: ... +def WIFCONTINUED(status: int) -> bool: ... +def WIFEXITED(status: int) -> bool: ... +def WIFSIGNALED(status: int) -> bool: ... +def WIFSTOPPED(status: int) -> bool: ... + WNOHANG: int -WSTOPSIG: int -WTERMSIG: int + +def WSTOPSIG(status: int) -> int: ... +def WTERMSIG(status: int) -> int: ... + WUNTRACED: int -if sys.version_info >= (3, 6): - @overload - def listdir(path: Optional[str] = ...) -> List[str]: ... - @overload - def listdir(path: bytes) -> List[bytes]: ... - @overload - def listdir(path: int) -> List[str]: ... - @overload - def listdir(path: _PathLike[str]) -> List[str]: ... +XATTR_CREATE: int +XATTR_REPLACE: int +XATTR_SIZE_MAX: int +@overload +def listdir(path: Optional[str] = ...) -> List[str]: ... +@overload +def listdir(path: bytes) -> List[bytes]: ... +@overload +def listdir(path: int) -> List[str]: ... +@overload +def listdir(path: _PathLike[str]) -> List[str]: ... + +if sys.platform == "win32": + environ: Dict[str, str] else: - @overload - def listdir(path: Optional[str] = ...) -> List[str]: ... - @overload - def listdir(path: bytes) -> List[bytes]: ... - @overload - def listdir(path: int) -> List[str]: ... + environ: Dict[bytes, bytes] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/queue.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/queue.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/queue.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/queue.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,11 @@ -# Stubs for queue - -# NOTE: These are incomplete! - -from threading import Condition, Lock -from typing import Any, TypeVar, Generic, Optional import sys +from threading import Condition, Lock +from typing import Any, Generic, Optional, TypeVar + +if sys.version_info >= (3, 9): + from types import GenericAlias -_T = TypeVar('_T') +_T = TypeVar("_T") class Empty(Exception): ... class Full(Exception): ... @@ -20,7 +19,6 @@ all_tasks_done: Condition # undocumented unfinished_tasks: int # undocumented queue: Any # undocumented - def __init__(self, maxsize: int = ...) -> None: ... def _init(self, maxsize: int) -> None: ... def empty(self) -> bool: ... @@ -35,6 +33,8 @@ def qsize(self) -> int: ... def _qsize(self) -> int: ... def task_done(self) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class PriorityQueue(Queue[_T]): ... class LifoQueue(Queue[_T]): ... @@ -48,3 +48,5 @@ def put(self, item: _T, block: bool = ..., timeout: Optional[float] = ...) -> None: ... def put_nowait(self, item: _T) -> None: ... def qsize(self) -> int: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/random.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/random.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/random.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/random.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,8 @@ -# Stubs for random -# Ron Murawski -# Updated by Jukka Lehtosalo - -# based on http://docs.python.org/3.2/library/random.html - -# ----- random classes ----- - import _random import sys -from typing import Any, TypeVar, Sequence, Iterable, List, Callable, AbstractSet, Union, Optional, Tuple +from typing import AbstractSet, Any, Callable, Iterable, List, MutableSequence, Optional, Sequence, Tuple, TypeVar, Union -_T = TypeVar('_T') +_T = TypeVar("_T") class Random(_random.Random): def __init__(self, x: Any = ...) -> None: ... @@ -18,16 +10,24 @@ def getstate(self) -> Tuple[Any, ...]: ... def setstate(self, state: Tuple[Any, ...]) -> None: ... def getrandbits(self, __k: int) -> int: ... - def randrange(self, start: int, stop: Union[int, None] = ..., step: int = ...) -> int: ... + def randrange(self, start: int, stop: Optional[int] = ..., step: int = ...) -> int: ... def randint(self, a: int, b: int) -> int: ... if sys.version_info >= (3, 9): def randbytes(self, n: int) -> bytes: ... def choice(self, seq: Sequence[_T]) -> _T: ... - if sys.version_info >= (3, 6): - def choices(self, population: Sequence[_T], weights: Optional[Sequence[float]] = ..., *, cum_weights: Optional[Sequence[float]] = ..., k: int = ...) -> List[_T]: ... - def shuffle(self, x: List[Any], random: Union[Callable[[], float], None] = ...) -> None: ... + def choices( + self, + population: Sequence[_T], + weights: Optional[Sequence[float]] = ..., + *, + cum_weights: Optional[Sequence[float]] = ..., + k: int = ..., + ) -> List[_T]: ... + def shuffle(self, x: MutableSequence[Any], random: Optional[Callable[[], float]] = ...) -> None: ... if sys.version_info >= (3, 9): - def sample(self, population: Union[Sequence[_T], AbstractSet[_T]], k: int, *, counts: Optional[Iterable[_T]] = ...) -> List[_T]: ... + def sample( + self, population: Union[Sequence[_T], AbstractSet[_T]], k: int, *, counts: Optional[Iterable[_T]] = ... + ) -> List[_T]: ... else: def sample(self, population: Union[Sequence[_T], AbstractSet[_T]], k: int) -> List[_T]: ... def random(self) -> float: ... @@ -44,8 +44,7 @@ def weibullvariate(self, alpha: float, beta: float) -> float: ... # SystemRandom is not implemented for all OS's; good on Windows & Linux -class SystemRandom(Random): - ... +class SystemRandom(Random): ... # ----- random function stubs ----- def seed(a: Any = ..., version: int = ...) -> None: ... @@ -54,20 +53,29 @@ def getrandbits(__k: int) -> int: ... def randrange(start: int, stop: Union[None, int] = ..., step: int = ...) -> int: ... def randint(a: int, b: int) -> int: ... + if sys.version_info >= (3, 9): def randbytes(n: int) -> bytes: ... + def choice(seq: Sequence[_T]) -> _T: ... -if sys.version_info >= (3, 6): - def choices(population: Sequence[_T], weights: Optional[Sequence[float]] = ..., *, cum_weights: Optional[Sequence[float]] = ..., k: int = ...) -> List[_T]: ... -def shuffle(x: List[Any], random: Union[Callable[[], float], None] = ...) -> None: ... +def choices( + population: Sequence[_T], + weights: Optional[Sequence[float]] = ..., + *, + cum_weights: Optional[Sequence[float]] = ..., + k: int = ..., +) -> List[_T]: ... +def shuffle(x: MutableSequence[Any], random: Optional[Callable[[], float]] = ...) -> None: ... + if sys.version_info >= (3, 9): def sample(population: Union[Sequence[_T], AbstractSet[_T]], k: int, *, counts: Optional[Iterable[_T]] = ...) -> List[_T]: ... + else: def sample(population: Union[Sequence[_T], AbstractSet[_T]], k: int) -> List[_T]: ... + def random() -> float: ... def uniform(a: float, b: float) -> float: ... -def triangular(low: float = ..., high: float = ..., - mode: Optional[float] = ...) -> float: ... +def triangular(low: float = ..., high: float = ..., mode: Optional[float] = ...) -> float: ... def betavariate(alpha: float, beta: float) -> float: ... def expovariate(lambd: float) -> float: ... def gammavariate(alpha: float, beta: float) -> float: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/re.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/re.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/re.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/re.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,62 +1,14 @@ -# Stubs for re -# Ron Murawski -# 'bytes' support added by Jukka Lehtosalo - -# based on: http://docs.python.org/3.2/library/re.html -# and http://hg.python.org/cpython/file/618ea5612e83/Lib/re.py - +import enum import sys -from typing import ( - List, Iterator, overload, Callable, Tuple, - AnyStr, Any, Optional, Union -) +from typing import Any, AnyStr, Callable, Iterator, List, Optional, Tuple, Union, overload # ----- re variables and constants ----- if sys.version_info >= (3, 7): - from typing import Pattern as Pattern, Match as Match + from typing import Match as Match, Pattern as Pattern else: - from typing import Pattern, Match + from typing import Match, Pattern -if sys.version_info >= (3, 6): - import enum - class RegexFlag(enum.IntFlag): - A: int - ASCII: int - DEBUG: int - I: int - IGNORECASE: int - L: int - LOCALE: int - M: int - MULTILINE: int - S: int - DOTALL: int - X: int - VERBOSE: int - U: int - UNICODE: int - T: int - TEMPLATE: int - - A = RegexFlag.A - ASCII = RegexFlag.ASCII - DEBUG = RegexFlag.DEBUG - I = RegexFlag.I - IGNORECASE = RegexFlag.IGNORECASE - L = RegexFlag.L - LOCALE = RegexFlag.LOCALE - M = RegexFlag.M - MULTILINE = RegexFlag.MULTILINE - S = RegexFlag.S - DOTALL = RegexFlag.DOTALL - X = RegexFlag.X - VERBOSE = RegexFlag.VERBOSE - U = RegexFlag.U - UNICODE = RegexFlag.UNICODE - T = RegexFlag.T - TEMPLATE = RegexFlag.TEMPLATE - _FlagsType = Union[int, RegexFlag] -else: +class RegexFlag(enum.IntFlag): A: int ASCII: int DEBUG: int @@ -74,24 +26,45 @@ UNICODE: int T: int TEMPLATE: int - _FlagsType = int + +A = RegexFlag.A +ASCII = RegexFlag.ASCII +DEBUG = RegexFlag.DEBUG +I = RegexFlag.I +IGNORECASE = RegexFlag.IGNORECASE +L = RegexFlag.L +LOCALE = RegexFlag.LOCALE +M = RegexFlag.M +MULTILINE = RegexFlag.MULTILINE +S = RegexFlag.S +DOTALL = RegexFlag.DOTALL +X = RegexFlag.X +VERBOSE = RegexFlag.VERBOSE +U = RegexFlag.U +UNICODE = RegexFlag.UNICODE +T = RegexFlag.T +TEMPLATE = RegexFlag.TEMPLATE +_FlagsType = Union[int, RegexFlag] if sys.version_info < (3, 7): # undocumented _pattern_type: type -class error(Exception): ... +class error(Exception): + msg: str + pattern: str + pos: Optional[int] + lineno: Optional[int] + colno: Optional[int] @overload def compile(pattern: AnyStr, flags: _FlagsType = ...) -> Pattern[AnyStr]: ... @overload def compile(pattern: Pattern[AnyStr], flags: _FlagsType = ...) -> Pattern[AnyStr]: ... - @overload def search(pattern: AnyStr, string: AnyStr, flags: _FlagsType = ...) -> Optional[Match[AnyStr]]: ... @overload def search(pattern: Pattern[AnyStr], string: AnyStr, flags: _FlagsType = ...) -> Optional[Match[AnyStr]]: ... - @overload def match(pattern: AnyStr, string: AnyStr, flags: _FlagsType = ...) -> Optional[Match[AnyStr]]: ... @overload @@ -102,14 +75,10 @@ def fullmatch(pattern: AnyStr, string: AnyStr, flags: _FlagsType = ...) -> Optional[Match[AnyStr]]: ... @overload def fullmatch(pattern: Pattern[AnyStr], string: AnyStr, flags: _FlagsType = ...) -> Optional[Match[AnyStr]]: ... - @overload -def split(pattern: AnyStr, string: AnyStr, - maxsplit: int = ..., flags: _FlagsType = ...) -> List[AnyStr]: ... +def split(pattern: AnyStr, string: AnyStr, maxsplit: int = ..., flags: _FlagsType = ...) -> List[AnyStr]: ... @overload -def split(pattern: Pattern[AnyStr], string: AnyStr, - maxsplit: int = ..., flags: _FlagsType = ...) -> List[AnyStr]: ... - +def split(pattern: Pattern[AnyStr], string: AnyStr, maxsplit: int = ..., flags: _FlagsType = ...) -> List[AnyStr]: ... @overload def findall(pattern: AnyStr, string: AnyStr, flags: _FlagsType = ...) -> List[Any]: ... @overload @@ -120,41 +89,35 @@ # matches are returned in the order found. Empty matches are included in the # result unless they touch the beginning of another match. @overload -def finditer(pattern: AnyStr, string: AnyStr, - flags: _FlagsType = ...) -> Iterator[Match[AnyStr]]: ... +def finditer(pattern: AnyStr, string: AnyStr, flags: _FlagsType = ...) -> Iterator[Match[AnyStr]]: ... @overload -def finditer(pattern: Pattern[AnyStr], string: AnyStr, - flags: _FlagsType = ...) -> Iterator[Match[AnyStr]]: ... - +def finditer(pattern: Pattern[AnyStr], string: AnyStr, flags: _FlagsType = ...) -> Iterator[Match[AnyStr]]: ... @overload -def sub(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> AnyStr: ... +def sub(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ..., flags: _FlagsType = ...) -> AnyStr: ... @overload -def sub(pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., flags: _FlagsType = ...) -> AnyStr: ... +def sub( + pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: _FlagsType = ... +) -> AnyStr: ... @overload -def sub(pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> AnyStr: ... +def sub(pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ..., flags: _FlagsType = ...) -> AnyStr: ... @overload -def sub(pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., flags: _FlagsType = ...) -> AnyStr: ... - +def sub( + pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: _FlagsType = ... +) -> AnyStr: ... @overload -def subn(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> Tuple[AnyStr, int]: ... +def subn(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ..., flags: _FlagsType = ...) -> Tuple[AnyStr, int]: ... @overload -def subn(pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> Tuple[AnyStr, int]: ... +def subn( + pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: _FlagsType = ... +) -> Tuple[AnyStr, int]: ... @overload -def subn(pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> Tuple[AnyStr, int]: ... +def subn( + pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ..., flags: _FlagsType = ... +) -> Tuple[AnyStr, int]: ... @overload -def subn(pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr], - string: AnyStr, count: int = ..., - flags: _FlagsType = ...) -> Tuple[AnyStr, int]: ... - +def subn( + pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ..., flags: _FlagsType = ... +) -> Tuple[AnyStr, int]: ... def escape(pattern: AnyStr) -> AnyStr: ... - def purge() -> None: ... def template(pattern: Union[AnyStr, Pattern[AnyStr]], flags: _FlagsType = ...) -> Pattern[AnyStr]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/resource.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/resource.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/resource.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/resource.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for resource - import sys -from typing import Tuple, Optional, NamedTuple +from typing import NamedTuple, Optional, Tuple, overload RLIMIT_AS: int RLIMIT_CORE: int @@ -47,7 +45,11 @@ def getrlimit(__resource: int) -> Tuple[int, int]: ... def getrusage(__who: int) -> _RUsage: ... def setrlimit(__resource: int, __limits: Tuple[int, int]) -> None: ... + if sys.platform == "linux": - def prlimit(pid: int, resource: int, limits: Optional[Tuple[int, int]]) -> Tuple[int, int]: ... + @overload + def prlimit(pid: int, resource: int, limits: Tuple[int, int]) -> Tuple[int, int]: ... + @overload + def prlimit(pid: int, resource: int) -> Tuple[int, int]: ... error = OSError diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/selectors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/selectors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/selectors.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/selectors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ import sys +from _typeshed import FileDescriptor, FileDescriptorLike from abc import ABCMeta, abstractmethod from typing import Any, List, Mapping, NamedTuple, Optional, Tuple -from _typeshed import FileDescriptor, FileDescriptorLike _EventMask = int @@ -17,24 +17,16 @@ class BaseSelector(metaclass=ABCMeta): @abstractmethod def register(self, fileobj: FileDescriptorLike, events: _EventMask, data: Any = ...) -> SelectorKey: ... - @abstractmethod def unregister(self, fileobj: FileDescriptorLike) -> SelectorKey: ... - def modify(self, fileobj: FileDescriptorLike, events: _EventMask, data: Any = ...) -> SelectorKey: ... - @abstractmethod def select(self, timeout: Optional[float] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... - def close(self) -> None: ... - def get_key(self, fileobj: FileDescriptorLike) -> SelectorKey: ... - @abstractmethod def get_map(self) -> Mapping[FileDescriptorLike, SelectorKey]: ... - def __enter__(self) -> BaseSelector: ... - def __exit__(self, *args: Any) -> None: ... class SelectSelector(BaseSelector): @@ -44,13 +36,11 @@ def get_map(self) -> Mapping[FileDescriptorLike, SelectorKey]: ... if sys.platform != "win32": - class PollSelector(BaseSelector): def register(self, fileobj: FileDescriptorLike, events: _EventMask, data: Any = ...) -> SelectorKey: ... def unregister(self, fileobj: FileDescriptorLike) -> SelectorKey: ... def select(self, timeout: Optional[float] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... def get_map(self) -> Mapping[FileDescriptorLike, SelectorKey]: ... - class EpollSelector(BaseSelector): def fileno(self) -> int: ... def register(self, fileobj: FileDescriptorLike, events: _EventMask, data: Any = ...) -> SelectorKey: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/signal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/signal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/signal.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/signal.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,13 +1,10 @@ -"""Stub file for the 'signal' module.""" - import sys from enum import IntEnum -from typing import Any, Callable, Tuple, Union, Optional, Iterable, Set from types import FrameType +from typing import Any, Callable, Iterable, Optional, Set, Tuple, Union if sys.platform != "win32": class ItimerError(IOError): ... - ITIMER_PROF: int ITIMER_REAL: int ITIMER_VIRTUAL: int @@ -78,13 +75,12 @@ SIG_BLOCK: int SIG_UNBLOCK: int SIG_SETMASK: int - SIG_BLOCK = Sigmasks.SIG_BLOCK SIG_UNBLOCK = Sigmasks.SIG_UNBLOCK SIG_SETMASK = Sigmasks.SIG_SETMASK _SIGNUM = Union[int, Signals] -_HANDLER = Union[Callable[[Signals, FrameType], None], int, Handlers, None] +_HANDLER = Union[Callable[[Signals, FrameType], Any], int, Handlers, None] SIGABRT: Signals if sys.platform != "win32": @@ -161,23 +157,36 @@ if sys.platform != "win32": def alarm(__seconds: int) -> int: ... + def default_int_handler(signum: int, frame: FrameType) -> None: ... + if sys.platform != "win32": def getitimer(__which: int) -> Tuple[float, float]: ... + def getsignal(__signalnum: _SIGNUM) -> _HANDLER: ... + if sys.version_info >= (3, 8): def strsignal(__signalnum: _SIGNUM) -> Optional[str]: ... def valid_signals() -> Set[Signals]: ... def raise_signal(__signalnum: _SIGNUM) -> None: ... + if sys.platform != "win32": def pause() -> None: ... def pthread_kill(__thread_id: int, __signalnum: int) -> None: ... def pthread_sigmask(__how: int, __mask: Iterable[int]) -> Set[_SIGNUM]: ... -def set_wakeup_fd(fd: int) -> int: ... + +if sys.version_info >= (3, 7): + def set_wakeup_fd(fd: int, *, warn_on_full_buffer: bool = ...) -> int: ... + +else: + def set_wakeup_fd(fd: int) -> int: ... + if sys.platform != "win32": def setitimer(__which: int, __seconds: float, __interval: float = ...) -> Tuple[float, float]: ... def siginterrupt(__signalnum: int, __flag: bool) -> None: ... + def signal(__signalnum: _SIGNUM, __handler: _HANDLER) -> _HANDLER: ... + if sys.platform != "win32": def sigpending() -> Any: ... def sigtimedwait(sigset: Iterable[int], timeout: float) -> Optional[struct_siginfo]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_sitebuiltins.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_sitebuiltins.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_sitebuiltins.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_sitebuiltins.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,16 +1,14 @@ -from typing import Optional, NoReturn, ClassVar, Iterable +from typing import ClassVar, Iterable, NoReturn, Optional from typing_extensions import Literal class Quitter: name: str eof: str - def __init__(self, name: str, eof: str) -> None: ... def __call__(self, code: Optional[int] = ...) -> NoReturn: ... class _Printer: MAXLINES: ClassVar[Literal[23]] - def __init__(self, name: str, data: str, files: Iterable[str] = ..., dirs: Iterable[str] = ...) -> None: ... def __call__(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/socketserver.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/socketserver.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/socketserver.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/socketserver.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,7 @@ -# NB: SocketServer.pyi and socketserver.pyi must remain consistent! -# Stubs for socketserver - -from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Tuple, Type, Text, Union -from socket import SocketType import sys import types +from socket import SocketType +from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Tuple, Type, Union class BaseServer: address_family: int @@ -15,53 +12,58 @@ request_queue_size: int socket_type: int timeout: Optional[float] - def __init__(self, server_address: Any, - RequestHandlerClass: Callable[..., BaseRequestHandler]) -> None: ... + def __init__(self, server_address: Any, RequestHandlerClass: Callable[..., BaseRequestHandler]) -> None: ... def fileno(self) -> int: ... def handle_request(self) -> None: ... def serve_forever(self, poll_interval: float = ...) -> None: ... def shutdown(self) -> None: ... def server_close(self) -> None: ... - def finish_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... - def get_request(self) -> None: ... - def handle_error(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def finish_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... + def get_request(self) -> Tuple[SocketType, Tuple[str, int]]: ... + def handle_error(self, request: bytes, client_address: Tuple[str, int]) -> None: ... def handle_timeout(self) -> None: ... - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... def server_activate(self) -> None: ... def server_bind(self) -> None: ... - def verify_request(self, request: bytes, - client_address: Tuple[str, int]) -> bool: ... + def verify_request(self, request: bytes, client_address: Tuple[str, int]) -> bool: ... if sys.version_info >= (3, 6): def __enter__(self) -> BaseServer: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_val: Optional[BaseException], - exc_tb: Optional[types.TracebackType]) -> None: ... - if sys.version_info >= (3, 3): - def service_actions(self) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[types.TracebackType] + ) -> None: ... + def service_actions(self) -> None: ... class TCPServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Tuple[str, int], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... class UDPServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Tuple[str, int], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... -if sys.platform != 'win32': +if sys.platform != "win32": class UnixStreamServer(BaseServer): - def __init__(self, server_address: Union[Text, bytes], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... - + def __init__( + self, + server_address: Union[str, bytes], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... class UnixDatagramServer(BaseServer): - def __init__(self, server_address: Union[Text, bytes], - RequestHandlerClass: Callable[..., BaseRequestHandler], - bind_and_activate: bool = ...) -> None: ... + def __init__( + self, + server_address: Union[str, bytes], + RequestHandlerClass: Callable[..., BaseRequestHandler], + bind_and_activate: bool = ..., + ) -> None: ... if sys.platform != "win32": class ForkingMixIn: @@ -75,10 +77,8 @@ else: def collect_children(self) -> None: ... # undocumented def handle_timeout(self) -> None: ... # undocumented - if sys.version_info >= (3, 3): - def service_actions(self) -> None: ... # undocumented - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def service_actions(self) -> None: ... # undocumented + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... if sys.version_info >= (3, 6): def server_close(self) -> None: ... @@ -86,23 +86,22 @@ daemon_threads: bool if sys.version_info >= (3, 7): block_on_close: bool - def process_request_thread(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... # undocumented - def process_request(self, request: bytes, - client_address: Tuple[str, int]) -> None: ... + def process_request_thread(self, request: bytes, client_address: Tuple[str, int]) -> None: ... # undocumented + def process_request(self, request: bytes, client_address: Tuple[str, int]) -> None: ... if sys.version_info >= (3, 6): def server_close(self) -> None: ... if sys.platform != "win32": class ForkingTCPServer(ForkingMixIn, TCPServer): ... class ForkingUDPServer(ForkingMixIn, UDPServer): ... + class ThreadingTCPServer(ThreadingMixIn, TCPServer): ... class ThreadingUDPServer(ThreadingMixIn, UDPServer): ... -if sys.platform != 'win32': + +if sys.platform != "win32": class ThreadingUnixStreamServer(ThreadingMixIn, UnixStreamServer): ... class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): ... - class BaseRequestHandler: # Those are technically of types, respectively: # * Union[SocketType, Tuple[bytes, SocketType]] @@ -113,7 +112,6 @@ request: Any client_address: Any server: BaseServer - def __init__(self, request: Any, client_address: Any, server: BaseServer) -> None: ... def setup(self) -> None: ... def handle(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sre_constants.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sre_constants.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sre_constants.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sre_constants.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,3 @@ -# Source: https://github.com/python/cpython/blob/master/Lib/sre_constants.py - from typing import Any, Dict, List, Optional, Union MAGIC: int @@ -39,7 +37,6 @@ SRE_INFO_LITERAL: int SRE_INFO_CHARSET: int - # Stubgen above; manually defined constants below (dynamic at runtime) # from OPCODES diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sre_parse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sre_parse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sre_parse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sre_parse.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,6 @@ -# Source: https://github.com/python/cpython/blob/master/Lib/sre_parse.py - -from typing import ( - Any, Dict, FrozenSet, Iterable, List, Match, - Optional, Pattern as _Pattern, Tuple, Union -) import sys from sre_constants import _NamedIntConstant as _NIC, error as _Error +from typing import Any, Dict, FrozenSet, Iterable, List, Match, Optional, Pattern as _Pattern, Tuple, Union, overload SPECIAL_CHARS: str REPEAT_CHARS: str @@ -17,10 +12,9 @@ ESCAPES: Dict[str, Tuple[_NIC, int]] CATEGORIES: Dict[str, Union[Tuple[_NIC, _NIC], Tuple[_NIC, List[Tuple[_NIC, _NIC]]]]] FLAGS: Dict[str, int] -if sys.version_info >= (3, 6): - GLOBAL_FLAGS: int +GLOBAL_FLAGS: int - class Verbose(Exception): ... +class Verbose(Exception): ... class _State: flags: int @@ -40,7 +34,6 @@ else: Pattern = _State - _OpSubpatternType = Tuple[Optional[int], int, int, SubPattern] _OpGroupRefExistsType = Tuple[int, SubPattern, SubPattern] _OpInType = List[Tuple[_NIC, int]] @@ -48,7 +41,6 @@ _AvType = Union[_OpInType, _OpBranchType, Iterable[SubPattern], _OpGroupRefExistsType, _OpSubpatternType] _CodeType = Tuple[_NIC, _AvType] - class SubPattern: data: List[_CodeType] width: Optional[int] @@ -59,7 +51,6 @@ else: pattern: Pattern def __init__(self, pattern: Pattern, data: Optional[List[_CodeType]] = ...) -> None: ... - def dump(self, level: int = ...) -> None: ... def __len__(self) -> int: ... def __delitem__(self, index: Union[int, slice]) -> None: ... @@ -69,7 +60,6 @@ def append(self, code: _CodeType) -> None: ... def getwidth(self) -> int: ... - class Tokenizer: istext: bool string: Any @@ -84,19 +74,28 @@ def getuntil(self, terminator: str, name: str) -> str: ... else: def getuntil(self, terminator: str) -> str: ... - if sys.version_info >= (3, 6): - @property - def pos(self) -> int: ... + @property + def pos(self) -> int: ... def tell(self) -> int: ... def seek(self, index: int) -> None: ... def error(self, msg: str, offset: int = ...) -> _Error: ... def fix_flags(src: Union[str, bytes], flags: int) -> int: ... -_TemplateType = Tuple[List[Tuple[int, int]], List[str]] + +_TemplateType = Tuple[List[Tuple[int, int]], List[Optional[str]]] +_TemplateByteType = Tuple[List[Tuple[int, int]], List[Optional[bytes]]] if sys.version_info >= (3, 8): def parse(str: str, flags: int = ..., state: Optional[State] = ...) -> SubPattern: ... + @overload def parse_template(source: str, state: _Pattern[Any]) -> _TemplateType: ... + @overload + def parse_template(source: bytes, state: _Pattern[Any]) -> _TemplateByteType: ... + else: def parse(str: str, flags: int = ..., pattern: Optional[Pattern] = ...) -> SubPattern: ... + @overload def parse_template(source: str, pattern: _Pattern[Any]) -> _TemplateType: ... + @overload + def parse_template(source: bytes, pattern: _Pattern[Any]) -> _TemplateByteType: ... + def expand_template(template: _TemplateType, match: Match[Any]) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/statistics.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/statistics.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/statistics.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/statistics.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,12 @@ -# Stubs for statistics - +import sys +from _typeshed import SupportsLessThanT from decimal import Decimal from fractions import Fraction -import sys -from typing import Any, Iterable, List, Optional, SupportsFloat, Type, TypeVar, Union, Protocol, Hashable +from typing import Any, Hashable, Iterable, List, Optional, Protocol, SupportsFloat, Type, TypeVar, Union _T = TypeVar("_T") # Most functions in this module accept homogeneous collections of one of these types -_Number = TypeVar('_Number', float, Decimal, Fraction) - -# Used in median_high, median_low -class _Sortable(Protocol): - def __lt__(self, other) -> bool: ... -_SortableT = TypeVar("_SortableT", bound=_Sortable) +_Number = TypeVar("_Number", float, Decimal, Fraction) # Used in mode, multimode _HashableT = TypeVar("_HashableT", bound=Hashable) @@ -22,20 +16,24 @@ if sys.version_info >= (3, 8): def fmean(data: Iterable[SupportsFloat]) -> float: ... def geometric_mean(data: Iterable[SupportsFloat]) -> float: ... + def mean(data: Iterable[_Number]) -> _Number: ... -if sys.version_info >= (3, 6): - def harmonic_mean(data: Iterable[_Number]) -> _Number: ... +def harmonic_mean(data: Iterable[_Number]) -> _Number: ... def median(data: Iterable[_Number]) -> _Number: ... -def median_low(data: Iterable[_SortableT]) -> _SortableT: ... -def median_high(data: Iterable[_SortableT]) -> _SortableT: ... +def median_low(data: Iterable[SupportsLessThanT]) -> SupportsLessThanT: ... +def median_high(data: Iterable[SupportsLessThanT]) -> SupportsLessThanT: ... def median_grouped(data: Iterable[_Number], interval: _Number = ...) -> _Number: ... def mode(data: Iterable[_HashableT]) -> _HashableT: ... + if sys.version_info >= (3, 8): def multimode(data: Iterable[_HashableT]) -> List[_HashableT]: ... + def pstdev(data: Iterable[_Number], mu: Optional[_Number] = ...) -> _Number: ... def pvariance(data: Iterable[_Number], mu: Optional[_Number] = ...) -> _Number: ... + if sys.version_info >= (3, 8): def quantiles(data: Iterable[_Number], *, n: int = ..., method: str = ...) -> List[_Number]: ... + def stdev(data: Iterable[_Number], xbar: Optional[_Number] = ...) -> _Number: ... def variance(data: Iterable[_Number], xbar: Optional[_Number] = ...) -> _Number: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/subprocess.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/subprocess.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/subprocess.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/subprocess.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,11 @@ import sys -from typing import Sequence, Any, Mapping, Callable, Tuple, IO, Optional, Union, Type, Text, Generic, TypeVar, AnyStr, overload +from _typeshed import AnyPath from types import TracebackType +from typing import IO, Any, AnyStr, Callable, Generic, Mapping, Optional, Sequence, Tuple, Type, TypeVar, Union, overload from typing_extensions import Literal -from _typeshed import AnyPath + +if sys.version_info >= (3, 9): + from types import GenericAlias # We prefer to annotate inputs to methods (eg subprocess.check_call) with these # union types. @@ -19,14 +22,14 @@ # except TimeoutError as e: # reveal_type(e.cmd) # Any, but morally is _CMD _FILE = Union[None, int, IO[Any]] -_TXT = Union[bytes, Text] +_TXT = Union[bytes, str] # Python 3.6 does't support _CMD being a single PathLike. # See: https://bugs.python.org/issue31961 _CMD = Union[_TXT, Sequence[AnyPath]] -_ENV = Union[Mapping[bytes, _TXT], Mapping[Text, _TXT]] +_ENV = Union[Mapping[bytes, _TXT], Mapping[str, _TXT]] -_S = TypeVar('_S') -_T = TypeVar('_T') +_S = TypeVar("_S") +_T = TypeVar("_T") class CompletedProcess(Generic[_T]): # morally: _CMD @@ -38,6 +41,8 @@ stderr: _T def __init__(self, args: _CMD, returncode: int, stdout: Optional[_T] = ..., stderr: Optional[_T] = ...) -> None: ... def check_returncode(self) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... if sys.version_info >= (3, 7): # Nearly the same args as for 3.6, except for capture_output and text @@ -210,7 +215,8 @@ text: Optional[bool] = ..., timeout: Optional[float] = ..., ) -> CompletedProcess[Any]: ... -elif sys.version_info >= (3, 6): + +else: # Nearly same args as Popen.__init__ except for timeout, input, and check @overload def run( @@ -343,15 +349,135 @@ input: Optional[_TXT] = ..., timeout: Optional[float] = ..., ) -> CompletedProcess[Any]: ... -else: - # Nearly same args as Popen.__init__ except for timeout, input, and check + +# Same args as Popen.__init__ +def call( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stdout: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., +) -> int: ... + +# Same args as Popen.__init__ +def check_call( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stdout: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + timeout: Optional[float] = ..., +) -> int: ... + +if sys.version_info >= (3, 7): + # 3.7 added text @overload - def run( + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + text: Literal[True], + ) -> str: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: str, + errors: Optional[str] = ..., + text: Optional[bool] = ..., + ) -> str: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: str, + text: Optional[bool] = ..., + ) -> str: ... + @overload + def check_output( args: _CMD, bufsize: int = ..., executable: AnyPath = ..., stdin: _FILE = ..., - stdout: _FILE = ..., stderr: _FILE = ..., preexec_fn: Callable[[], Any] = ..., close_fds: bool = ..., @@ -365,18 +491,19 @@ restore_signals: bool = ..., start_new_session: bool = ..., pass_fds: Any = ..., - # where the *real* keyword only args start - check: bool = ..., - input: Optional[str] = ..., + # where the real keyword only ones start timeout: Optional[float] = ..., - ) -> CompletedProcess[str]: ... + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + text: Optional[bool] = ..., + ) -> str: ... @overload - def run( + def check_output( args: _CMD, bufsize: int = ..., executable: AnyPath = ..., stdin: _FILE = ..., - stdout: _FILE = ..., stderr: _FILE = ..., preexec_fn: Callable[[], Any] = ..., close_fds: bool = ..., @@ -390,17 +517,18 @@ start_new_session: bool = ..., pass_fds: Any = ..., *, - check: bool = ..., - input: Optional[bytes] = ..., timeout: Optional[float] = ..., - ) -> CompletedProcess[bytes]: ... + input: _TXT = ..., + encoding: None = ..., + errors: None = ..., + text: Literal[None, False] = ..., + ) -> bytes: ... @overload - def run( + def check_output( args: _CMD, bufsize: int = ..., executable: AnyPath = ..., stdin: _FILE = ..., - stdout: _FILE = ..., stderr: _FILE = ..., preexec_fn: Callable[[], Any] = ..., close_fds: bool = ..., @@ -414,386 +542,141 @@ start_new_session: bool = ..., pass_fds: Any = ..., *, - check: bool = ..., - input: Optional[_TXT] = ..., timeout: Optional[float] = ..., - ) -> CompletedProcess[Any]: ... - -# Same args as Popen.__init__ -def call(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stdout: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ...) -> int: ... - -# Same args as Popen.__init__ -def check_call(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stdout: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - timeout: Optional[float] = ...) -> int: ... + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + text: Optional[bool] = ..., + ) -> Any: ... # morally: -> _TXT -if sys.version_info >= (3, 7): - # 3.7 added text - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - text: Literal[True], - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: str, - errors: Optional[str] = ..., - text: Optional[bool] = ..., - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: str, - text: Optional[bool] = ..., - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - *, - universal_newlines: Literal[True], - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - # where the real keyword only ones start - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - text: Optional[bool] = ..., - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: Literal[False] = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: None = ..., - errors: None = ..., - text: Literal[None, False] = ..., - ) -> bytes: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - text: Optional[bool] = ..., - ) -> Any: ... # morally: -> _TXT -elif sys.version_info >= (3, 6): - # 3.6 added encoding and errors - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: str, - errors: Optional[str] = ..., - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: str, - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - universal_newlines: Literal[True], - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: Literal[False] = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: None = ..., - errors: None = ..., - ) -> bytes: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - timeout: Optional[float] = ..., - input: _TXT = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ..., - ) -> Any: ... # morally: -> _TXT else: @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - input: _TXT = ..., - *, - timeout: Optional[float] = ..., - universal_newlines: Literal[True], - ) -> str: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: Literal[False] = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - input: _TXT = ..., - *, - timeout: Optional[float] = ..., - ) -> bytes: ... - @overload - def check_output(args: _CMD, - bufsize: int = ..., - executable: AnyPath = ..., - stdin: _FILE = ..., - stderr: _FILE = ..., - preexec_fn: Callable[[], Any] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Any = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - input: _TXT = ..., - *, - timeout: Optional[float] = ..., - ) -> Any: ... # morally: -> _TXT - + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: str, + errors: Optional[str] = ..., + ) -> str: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: str, + ) -> str: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + universal_newlines: Literal[True], + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> str: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: Literal[False] = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: None = ..., + errors: None = ..., + ) -> bytes: ... + @overload + def check_output( + args: _CMD, + bufsize: int = ..., + executable: AnyPath = ..., + stdin: _FILE = ..., + stderr: _FILE = ..., + preexec_fn: Callable[[], Any] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Any = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + timeout: Optional[float] = ..., + input: _TXT = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Any: ... # morally: -> _TXT PIPE: int STDOUT: int DEVNULL: int + class SubprocessError(Exception): ... + class TimeoutExpired(SubprocessError): def __init__(self, cmd: _CMD, timeout: float, output: Optional[_TXT] = ..., stderr: Optional[_TXT] = ...) -> None: ... # morally: _CMD @@ -804,7 +687,6 @@ stdout: Any stderr: Any - class CalledProcessError(SubprocessError): returncode: int # morally: _CMD @@ -815,12 +697,7 @@ # morally: Optional[_TXT] stdout: Any stderr: Any - - def __init__(self, - returncode: int, - cmd: _CMD, - output: Optional[_TXT] = ..., - stderr: Optional[_TXT] = ...) -> None: ... + def __init__(self, returncode: int, cmd: _CMD, output: Optional[_TXT] = ..., stderr: Optional[_TXT] = ...) -> None: ... class Popen(Generic[AnyStr]): args: _CMD @@ -837,344 +714,318 @@ if sys.version_info >= (3, 7): # text is added in 3.7 @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - text: Optional[bool] = ..., - encoding: str, - errors: Optional[str] = ...) -> Popen[str]: ... - @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - text: Optional[bool] = ..., - encoding: Optional[str] = ..., - errors: str) -> Popen[str]: ... - @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - *, - universal_newlines: Literal[True], - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - # where the *real* keyword only args start - text: Optional[bool] = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> Popen[str]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + text: Optional[bool] = ..., + encoding: str, + errors: Optional[str] = ..., + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - text: Literal[True], - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> Popen[str]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + text: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: str, + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: Literal[False] = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - text: Literal[None, False] = ..., - encoding: None = ..., - errors: None = ...) -> Popen[bytes]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + *, + universal_newlines: Literal[True], + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + # where the *real* keyword only args start + text: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - text: Optional[bool] = ..., - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> Popen[Any]: ... - elif sys.version_info >= (3, 6): + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + text: Literal[True], + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - encoding: str, - errors: Optional[str] = ...) -> Popen[str]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: Literal[False] = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + text: Literal[None, False] = ..., + encoding: None = ..., + errors: None = ..., + ) -> Popen[bytes]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - encoding: Optional[str] = ..., - errors: str) -> Popen[str]: ... - @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - *, - universal_newlines: Literal[True], - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - # where the *real* keyword only args start - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> Popen[str]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + text: Optional[bool] = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Popen[Any]: ... + else: @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: Literal[False] = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - encoding: None = ..., - errors: None = ...) -> Popen[bytes]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + encoding: str, + errors: Optional[str] = ..., + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ..., - *, - encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> Popen[Any]: ... - else: + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + encoding: Optional[str] = ..., + errors: str, + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - *, - universal_newlines: Literal[True], - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ...) -> Popen[str]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + *, + universal_newlines: Literal[True], + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + # where the *real* keyword only args start + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Popen[str]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - *, - universal_newlines: Literal[False] = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ...) -> Popen[bytes]: ... + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: Literal[False] = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + encoding: None = ..., + errors: None = ..., + ) -> Popen[bytes]: ... @overload - def __new__(cls, - args: _CMD, - bufsize: int = ..., - executable: Optional[AnyPath] = ..., - stdin: Optional[_FILE] = ..., - stdout: Optional[_FILE] = ..., - stderr: Optional[_FILE] = ..., - preexec_fn: Optional[Callable[[], Any]] = ..., - close_fds: bool = ..., - shell: bool = ..., - cwd: Optional[AnyPath] = ..., - env: Optional[_ENV] = ..., - universal_newlines: bool = ..., - startupinfo: Optional[Any] = ..., - creationflags: int = ..., - restore_signals: bool = ..., - start_new_session: bool = ..., - pass_fds: Any = ...) -> Popen[Any]: ... - + def __new__( + cls, + args: _CMD, + bufsize: int = ..., + executable: Optional[AnyPath] = ..., + stdin: Optional[_FILE] = ..., + stdout: Optional[_FILE] = ..., + stderr: Optional[_FILE] = ..., + preexec_fn: Optional[Callable[[], Any]] = ..., + close_fds: bool = ..., + shell: bool = ..., + cwd: Optional[AnyPath] = ..., + env: Optional[_ENV] = ..., + universal_newlines: bool = ..., + startupinfo: Optional[Any] = ..., + creationflags: int = ..., + restore_signals: bool = ..., + start_new_session: bool = ..., + pass_fds: Any = ..., + *, + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + ) -> Popen[Any]: ... def poll(self) -> Optional[int]: ... if sys.version_info >= (3, 7): def wait(self, timeout: Optional[float] = ...) -> int: ... else: def wait(self, timeout: Optional[float] = ..., endtime: Optional[float] = ...) -> int: ... # Return str/bytes - def communicate(self, - input: Optional[AnyStr] = ..., - timeout: Optional[float] = ..., - # morally this should be optional - ) -> Tuple[AnyStr, AnyStr]: ... + def communicate( + self, + input: Optional[AnyStr] = ..., + timeout: Optional[float] = ..., + # morally this should be optional + ) -> Tuple[AnyStr, AnyStr]: ... def send_signal(self, sig: int) -> None: ... def terminate(self) -> None: ... def kill(self) -> None: ... def __enter__(self: _S) -> _S: ... - def __exit__(self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]) -> None: ... + def __exit__( + self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # The result really is always a str. def getstatusoutput(cmd: _TXT) -> Tuple[int, str]: ... def getoutput(cmd: _TXT) -> str: ... - def list2cmdline(seq: Sequence[str]) -> str: ... # undocumented -if sys.platform == 'win32': +if sys.platform == "win32": class STARTUPINFO: if sys.version_info >= (3, 7): - def __init__(self, *, dwFlags: int = ..., hStdInput: Optional[Any] = ..., hStdOutput: Optional[Any] = ..., hStdError: Optional[Any] = ..., wShowWindow: int = ..., lpAttributeList: Optional[Mapping[str, Any]] = ...) -> None: ... + def __init__( + self, + *, + dwFlags: int = ..., + hStdInput: Optional[Any] = ..., + hStdOutput: Optional[Any] = ..., + hStdError: Optional[Any] = ..., + wShowWindow: int = ..., + lpAttributeList: Optional[Mapping[str, Any]] = ..., + ) -> None: ... dwFlags: int hStdInput: Optional[Any] hStdOutput: Optional[Any] @@ -1182,7 +1033,6 @@ wShowWindow: int if sys.version_info >= (3, 7): lpAttributeList: Mapping[str, Any] - STD_INPUT_HANDLE: Any STD_OUTPUT_HANDLE: Any STD_ERROR_HANDLE: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sys.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sys.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/sys.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/sys.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,25 @@ -# Stubs for sys -# Ron Murawski - -# based on http://docs.python.org/3.2/library/sys.html - -from typing import ( - List, NoReturn, Sequence, Any, Dict, Tuple, TextIO, overload, Optional, - Union, TypeVar, Callable, Type -) import sys +from builtins import object as _object +from importlib.abc import MetaPathFinder, PathEntryFinder from types import FrameType, ModuleType, TracebackType +from typing import ( + Any, + AsyncGenerator, + Callable, + Dict, + List, + NoReturn, + Optional, + Sequence, + TextIO, + Tuple, + Type, + TypeVar, + Union, + overload, +) -from importlib.abc import MetaPathFinder - -_T = TypeVar('_T') +_T = TypeVar("_T") # The following type alias are stub-only and do not exist during runtime _ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType] @@ -45,7 +52,7 @@ modules: Dict[str, ModuleType] path: List[str] path_hooks: List[Any] # TODO precise type; function, path to finder -path_importer_cache: Dict[str, Any] # TODO precise type +path_importer_cache: Dict[str, Optional[PathEntryFinder]] platform: str if sys.version_info >= (3, 9): platlibdir: str @@ -70,8 +77,8 @@ winver: str _xoptions: Dict[Any, Any] - flags: _flags + class _flags: debug: int division_warning: int @@ -91,20 +98,22 @@ utf8_mode: int float_info: _float_info + class _float_info: - epsilon: float # DBL_EPSILON - dig: int # DBL_DIG - mant_dig: int # DBL_MANT_DIG - max: float # DBL_MAX - max_exp: int # DBL_MAX_EXP + epsilon: float # DBL_EPSILON + dig: int # DBL_DIG + mant_dig: int # DBL_MANT_DIG + max: float # DBL_MAX + max_exp: int # DBL_MAX_EXP max_10_exp: int # DBL_MAX_10_EXP - min: float # DBL_MIN - min_exp: int # DBL_MIN_EXP + min: float # DBL_MIN + min_exp: int # DBL_MIN_EXP min_10_exp: int # DBL_MIN_10_EXP - radix: int # FLT_RADIX - rounds: int # FLT_ROUNDS + radix: int # FLT_RADIX + rounds: int # FLT_ROUNDS hash_info: _hash_info + class _hash_info: width: int modulus: int @@ -113,6 +122,7 @@ imag: int implementation: _implementation + class _implementation: name: str version: _version_info @@ -120,6 +130,7 @@ cache_tag: str int_info: _int_info + class _int_info: bits_per_digit: int sizeof_digit: int @@ -130,6 +141,7 @@ micro: int releaselevel: str serial: int + version_info: _version_info def call_tracing(__func: Callable[..., _T], __args: Any) -> _T: ... @@ -137,39 +149,37 @@ def _current_frames() -> Dict[int, Any]: ... def _debugmallocstats() -> None: ... def __displayhook__(value: object) -> None: ... -def __excepthook__(type_: Type[BaseException], value: BaseException, - traceback: TracebackType) -> None: ... +def __excepthook__(type_: Type[BaseException], value: BaseException, traceback: TracebackType) -> None: ... def exc_info() -> _OptExcInfo: ... + # sys.exit() accepts an optional argument of anything printable def exit(__status: object = ...) -> NoReturn: ... def getdefaultencoding() -> str: ... -if sys.platform != 'win32': + +if sys.platform != "win32": def getdlopenflags() -> int: ... + def getfilesystemencoding() -> str: ... def getrefcount(__object: Any) -> int: ... def getrecursionlimit() -> int: ... - @overload def getsizeof(obj: object) -> int: ... @overload def getsizeof(obj: object, default: int) -> int: ... - def getswitchinterval() -> float: ... - def _getframe(__depth: int = ...) -> FrameType: ... _ProfileFunc = Callable[[FrameType, str, Any], Any] + def getprofile() -> Optional[_ProfileFunc]: ... def setprofile(profilefunc: Optional[_ProfileFunc]) -> None: ... _TraceFunc = Callable[[FrameType, str, Any], Optional[Callable[[FrameType, str, Any], Any]]] + def gettrace() -> Optional[_TraceFunc]: ... def settrace(tracefunc: Optional[_TraceFunc]) -> None: ... - -class _WinVersion(Tuple[int, int, int, int, - str, int, int, int, int, - Tuple[int, int, int]]): +class _WinVersion(Tuple[int, int, int, int, str, int, int, int, int, Tuple[int, int, int]]): major: int minor: int build: int @@ -185,7 +195,6 @@ def getwindowsversion() -> _WinVersion: ... def intern(__string: str) -> str: ... - def is_finalizing() -> bool: ... if sys.version_info >= (3, 7): @@ -194,9 +203,9 @@ if sys.platform != "win32": def setdlopenflags(__flags: int) -> None: ... + def setrecursionlimit(__limit: int) -> None: ... def setswitchinterval(__interval: float) -> None: ... - def gettotalrefcount() -> int: ... # Debug builds only if sys.version_info < (3, 9): @@ -210,16 +219,16 @@ exc_value: Optional[BaseException] exc_traceback: Optional[TracebackType] err_msg: Optional[str] - object: Optional[object] + object: Optional[_object] unraisablehook: Callable[[UnraisableHookArgs], Any] def addaudithook(hook: Callable[[str, Tuple[Any, ...]], Any]) -> None: ... def audit(__event: str, *args: Any) -> None: ... -if sys.version_info >= (3, 6): - from typing import AsyncGenerator - _AsyncgenHook = Optional[Callable[[AsyncGenerator[Any, Any]], None]] - class _asyncgen_hooks(Tuple[_AsyncgenHook, _AsyncgenHook]): - firstiter: _AsyncgenHook - finalizer: _AsyncgenHook - def get_asyncgen_hooks() -> _asyncgen_hooks: ... - def set_asyncgen_hooks(firstiter: _AsyncgenHook = ..., finalizer: _AsyncgenHook = ...) -> None: ... +_AsyncgenHook = Optional[Callable[[AsyncGenerator[Any, Any]], None]] + +class _asyncgen_hooks(Tuple[_AsyncgenHook, _AsyncgenHook]): + firstiter: _AsyncgenHook + finalizer: _AsyncgenHook + +def get_asyncgen_hooks() -> _asyncgen_hooks: ... +def set_asyncgen_hooks(firstiter: _AsyncgenHook = ..., finalizer: _AsyncgenHook = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tempfile.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tempfile.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tempfile.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tempfile.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,12 @@ import os import sys from types import TracebackType -from typing import Any, AnyStr, Generic, IO, Iterable, Iterator, List, Optional, overload, Tuple, Type, TypeVar, Union +from typing import IO, Any, AnyStr, Generic, Iterable, Iterator, List, Optional, Tuple, Type, TypeVar, Union, overload from typing_extensions import Literal +if sys.version_info >= (3, 9): + from types import GenericAlias + # global variables TMP_MAX: int tempdir: Optional[str] @@ -11,10 +14,7 @@ _S = TypeVar("_S") _T = TypeVar("_T") # for pytype, define typevar in same file as alias -if sys.version_info >= (3, 6): - _DirT = Union[_T, os.PathLike[_T]] -else: - _DirT = Union[_T] +_DirT = Union[_T, os.PathLike[_T]] if sys.version_info >= (3, 8): @overload @@ -28,7 +28,7 @@ dir: Optional[_DirT[AnyStr]] = ..., delete: bool = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[str]: ... @overload def NamedTemporaryFile( @@ -41,7 +41,7 @@ dir: Optional[_DirT[AnyStr]] = ..., delete: bool = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[bytes]: ... @overload def NamedTemporaryFile( @@ -54,8 +54,9 @@ dir: Optional[_DirT[AnyStr]] = ..., delete: bool = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[Any]: ... + else: @overload def NamedTemporaryFile( @@ -105,7 +106,7 @@ prefix: Optional[AnyStr] = ..., dir: Optional[_DirT[AnyStr]] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[str]: ... @overload def TemporaryFile( @@ -117,7 +118,7 @@ prefix: Optional[AnyStr] = ..., dir: Optional[_DirT[AnyStr]] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[bytes]: ... @overload def TemporaryFile( @@ -129,7 +130,7 @@ prefix: Optional[AnyStr] = ..., dir: Optional[_DirT[AnyStr]] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> IO[Any]: ... else: @overload @@ -180,7 +181,7 @@ prefix: Optional[str] = ..., dir: Optional[str] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> None: ... @overload def __init__( @@ -194,7 +195,7 @@ prefix: Optional[str] = ..., dir: Optional[str] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> None: ... @overload def __init__( @@ -208,9 +209,8 @@ prefix: Optional[str] = ..., dir: Optional[str] = ..., *, - errors: Optional[str] = ... + errors: Optional[str] = ..., ) -> None: ... - @property def errors(self) -> Optional[str]: ... else: @@ -287,6 +287,8 @@ def __exit__( self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] ) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... def mkstemp( suffix: Optional[AnyStr] = ..., prefix: Optional[AnyStr] = ..., dir: Optional[_DirT[AnyStr]] = ..., text: bool = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/textwrap.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/textwrap.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/textwrap.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/textwrap.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Callable, List, Optional, Dict, Pattern +from typing import Callable, Dict, List, Optional, Pattern class TextWrapper: width: int = ... @@ -22,24 +22,22 @@ unicode_whitespace_trans: Dict[int, int] = ... uspace: int = ... x: str = ... # leaked loop variable - def __init__( - self, - width: int = ..., - initial_indent: str = ..., - subsequent_indent: str = ..., - expand_tabs: bool = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - drop_whitespace: bool = ..., - break_on_hyphens: bool = ..., - tabsize: int = ..., - *, - max_lines: Optional[int] = ..., - placeholder: str = ...) -> None: - ... - + self, + width: int = ..., + initial_indent: str = ..., + subsequent_indent: str = ..., + expand_tabs: bool = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + drop_whitespace: bool = ..., + break_on_hyphens: bool = ..., + tabsize: int = ..., + *, + max_lines: Optional[int] = ..., + placeholder: str = ..., + ) -> None: ... # Private methods *are* part of the documented API for subclasses. def _munge_whitespace(self, text: str) -> str: ... def _split(self, text: str) -> List[str]: ... @@ -47,67 +45,56 @@ def _handle_long_word(self, reversed_chunks: List[str], cur_line: List[str], cur_len: int, width: int) -> None: ... def _wrap_chunks(self, chunks: List[str]) -> List[str]: ... def _split_chunks(self, text: str) -> List[str]: ... - def wrap(self, text: str) -> List[str]: ... def fill(self, text: str) -> str: ... - def wrap( - text: str, - width: int = ..., - *, - initial_indent: str = ..., - subsequent_indent: str = ..., - expand_tabs: bool = ..., - tabsize: int = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - break_on_hyphens: bool = ..., - drop_whitespace: bool = ..., - max_lines: int = ..., - placeholder: str = ... -) -> List[str]: - ... - + text: str, + width: int = ..., + *, + initial_indent: str = ..., + subsequent_indent: str = ..., + expand_tabs: bool = ..., + tabsize: int = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + break_on_hyphens: bool = ..., + drop_whitespace: bool = ..., + max_lines: int = ..., + placeholder: str = ..., +) -> List[str]: ... def fill( - text: str, - width: int = ..., - *, - initial_indent: str = ..., - subsequent_indent: str = ..., - expand_tabs: bool = ..., - tabsize: int = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - break_on_hyphens: bool = ..., - drop_whitespace: bool = ..., - max_lines: int = ..., - placeholder: str = ... -) -> str: - ... - + text: str, + width: int = ..., + *, + initial_indent: str = ..., + subsequent_indent: str = ..., + expand_tabs: bool = ..., + tabsize: int = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + break_on_hyphens: bool = ..., + drop_whitespace: bool = ..., + max_lines: int = ..., + placeholder: str = ..., +) -> str: ... def shorten( - text: str, - width: int, - *, - initial_indent: str = ..., - subsequent_indent: str = ..., - expand_tabs: bool = ..., - tabsize: int = ..., - replace_whitespace: bool = ..., - fix_sentence_endings: bool = ..., - break_long_words: bool = ..., - break_on_hyphens: bool = ..., - drop_whitespace: bool = ..., - # Omit `max_lines: int = None`, it is forced to 1 here. - placeholder: str = ... -) -> str: - ... - -def dedent(text: str) -> str: - ... - -def indent(text: str, prefix: str, predicate: Optional[Callable[[str], bool]] = ...) -> str: - ... + text: str, + width: int, + *, + initial_indent: str = ..., + subsequent_indent: str = ..., + expand_tabs: bool = ..., + tabsize: int = ..., + replace_whitespace: bool = ..., + fix_sentence_endings: bool = ..., + break_long_words: bool = ..., + break_on_hyphens: bool = ..., + drop_whitespace: bool = ..., + # Omit `max_lines: int = None`, it is forced to 1 here. + placeholder: str = ..., +) -> str: ... +def dedent(text: str) -> str: ... +def indent(text: str, prefix: str, predicate: Optional[Callable[[str], bool]] = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_thread.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_thread.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_thread.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_thread.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for _thread - import sys from threading import Thread from types import TracebackType @@ -17,10 +15,7 @@ def locked(self) -> bool: ... def __enter__(self) -> bool: ... def __exit__( - self, - type: Optional[Type[BaseException]], - value: Optional[BaseException], - traceback: Optional[TracebackType], + self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType] ) -> None: ... def start_new_thread(function: Callable[..., Any], args: Tuple[Any, ...], kwargs: Dict[str, Any] = ...) -> int: ... @@ -34,11 +29,10 @@ if sys.version_info >= (3, 8): def get_native_id() -> int: ... # only available on some platforms - class ExceptHookArgs(NamedTuple): exc_type: Type[BaseException] exc_value: Optional[BaseException] exc_traceback: Optional[TracebackType] thread: Optional[Thread] - def _ExceptHookArgs(args) -> ExceptHookArgs: ... + def _ExceptHookArgs(args: Any) -> ExceptHookArgs: ... _excepthook: Callable[[ExceptHookArgs], Any] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_tkinter.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_tkinter.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_tkinter.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_tkinter.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,93 @@ +from typing import Any, Tuple, Union + +# _tkinter is meant to be only used internally by tkinter, but some tkinter +# functions e.g. return _tkinter.Tcl_Obj objects. Tcl_Obj represents a Tcl +# object that hasn't been converted to a string. +# +# There are not many ways to get Tcl_Objs from tkinter, and I'm not sure if the +# only existing ways are supposed to return Tcl_Objs as opposed to returning +# strings. Here's one of these things that return Tcl_Objs: +# +# >>> import tkinter +# >>> text = tkinter.Text() +# >>> text.tag_add('foo', '1.0', 'end') +# >>> text.tag_ranges('foo') +# (, ) +class Tcl_Obj: + string: str # str(tclobj) returns this + typename: str + +class TclError(Exception): ... + +# This class allows running Tcl code. Tkinter uses it internally a lot, and +# it's often handy to drop a piece of Tcl code into a tkinter program. Example: +# +# >>> import tkinter, _tkinter +# >>> tkapp = tkinter.Tk().tk +# >>> isinstance(tkapp, _tkinter.TkappType) +# True +# >>> tkapp.call('set', 'foo', (1,2,3)) +# (1, 2, 3) +# >>> tkapp.eval('return $foo') +# '1 2 3' +# >>> +# +# call args can be pretty much anything. Also, call(some_tuple) is same as call(*some_tuple). +# +# eval always returns str because _tkinter_tkapp_eval_impl in _tkinter.c calls +# Tkapp_UnicodeResult, and it returns a string when it succeeds. +class TkappType: + # Please keep in sync with tkinter.Tk + def call(self, __command: Union[str, Tuple[Any, ...]], *args: Any) -> Any: ... + def eval(self, __script: str) -> str: ... + adderrorinfo: Any + createcommand: Any + createfilehandler: Any + createtimerhandler: Any + deletecommand: Any + deletefilehandler: Any + dooneevent: Any + evalfile: Any + exprboolean: Any + exprdouble: Any + exprlong: Any + exprstring: Any + getboolean: Any + getdouble: Any + getint: Any + getvar: Any + globalgetvar: Any + globalsetvar: Any + globalunsetvar: Any + interpaddr: Any + loadtk: Any + mainloop: Any + quit: Any + record: Any + setvar: Any + split: Any + splitlist: Any + unsetvar: Any + wantobjects: Any + willdispatch: Any + +ALL_EVENTS: int +FILE_EVENTS: int +IDLE_EVENTS: int +TIMER_EVENTS: int +WINDOW_EVENTS: int + +DONT_WAIT: int +EXCEPTION: int +READABLE: int +WRITABLE: int + +TCL_VERSION: str +TK_VERSION: str + +# TODO: figure out what these are (with e.g. help()) and get rid of Any +TkttType: Any +_flatten: Any +create: Any +getbusywaitinterval: Any +setbusywaitinterval: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tokenize.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tokenize.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tokenize.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tokenize.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,23 @@ -from typing import Any, Callable, Dict, Generator, Iterable, List, NamedTuple, Optional, Pattern, Union, Sequence, Set, TextIO, Tuple -from builtins import open as _builtin_open import sys +from builtins import open as _builtin_open +from os import PathLike from token import * # noqa: F403 +from typing import ( + Any, + Callable, + Dict, + Generator, + Iterable, + List, + NamedTuple, + Optional, + Pattern, + Sequence, + Set, + TextIO, + Tuple, + Union, +) if sys.version_info < (3, 7): COMMENT: int @@ -46,13 +62,7 @@ def detect_encoding(readline: Callable[[], bytes]) -> Tuple[str, Sequence[bytes]]: ... def tokenize(readline: Callable[[], bytes]) -> Generator[TokenInfo, None, None]: ... def generate_tokens(readline: Callable[[], str]) -> Generator[TokenInfo, None, None]: ... # undocumented - -if sys.version_info >= (3, 6): - from os import PathLike - def open(filename: Union[str, bytes, int, PathLike[Any]]) -> TextIO: ... -elif sys.version_info >= (3, 2): - def open(filename: Union[str, bytes, int]) -> TextIO: ... - +def open(filename: Union[str, bytes, int, PathLike[Any]]) -> TextIO: ... def group(*choices: str) -> str: ... # undocumented def any(*choices: str) -> str: ... # undocumented def maybe(*choices: str) -> str: ... # undocumented @@ -100,11 +110,7 @@ PseudoToken: str # undocumented endpats: Dict[str, str] # undocumented -if sys.version_info < (3, 6): - single_quoted: Dict[str, str] # undocumented - triple_quoted: Dict[str, str] # undocumented -else: - single_quoted: Set[str] # undocumented - triple_quoted: Set[str] # undocumented +single_quoted: Set[str] # undocumented +triple_quoted: Set[str] # undocumented tabsize: int # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_tracemalloc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_tracemalloc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_tracemalloc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_tracemalloc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,12 +1,17 @@ +import sys +from tracemalloc import _FrameTupleT, _TraceTupleT from typing import Optional, Sequence, Tuple -from tracemalloc import _TraceTupleT, _FrameTupleT -def _get_object_traceback(__obj) -> Optional[Sequence[_FrameTupleT]]: ... +def _get_object_traceback(__obj: object) -> Optional[Sequence[_FrameTupleT]]: ... def _get_traces() -> Sequence[_TraceTupleT]: ... def clear_traces() -> None: ... def get_traceback_limit() -> int: ... def get_traced_memory() -> Tuple[int, int]: ... def get_tracemalloc_memory() -> int: ... def is_tracing() -> bool: ... + +if sys.version_info >= (3, 9): + def reset_peak() -> None: ... + def start(__nframe: int = ...) -> None: ... def stop() -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tracemalloc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tracemalloc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/tracemalloc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/tracemalloc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,29 +1,30 @@ -# Stubs for tracemalloc (Python 3.4+) - import sys from typing import List, Optional, Sequence, Tuple, Union, overload + from _tracemalloc import * def get_object_traceback(obj: object) -> Optional[Traceback]: ... def take_snapshot() -> Snapshot: ... -if sys.version_info >= (3, 6): - class DomainFilter: - inclusive: bool - domain: int - def __init__(self, inclusive: bool, domain: int) -> None: ... +class DomainFilter: + inclusive: bool + domain: int + def __init__(self, inclusive: bool, domain: int) -> None: ... class Filter: - if sys.version_info >= (3, 6): - domain: Optional[int] + domain: Optional[int] inclusive: bool lineno: Optional[int] filename_pattern: str all_frames: bool - if sys.version_info >= (3, 6): - def __init__(self, inclusive: bool, filename_pattern: str, lineno: Optional[int] = ..., all_frames: bool = ..., domain: Optional[int] = ...) -> None: ... - else: - def __init__(self, inclusive: bool, filename_pattern: str, lineno: Optional[int] = ..., all_frames: bool = ...) -> None: ... + def __init__( + self, + inclusive: bool, + filename_pattern: str, + lineno: Optional[int] = ..., + all_frames: bool = ..., + domain: Optional[int] = ..., + ) -> None: ... class Statistic: count: int @@ -73,15 +74,11 @@ def __getitem__(self, s: slice) -> Sequence[Frame]: ... def __len__(self) -> int: ... - class Snapshot: def __init__(self, traces: Sequence[_TraceTupleT], traceback_limit: int) -> None: ... def compare_to(self, old_snapshot: Snapshot, key_type: str, cumulative: bool = ...) -> List[StatisticDiff]: ... def dump(self, filename: str) -> None: ... - if sys.version_info >= (3, 6): - def filter_traces(self, filters: Sequence[Union[DomainFilter, Filter]]) -> Snapshot: ... - else: - def filter_traces(self, filters: Sequence[Filter]) -> Snapshot: ... + def filter_traces(self, filters: Sequence[Union[DomainFilter, Filter]]) -> Snapshot: ... @staticmethod def load(filename: str) -> Snapshot: ... def statistics(self, key_type: str, cumulative: bool = ...) -> List[Statistic]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/types.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/types.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/types.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/types.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,23 +1,32 @@ -# Stubs for types -# Note, all classes "defined" here require special handling. - -# TODO parts of this should be conditional on version - import sys from typing import ( - Any, Awaitable, Callable, Dict, Generic, Iterator, Mapping, Optional, Tuple, TypeVar, - Union, overload, Type, Iterable + Any, + Awaitable, + Callable, + Dict, + Generic, + Iterable, + Iterator, + Mapping, + Optional, + Tuple, + Type, + TypeVar, + Union, + overload, ) # ModuleType is exported from this module, but for circular import # reasons exists in its own stub file (with ModuleSpec and Loader). from _importlib_modulespec import ModuleType as ModuleType # Exported -_T = TypeVar('_T') -_T_co = TypeVar('_T_co', covariant=True) -_T_contra = TypeVar('_T_contra', contravariant=True) -_KT = TypeVar('_KT') -_VT = TypeVar('_VT') +# Note, all classes "defined" here require special handling. + +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_T_contra = TypeVar("_T_contra", contravariant=True) +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") class _Cell: cell_contents: Any @@ -32,13 +41,22 @@ __qualname__: str __annotations__: Dict[str, Any] __kwdefaults__: Dict[str, Any] - def __init__(self, code: CodeType, globals: Dict[str, Any], name: Optional[str] = ..., argdefs: Optional[Tuple[object, ...]] = ..., closure: Optional[Tuple[_Cell, ...]] = ...) -> None: ... + def __init__( + self, + code: CodeType, + globals: Dict[str, Any], + name: Optional[str] = ..., + argdefs: Optional[Tuple[object, ...]] = ..., + closure: Optional[Tuple[_Cell, ...]] = ..., + ) -> None: ... def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __get__(self, obj: Optional[object], type: Optional[type]) -> MethodType: ... + LambdaType = FunctionType class CodeType: """Create a code object. Not for the faint of heart.""" + co_argcount: int if sys.version_info >= (3, 8): co_posonlyargcount: int @@ -122,7 +140,7 @@ def __getitem__(self, k: _KT) -> _VT: ... def __iter__(self) -> Iterator[_KT]: ... def __len__(self) -> int: ... - def copy(self) -> Mapping[_KT, _VT]: ... + def copy(self) -> Dict[_KT, _VT]: ... class SimpleNamespace: def __init__(self, **kwargs: Any) -> None: ... @@ -138,26 +156,29 @@ def __iter__(self) -> GeneratorType: ... def __next__(self) -> Any: ... def close(self) -> None: ... - def send(self, arg: Any) -> Any: ... + def send(self, __arg: Any) -> Any: ... @overload - def throw(self, val: BaseException) -> Any: ... + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> Any: ... @overload - def throw(self, typ: type, val: BaseException = ..., tb: TracebackType = ...) -> Any: ... + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> Any: ... -if sys.version_info >= (3, 6): - class AsyncGeneratorType(Generic[_T_co, _T_contra]): - ag_await: Optional[Awaitable[Any]] - ag_frame: FrameType - ag_running: bool - ag_code: CodeType - def __aiter__(self) -> Awaitable[AsyncGeneratorType[_T_co, _T_contra]]: ... - def __anext__(self) -> Awaitable[_T_co]: ... - def asend(self, val: _T_contra) -> Awaitable[_T_co]: ... - @overload - def athrow(self, val: BaseException) -> Awaitable[_T_co]: ... - @overload - def athrow(self, typ: Type[BaseException], val: BaseException, tb: TracebackType = ...) -> Awaitable[_T_co]: ... - def aclose(self) -> Awaitable[None]: ... +class AsyncGeneratorType(Generic[_T_co, _T_contra]): + ag_await: Optional[Awaitable[Any]] + ag_frame: FrameType + ag_running: bool + ag_code: CodeType + def __aiter__(self) -> Awaitable[AsyncGeneratorType[_T_co, _T_contra]]: ... + def __anext__(self) -> Awaitable[_T_co]: ... + def asend(self, __val: _T_contra) -> Awaitable[_T_co]: ... + @overload + def athrow( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> Awaitable[_T_co]: ... + @overload + def athrow(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> Awaitable[_T_co]: ... + def aclose(self) -> Awaitable[None]: ... class CoroutineType: cr_await: Optional[Any] @@ -165,11 +186,13 @@ cr_frame: FrameType cr_running: bool def close(self) -> None: ... - def send(self, arg: Any) -> Any: ... + def send(self, __arg: Any) -> Any: ... @overload - def throw(self, val: BaseException) -> Any: ... + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> Any: ... @overload - def throw(self, typ: type, val: BaseException = ..., tb: TracebackType = ...) -> Any: ... + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> Any: ... class _StaticFunctionType: """Fictional type to correct the type of MethodType.__func__. @@ -184,6 +207,7 @@ similar to wrapping a function in staticmethod() at runtime to prevent it being bound as a method. """ + def __get__(self, obj: Optional[object], type: Optional[type]) -> FunctionType: ... class MethodType: @@ -193,11 +217,13 @@ __qualname__: str def __init__(self, func: Callable[..., Any], obj: object) -> None: ... def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + class BuiltinFunctionType: __self__: Union[object, ModuleType] __name__: str __qualname__: str def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + BuiltinMethodType = BuiltinFunctionType if sys.version_info >= (3, 7): @@ -207,7 +233,6 @@ __objclass__: type def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __get__(self, obj: Any, type: type = ...) -> Any: ... - class MethodWrapperType: __self__: object __name__: str @@ -216,14 +241,12 @@ def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __eq__(self, other: Any) -> bool: ... def __ne__(self, other: Any) -> bool: ... - class MethodDescriptorType: __name__: str __qualname__: str __objclass__: type def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __get__(self, obj: Any, type: type = ...) -> Any: ... - class ClassMethodDescriptorType: __name__: str __qualname__: str @@ -231,7 +254,6 @@ def __call__(self, *args: Any, **kwargs: Any) -> Any: ... def __get__(self, obj: Any, type: type = ...) -> Any: ... - class TracebackType: if sys.version_info >= (3, 7): def __init__(self, tb_next: Optional[TracebackType], tb_frame: FrameType, tb_lasti: int, tb_lineno: int) -> None: ... @@ -255,11 +277,10 @@ f_lasti: int f_lineno: int f_locals: Dict[str, Any] - f_trace: Callable[[], None] + f_trace: Optional[Callable[[FrameType, str, Any], Any]] if sys.version_info >= (3, 7): f_trace_lines: bool f_trace_opcodes: bool - def clear(self) -> None: ... class GetSetDescriptorType: @@ -268,6 +289,7 @@ def __get__(self, obj: Any, type: type = ...) -> Any: ... def __set__(self, obj: Any) -> None: ... def __delete__(self, obj: Any) -> None: ... + class MemberDescriptorType: __name__: str __objclass__: type @@ -276,11 +298,19 @@ def __delete__(self, obj: Any) -> None: ... if sys.version_info >= (3, 7): - def new_class(name: str, bases: Iterable[object] = ..., kwds: Dict[str, Any] = ..., exec_body: Callable[[Dict[str, Any]], None] = ...) -> type: ... + def new_class( + name: str, bases: Iterable[object] = ..., kwds: Dict[str, Any] = ..., exec_body: Callable[[Dict[str, Any]], None] = ... + ) -> type: ... def resolve_bases(bases: Iterable[object]) -> Tuple[Any, ...]: ... + else: - def new_class(name: str, bases: Tuple[type, ...] = ..., kwds: Dict[str, Any] = ..., exec_body: Callable[[Dict[str, Any]], None] = ...) -> type: ... -def prepare_class(name: str, bases: Tuple[type, ...] = ..., kwds: Dict[str, Any] = ...) -> Tuple[type, Dict[str, Any], Dict[str, Any]]: ... + def new_class( + name: str, bases: Tuple[type, ...] = ..., kwds: Dict[str, Any] = ..., exec_body: Callable[[Dict[str, Any]], None] = ... + ) -> type: ... + +def prepare_class( + name: str, bases: Tuple[type, ...] = ..., kwds: Dict[str, Any] = ... +) -> Tuple[type, Dict[str, Any], Dict[str, Any]]: ... # Actually a different type, but `property` is special and we want that too. DynamicClassAttribute = property @@ -292,5 +322,5 @@ __origin__: type __args__: Tuple[Any, ...] __parameters__: Tuple[Any, ...] - def __init__(self, origin: type, args: Any): ... + def __init__(self, origin: type, args: Any) -> None: ... def __getattr__(self, name: str) -> Any: ... # incomplete diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/typing.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/typing.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/typing.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/typing.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,10 @@ -# Stubs for typing - +import collections # Needed by aliases like DefaultDict, see mypy issue 2986 import sys -from abc import abstractmethod, ABCMeta +from abc import ABCMeta, abstractmethod from types import CodeType, FrameType, TracebackType -import collections # Needed by aliases like DefaultDict, see mypy issue 2986 + +if sys.version_info >= (3, 9): + from types import GenericAlias # Definitions of special type checking related constructs. Their definitions # are not used, so their value does not matter. @@ -17,7 +18,14 @@ __constraints__: Tuple[Type[Any], ...] __covariant__: bool __contravariant__: bool - def __init__(self, name: str, *constraints: Type[Any], bound: Optional[Type[Any]] = ..., covariant: bool = ..., contravariant: bool = ...) -> None: ... + def __init__( + self, + name: str, + *constraints: Type[Any], + bound: Union[None, Type[Any], str] = ..., + covariant: bool = ..., + contravariant: bool = ..., + ) -> None: ... _promote = object() @@ -35,7 +43,7 @@ ClassVar: _SpecialForm = ... if sys.version_info >= (3, 8): Final: _SpecialForm = ... - _F = TypeVar('_F', bound=Callable[..., Any]) + _F = TypeVar("_F", bound=Callable[..., Any]) def final(f: _F) -> _F: ... Literal: _SpecialForm = ... # TypedDict is a (non-subscriptable) special form. @@ -44,25 +52,33 @@ if sys.version_info < (3, 7): class GenericMeta(type): ... +if sys.version_info >= (3, 10): + class ParamSpec: + __name__: str + def __init__(self, name: str) -> None: ... + Concatenate: _SpecialForm = ... + TypeAlias: _SpecialForm = ... + # Return type that indicates a function does not return. # This type is equivalent to the None type, but the no-op Union is necessary to # distinguish the None type from the None value. NoReturn = Union[None] # These type variables are used by the container types. -_T = TypeVar('_T') -_S = TypeVar('_S') -_KT = TypeVar('_KT') # Key type. -_VT = TypeVar('_VT') # Value type. -_T_co = TypeVar('_T_co', covariant=True) # Any type covariant containers. -_V_co = TypeVar('_V_co', covariant=True) # Any type covariant containers. -_KT_co = TypeVar('_KT_co', covariant=True) # Key type covariant containers. -_VT_co = TypeVar('_VT_co', covariant=True) # Value type covariant containers. -_T_contra = TypeVar('_T_contra', contravariant=True) # Ditto contravariant. -_TC = TypeVar('_TC', bound=Type[object]) +_T = TypeVar("_T") +_S = TypeVar("_S") +_KT = TypeVar("_KT") # Key type. +_VT = TypeVar("_VT") # Value type. +_T_co = TypeVar("_T_co", covariant=True) # Any type covariant containers. +_V_co = TypeVar("_V_co", covariant=True) # Any type covariant containers. +_KT_co = TypeVar("_KT_co", covariant=True) # Key type covariant containers. +_VT_co = TypeVar("_VT_co", covariant=True) # Value type covariant containers. +_T_contra = TypeVar("_T_contra", contravariant=True) # Ditto contravariant. +_TC = TypeVar("_TC", bound=Type[object]) _C = TypeVar("_C", bound=Callable[..., Any]) no_type_check = object() + def no_type_check_decorator(decorator: _C) -> _C: ... # Type aliases and type constructors @@ -87,12 +103,11 @@ Annotated: _SpecialForm = ... # Predefined type variables. -AnyStr = TypeVar('AnyStr', str, bytes) +AnyStr = TypeVar("AnyStr", str, bytes) # Abstract base classes. def runtime_checkable(cls: _TC) -> _TC: ... - @runtime_checkable class SupportsInt(Protocol, metaclass=ABCMeta): @abstractmethod @@ -134,11 +149,6 @@ def __round__(self, ndigits: int) -> _T_co: ... @runtime_checkable -class Reversible(Protocol[_T_co]): - @abstractmethod - def __reversed__(self) -> Iterator[_T_co]: ... - -@runtime_checkable class Sized(Protocol, metaclass=ABCMeta): @abstractmethod def __len__(self) -> int: ... @@ -162,23 +172,25 @@ def __next__(self) -> _T_co: ... def __iter__(self) -> Iterator[_T_co]: ... -class Generator(Iterator[_T_co], Generic[_T_co, _T_contra, _V_co]): +@runtime_checkable +class Reversible(Iterable[_T_co], Protocol[_T_co]): @abstractmethod - def __next__(self) -> _T_co: ... + def __reversed__(self) -> Iterator[_T_co]: ... +class Generator(Iterator[_T_co], Generic[_T_co, _T_contra, _V_co]): + def __next__(self) -> _T_co: ... @abstractmethod - def send(self, value: _T_contra) -> _T_co: ... - + def send(self, __value: _T_contra) -> _T_co: ... + @overload @abstractmethod - def throw(self, typ: Type[BaseException], val: Optional[BaseException] = ..., - tb: Optional[TracebackType] = ...) -> _T_co: ... - + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> _T_co: ... + @overload @abstractmethod + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> _T_co: ... def close(self) -> None: ... - - @abstractmethod def __iter__(self) -> Generator[_T_co, _T_contra, _V_co]: ... - @property def gi_code(self) -> CodeType: ... @property @@ -194,6 +206,8 @@ def __await__(self) -> Generator[Any, None, _T_co]: ... class Coroutine(Awaitable[_V_co], Generic[_T_co, _T_contra, _V_co]): + __name__: str + __qualname__: str @property def cr_await(self) -> Optional[Any]: ... @property @@ -202,22 +216,24 @@ def cr_frame(self) -> FrameType: ... @property def cr_running(self) -> bool: ... - @abstractmethod - def send(self, value: _T_contra) -> _T_co: ... - + def send(self, __value: _T_contra) -> _T_co: ... + @overload @abstractmethod - def throw(self, typ: Type[BaseException], val: Optional[BaseException] = ..., - tb: Optional[TracebackType] = ...) -> _T_co: ... - + def throw( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> _T_co: ... + @overload + @abstractmethod + def throw(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> _T_co: ... @abstractmethod def close(self) -> None: ... - # NOTE: This type does not exist in typing.py or PEP 484. # The parameters correspond to Generator, but the 4th is the original type. -class AwaitableGenerator(Awaitable[_V_co], Generator[_T_co, _T_contra, _V_co], - Generic[_T_co, _T_contra, _V_co, _S], metaclass=ABCMeta): ... +class AwaitableGenerator( + Awaitable[_V_co], Generator[_T_co, _T_contra, _V_co], Generic[_T_co, _T_contra, _V_co, _S], metaclass=ABCMeta +): ... @runtime_checkable class AsyncIterable(Protocol[_T_co]): @@ -225,59 +241,49 @@ def __aiter__(self) -> AsyncIterator[_T_co]: ... @runtime_checkable -class AsyncIterator(AsyncIterable[_T_co], - Protocol[_T_co]): +class AsyncIterator(AsyncIterable[_T_co], Protocol[_T_co]): @abstractmethod def __anext__(self) -> Awaitable[_T_co]: ... def __aiter__(self) -> AsyncIterator[_T_co]: ... -if sys.version_info >= (3, 6): - class AsyncGenerator(AsyncIterator[_T_co], Generic[_T_co, _T_contra]): - @abstractmethod - def __anext__(self) -> Awaitable[_T_co]: ... - - @abstractmethod - def asend(self, value: _T_contra) -> Awaitable[_T_co]: ... - - @abstractmethod - def athrow(self, typ: Type[BaseException], val: Optional[BaseException] = ..., - tb: Any = ...) -> Awaitable[_T_co]: ... - - @abstractmethod - def aclose(self) -> Awaitable[None]: ... - - @abstractmethod - def __aiter__(self) -> AsyncGenerator[_T_co, _T_contra]: ... - - @property - def ag_await(self) -> Any: ... - @property - def ag_code(self) -> CodeType: ... - @property - def ag_frame(self) -> FrameType: ... - @property - def ag_running(self) -> bool: ... +class AsyncGenerator(AsyncIterator[_T_co], Generic[_T_co, _T_contra]): + @abstractmethod + def __anext__(self) -> Awaitable[_T_co]: ... + @abstractmethod + def asend(self, __value: _T_contra) -> Awaitable[_T_co]: ... + @overload + @abstractmethod + def athrow( + self, __typ: Type[BaseException], __val: Union[BaseException, object] = ..., __tb: Optional[TracebackType] = ... + ) -> Awaitable[_T_co]: ... + @overload + @abstractmethod + def athrow(self, __typ: BaseException, __val: None = ..., __tb: Optional[TracebackType] = ...) -> Awaitable[_T_co]: ... + @abstractmethod + def aclose(self) -> Awaitable[None]: ... + @abstractmethod + def __aiter__(self) -> AsyncGenerator[_T_co, _T_contra]: ... + @property + def ag_await(self) -> Any: ... + @property + def ag_code(self) -> CodeType: ... + @property + def ag_frame(self) -> FrameType: ... + @property + def ag_running(self) -> bool: ... @runtime_checkable class Container(Protocol[_T_co]): @abstractmethod def __contains__(self, __x: object) -> bool: ... +@runtime_checkable +class Collection(Iterable[_T_co], Container[_T_co], Protocol[_T_co]): + # Implement Sized (but don't have it as a base class). + @abstractmethod + def __len__(self) -> int: ... -if sys.version_info >= (3, 6): - @runtime_checkable - class Collection(Iterable[_T_co], Container[_T_co], Protocol[_T_co]): - # Implement Sized (but don't have it as a base class). - @abstractmethod - def __len__(self) -> int: ... - - _Collection = Collection -else: - @runtime_checkable - class _Collection(Iterable[_T_co], Container[_T_co], Protocol[_T_co]): - # Implement Sized (but don't have it as a base class). - @abstractmethod - def __len__(self) -> int: ... +_Collection = Collection class Sequence(_Collection[_T_co], Reversible[_T_co], Generic[_T_co]): @overload @@ -287,15 +293,15 @@ @abstractmethod def __getitem__(self, s: slice) -> Sequence[_T_co]: ... # Mixin methods - def index(self, x: Any, start: int = ..., end: int = ...) -> int: ... - def count(self, x: Any) -> int: ... + def index(self, value: Any, start: int = ..., stop: int = ...) -> int: ... + def count(self, value: Any) -> int: ... def __contains__(self, x: object) -> bool: ... def __iter__(self) -> Iterator[_T_co]: ... def __reversed__(self) -> Iterator[_T_co]: ... class MutableSequence(Sequence[_T], Generic[_T]): @abstractmethod - def insert(self, index: int, object: _T) -> None: ... + def insert(self, index: int, value: _T) -> None: ... @overload @abstractmethod def __getitem__(self, i: int) -> _T: ... @@ -315,12 +321,12 @@ @abstractmethod def __delitem__(self, i: slice) -> None: ... # Mixin methods - def append(self, object: _T) -> None: ... + def append(self, value: _T) -> None: ... def clear(self) -> None: ... - def extend(self, iterable: Iterable[_T]) -> None: ... + def extend(self, values: Iterable[_T]) -> None: ... def reverse(self) -> None: ... def pop(self, index: int = ...) -> _T: ... - def remove(self, object: _T) -> None: ... + def remove(self, value: _T) -> None: ... def __iadd__(self, x: Iterable[_T]) -> MutableSequence[_T]: ... class AbstractSet(_Collection[_T_co], Generic[_T_co]): @@ -335,17 +341,17 @@ def __or__(self, s: AbstractSet[_T]) -> AbstractSet[Union[_T_co, _T]]: ... def __sub__(self, s: AbstractSet[Any]) -> AbstractSet[_T_co]: ... def __xor__(self, s: AbstractSet[_T]) -> AbstractSet[Union[_T_co, _T]]: ... - def isdisjoint(self, s: Iterable[Any]) -> bool: ... + def isdisjoint(self, other: Iterable[Any]) -> bool: ... class MutableSet(AbstractSet[_T], Generic[_T]): @abstractmethod - def add(self, x: _T) -> None: ... + def add(self, value: _T) -> None: ... @abstractmethod - def discard(self, x: _T) -> None: ... + def discard(self, value: _T) -> None: ... # Mixin methods def clear(self) -> None: ... def pop(self) -> _T: ... - def remove(self, element: _T) -> None: ... + def remove(self, value: _T) -> None: ... def __ior__(self, s: AbstractSet[_S]) -> MutableSet[Union[_T, _S]]: ... def __iand__(self, s: AbstractSet[Any]) -> MutableSet[_T]: ... def __ixor__(self, s: AbstractSet[_S]) -> MutableSet[Union[_T, _S]]: ... @@ -395,31 +401,30 @@ @runtime_checkable class ContextManager(Protocol[_T_co]): def __enter__(self) -> _T_co: ... - def __exit__(self, __exc_type: Optional[Type[BaseException]], - __exc_value: Optional[BaseException], - __traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, + __exc_type: Optional[Type[BaseException]], + __exc_value: Optional[BaseException], + __traceback: Optional[TracebackType], + ) -> Optional[bool]: ... @runtime_checkable class AsyncContextManager(Protocol[_T_co]): def __aenter__(self) -> Awaitable[_T_co]: ... def __aexit__( - self, - exc_type: Optional[Type[BaseException]], - exc_value: Optional[BaseException], - traceback: Optional[TracebackType], + self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], traceback: Optional[TracebackType] ) -> Awaitable[Optional[bool]]: ... class Mapping(_Collection[_KT], Generic[_KT, _VT_co]): # TODO: We wish the key type could also be covariant, but that doesn't work, # see discussion in https: //github.com/python/typing/pull/273. @abstractmethod - def __getitem__(self, k: _KT) -> _VT_co: - ... + def __getitem__(self, k: _KT) -> _VT_co: ... # Mixin methods @overload - def get(self, k: _KT) -> Optional[_VT_co]: ... + def get(self, key: _KT) -> Optional[_VT_co]: ... @overload - def get(self, k: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]: ... + def get(self, key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]: ... def items(self) -> AbstractSet[Tuple[_KT, _VT_co]]: ... def keys(self) -> AbstractSet[_KT]: ... def values(self) -> ValuesView[_VT_co]: ... @@ -430,14 +435,13 @@ def __setitem__(self, k: _KT, v: _VT) -> None: ... @abstractmethod def __delitem__(self, v: _KT) -> None: ... - def clear(self) -> None: ... @overload - def pop(self, k: _KT) -> _VT: ... + def pop(self, key: _KT) -> _VT: ... @overload - def pop(self, k: _KT, default: Union[_VT, _T] = ...) -> Union[_VT, _T]: ... + def pop(self, key: _KT, default: Union[_VT, _T] = ...) -> Union[_VT, _T]: ... def popitem(self) -> Tuple[_KT, _VT]: ... - def setdefault(self, k: _KT, default: _VT = ...) -> _VT: ... + def setdefault(self, key: _KT, default: _VT = ...) -> _VT: ... # 'update' used to take a Union, but using overloading is better. # The second overloaded type here is a bit too general, because # Mapping[Tuple[_KT, _VT], W] is a subclass of Iterable[Tuple[_KT, _VT]], @@ -460,7 +464,6 @@ TYPE_CHECKING = True class IO(Iterator[AnyStr], Generic[AnyStr]): - # TODO detach # TODO use abstract properties @property def mode(self) -> str: ... @@ -476,7 +479,6 @@ def flush(self) -> None: ... @abstractmethod def isatty(self) -> bool: ... - # TODO what if n is None? @abstractmethod def read(self, n: int = ...) -> AnyStr: ... @abstractmethod @@ -495,12 +497,10 @@ def truncate(self, size: Optional[int] = ...) -> int: ... @abstractmethod def writable(self) -> bool: ... - # TODO buffer objects @abstractmethod def write(self, s: AnyStr) -> int: ... @abstractmethod def writelines(self, lines: Iterable[AnyStr]) -> None: ... - @abstractmethod def __next__(self) -> AnyStr: ... @abstractmethod @@ -508,13 +508,11 @@ @abstractmethod def __enter__(self) -> IO[AnyStr]: ... @abstractmethod - def __exit__(self, t: Optional[Type[BaseException]], value: Optional[BaseException], - traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, t: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> Optional[bool]: ... class BinaryIO(IO[bytes]): - # TODO readinto - # TODO read1? - # TODO peek? @abstractmethod def __enter__(self) -> BinaryIO: ... @@ -545,20 +543,12 @@ # The regular expression object whose match() or search() method produced # this match instance. re: Pattern[AnyStr] - def expand(self, template: AnyStr) -> AnyStr: ... - # TODO: The return for a group may be None, except if __group is 0 or not given. @overload def group(self, __group: Union[str, int] = ...) -> AnyStr: ... @overload - def group( - self, - __group1: Union[str, int], - __group2: Union[str, int], - *groups: Union[str, int], - ) -> Tuple[AnyStr, ...]: ... - + def group(self, __group1: Union[str, int], __group2: Union[str, int], *groups: Union[str, int]) -> Tuple[AnyStr, ...]: ... def groups(self, default: AnyStr = ...) -> Sequence[AnyStr]: ... def groupdict(self, default: AnyStr = ...) -> dict[str, AnyStr]: ... def start(self, __group: Union[int, str] = ...) -> int: ... @@ -566,53 +556,48 @@ def span(self, __group: Union[int, str] = ...) -> Tuple[int, int]: ... @property def regs(self) -> Tuple[Tuple[int, int], ...]: ... # undocumented - if sys.version_info >= (3, 6): - def __getitem__(self, g: Union[int, str]) -> AnyStr: ... + def __getitem__(self, g: Union[int, str]) -> AnyStr: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class Pattern(Generic[AnyStr]): flags: int groupindex: Mapping[str, int] groups: int pattern: AnyStr - - def search(self, string: AnyStr, pos: int = ..., - endpos: int = ...) -> Optional[Match[AnyStr]]: ... - def match(self, string: AnyStr, pos: int = ..., - endpos: int = ...) -> Optional[Match[AnyStr]]: ... + def search(self, string: AnyStr, pos: int = ..., endpos: int = ...) -> Optional[Match[AnyStr]]: ... + def match(self, string: AnyStr, pos: int = ..., endpos: int = ...) -> Optional[Match[AnyStr]]: ... # New in Python 3.4 - def fullmatch(self, string: AnyStr, pos: int = ..., - endpos: int = ...) -> Optional[Match[AnyStr]]: ... + def fullmatch(self, string: AnyStr, pos: int = ..., endpos: int = ...) -> Optional[Match[AnyStr]]: ... def split(self, string: AnyStr, maxsplit: int = ...) -> list[AnyStr]: ... - def findall(self, string: AnyStr, pos: int = ..., - endpos: int = ...) -> list[Any]: ... - def finditer(self, string: AnyStr, pos: int = ..., - endpos: int = ...) -> Iterator[Match[AnyStr]]: ... - + def findall(self, string: AnyStr, pos: int = ..., endpos: int = ...) -> list[Any]: ... + def finditer(self, string: AnyStr, pos: int = ..., endpos: int = ...) -> Iterator[Match[AnyStr]]: ... @overload - def sub(self, repl: AnyStr, string: AnyStr, - count: int = ...) -> AnyStr: ... + def sub(self, repl: AnyStr, string: AnyStr, count: int = ...) -> AnyStr: ... @overload - def sub(self, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, - count: int = ...) -> AnyStr: ... - + def sub(self, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ...) -> AnyStr: ... @overload - def subn(self, repl: AnyStr, string: AnyStr, - count: int = ...) -> Tuple[AnyStr, int]: ... + def subn(self, repl: AnyStr, string: AnyStr, count: int = ...) -> Tuple[AnyStr, int]: ... @overload - def subn(self, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, - count: int = ...) -> Tuple[AnyStr, int]: ... + def subn(self, repl: Callable[[Match[AnyStr]], AnyStr], string: AnyStr, count: int = ...) -> Tuple[AnyStr, int]: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... # Functions if sys.version_info >= (3, 9): def get_type_hints( - obj: Callable[..., Any], globalns: Optional[Dict[str, Any]] = ..., localns: Optional[Dict[str, Any]] = ..., - include_extras: bool = ... + obj: Callable[..., Any], + globalns: Optional[Dict[str, Any]] = ..., + localns: Optional[Dict[str, Any]] = ..., + include_extras: bool = ..., ) -> Dict[str, Any]: ... + else: def get_type_hints( - obj: Callable[..., Any], globalns: Optional[Dict[str, Any]] = ..., localns: Optional[Dict[str, Any]] = ..., + obj: Callable[..., Any], globalns: Optional[Dict[str, Any]] = ..., localns: Optional[Dict[str, Any]] = ... ) -> Dict[str, Any]: ... + if sys.version_info >= (3, 8): def get_origin(tp: Any) -> Optional[Any]: ... def get_args(tp: Any) -> Tuple[Any, ...]: ... @@ -630,13 +615,9 @@ _field_defaults: Dict[str, Any] = ... _fields: Tuple[str, ...] _source: str - - def __init__(self, typename: str, fields: Iterable[Tuple[str, Any]] = ..., - **kwargs: Any) -> None: ... - + def __init__(self, typename: str, fields: Iterable[Tuple[str, Any]] = ..., **kwargs: Any) -> None: ... @classmethod def _make(cls: Type[_T], iterable: Iterable[Any]) -> _T: ... - if sys.version_info >= (3, 8): def _asdict(self) -> Dict[str, Any]: ... else: @@ -671,8 +652,7 @@ __forward_value__: Optional[Any] __forward_is_argument__: bool def __init__(self, arg: str, is_argument: bool = ...) -> None: ... - def _evaluate(self, globalns: Optional[Dict[str, Any]], - localns: Optional[Dict[str, Any]]) -> Optional[Any]: ... + def _evaluate(self, globalns: Optional[Dict[str, Any]], localns: Optional[Dict[str, Any]]) -> Optional[Any]: ... def __eq__(self, other: Any) -> bool: ... def __hash__(self) -> int: ... def __repr__(self) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/async_case.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/async_case.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/async_case.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/async_case.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,6 @@ import sys from typing import Any, Awaitable, Callable + from .case import TestCase if sys.version_info >= (3, 8): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/case.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/case.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/case.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/case.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,31 +2,50 @@ import logging import sys import unittest.result -import warnings from types import TracebackType from typing import ( - Any, AnyStr, Callable, Container, ContextManager, Dict, FrozenSet, Generic, - Iterable, List, Mapping, NoReturn, Optional, overload, Pattern, Sequence, - Set, Tuple, Type, TypeVar, Union, + Any, + AnyStr, + Callable, + Container, + ContextManager, + Dict, + FrozenSet, + Generic, + Iterable, + List, + Mapping, + NoReturn, + Optional, + Pattern, + Sequence, + Set, + Tuple, + Type, + TypeVar, + Union, + overload, ) +from warnings import WarningMessage -_E = TypeVar('_E', bound=BaseException) -_FT = TypeVar('_FT', bound=Callable[..., Any]) +if sys.version_info >= (3, 9): + from types import GenericAlias + +_E = TypeVar("_E", bound=BaseException) +_FT = TypeVar("_FT", bound=Callable[..., Any]) if sys.version_info >= (3, 8): def addModuleCleanup(__function: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... def doModuleCleanups() -> None: ... -def expectedFailure(func: _FT) -> _FT: ... +def expectedFailure(test_item: _FT) -> _FT: ... def skip(reason: str) -> Callable[[_FT], _FT]: ... def skipIf(condition: object, reason: str) -> Callable[[_FT], _FT]: ... def skipUnless(condition: object, reason: str) -> Callable[[_FT], _FT]: ... - class SkipTest(Exception): def __init__(self, reason: str) -> None: ... - class TestCase: failureException: Type[BaseException] longMessage: bool @@ -47,126 +66,133 @@ def skipTest(self, reason: Any) -> None: ... def subTest(self, msg: Any = ..., **params: Any) -> ContextManager[None]: ... def debug(self) -> None: ... - def _addSkip( - self, result: unittest.result.TestResult, test_case: unittest.case.TestCase, reason: str - ) -> None: ... + def _addSkip(self, result: unittest.result.TestResult, test_case: TestCase, reason: str) -> None: ... def assertEqual(self, first: Any, second: Any, msg: Any = ...) -> None: ... - def assertNotEqual(self, first: Any, second: Any, - msg: Any = ...) -> None: ... + def assertNotEqual(self, first: Any, second: Any, msg: Any = ...) -> None: ... def assertTrue(self, expr: Any, msg: Any = ...) -> None: ... def assertFalse(self, expr: Any, msg: Any = ...) -> None: ... def assertIs(self, expr1: Any, expr2: Any, msg: Any = ...) -> None: ... def assertIsNot(self, expr1: Any, expr2: Any, msg: Any = ...) -> None: ... def assertIsNone(self, obj: Any, msg: Any = ...) -> None: ... def assertIsNotNone(self, obj: Any, msg: Any = ...) -> None: ... - def assertIn(self, member: Any, - container: Union[Iterable[Any], Container[Any]], - msg: Any = ...) -> None: ... - def assertNotIn(self, member: Any, - container: Union[Iterable[Any], Container[Any]], - msg: Any = ...) -> None: ... - def assertIsInstance(self, obj: Any, - cls: Union[type, Tuple[type, ...]], - msg: Any = ...) -> None: ... - def assertNotIsInstance(self, obj: Any, - cls: Union[type, Tuple[type, ...]], - msg: Any = ...) -> None: ... + def assertIn(self, member: Any, container: Union[Iterable[Any], Container[Any]], msg: Any = ...) -> None: ... + def assertNotIn(self, member: Any, container: Union[Iterable[Any], Container[Any]], msg: Any = ...) -> None: ... + def assertIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: Any = ...) -> None: ... + def assertNotIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: Any = ...) -> None: ... def assertGreater(self, a: Any, b: Any, msg: Any = ...) -> None: ... def assertGreaterEqual(self, a: Any, b: Any, msg: Any = ...) -> None: ... def assertLess(self, a: Any, b: Any, msg: Any = ...) -> None: ... def assertLessEqual(self, a: Any, b: Any, msg: Any = ...) -> None: ... @overload - def assertRaises(self, # type: ignore - expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], - callable: Callable[..., Any], - *args: Any, **kwargs: Any) -> None: ... - @overload - def assertRaises(self, - expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], - msg: Any = ...) -> _AssertRaisesContext[_E]: ... - @overload - def assertRaisesRegex(self, # type: ignore - expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - callable: Callable[..., Any], - *args: Any, **kwargs: Any) -> None: ... - @overload - def assertRaisesRegex(self, - expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - msg: Any = ...) -> _AssertRaisesContext[_E]: ... - @overload - def assertWarns(self, # type: ignore - expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], - callable: Callable[..., Any], - *args: Any, **kwargs: Any) -> None: ... - @overload - def assertWarns(self, - expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], - msg: Any = ...) -> _AssertWarnsContext: ... - @overload - def assertWarnsRegex(self, # type: ignore - expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - callable: Callable[..., Any], - *args: Any, **kwargs: Any) -> None: ... - @overload - def assertWarnsRegex(self, - expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - msg: Any = ...) -> _AssertWarnsContext: ... + def assertRaises( # type: ignore + self, + expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], + callable: Callable[..., Any], + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def assertRaises( + self, expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any = ... + ) -> _AssertRaisesContext[_E]: ... + @overload + def assertRaisesRegex( # type: ignore + self, + expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + callable: Callable[..., Any], + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def assertRaisesRegex( + self, + expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + msg: Any = ..., + ) -> _AssertRaisesContext[_E]: ... + @overload + def assertWarns( # type: ignore + self, + expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], + callable: Callable[..., Any], + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def assertWarns( + self, expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], msg: Any = ... + ) -> _AssertWarnsContext: ... + @overload + def assertWarnsRegex( # type: ignore + self, + expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + callable: Callable[..., Any], + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def assertWarnsRegex( + self, + expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + msg: Any = ..., + ) -> _AssertWarnsContext: ... def assertLogs( - self, logger: Optional[Union[str, logging.Logger]] = ..., - level: Union[int, str, None] = ... + self, logger: Optional[Union[str, logging.Logger]] = ..., level: Union[int, str, None] = ... ) -> _AssertLogsContext: ... @overload - def assertAlmostEqual(self, first: float, second: float, places: int = ..., - msg: Any = ..., delta: float = ...) -> None: ... + def assertAlmostEqual( + self, first: float, second: float, places: Optional[int] = ..., msg: Any = ..., delta: Optional[float] = ... + ) -> None: ... + @overload + def assertAlmostEqual( + self, + first: datetime.datetime, + second: datetime.datetime, + places: Optional[int] = ..., + msg: Any = ..., + delta: Optional[datetime.timedelta] = ..., + ) -> None: ... + @overload + def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ...) -> None: ... + @overload + def assertNotAlmostEqual(self, first: float, second: float, places: Optional[int] = ..., msg: Any = ...) -> None: ... @overload - def assertAlmostEqual(self, first: datetime.datetime, second: datetime.datetime, - places: int = ..., msg: Any = ..., - delta: datetime.timedelta = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: float, second: float, *, - msg: Any = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: float, second: float, *, - msg: Any = ..., delta: float = ...) -> None: ... - @overload - def assertNotAlmostEqual(self, first: datetime.datetime, second: datetime.datetime, - places: int = ..., msg: Any = ..., - delta: datetime.timedelta = ...) -> None: ... - def assertRegex(self, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], - msg: Any = ...) -> None: ... - def assertNotRegex(self, text: AnyStr, unexpected_regex: Union[AnyStr, Pattern[AnyStr]], - msg: Any = ...) -> None: ... - def assertCountEqual(self, first: Iterable[Any], second: Iterable[Any], - msg: Any = ...) -> None: ... - def addTypeEqualityFunc(self, typeobj: Type[Any], - function: Callable[..., None]) -> None: ... - def assertMultiLineEqual(self, first: str, second: str, - msg: Any = ...) -> None: ... - def assertSequenceEqual(self, seq1: Sequence[Any], seq2: Sequence[Any], - msg: Any = ..., - seq_type: Type[Sequence[Any]] = ...) -> None: ... - def assertListEqual(self, list1: List[Any], list2: List[Any], - msg: Any = ...) -> None: ... - def assertTupleEqual(self, tuple1: Tuple[Any, ...], tuple2: Tuple[Any, ...], - msg: Any = ...) -> None: ... - def assertSetEqual(self, set1: Union[Set[Any], FrozenSet[Any]], - set2: Union[Set[Any], FrozenSet[Any]], msg: Any = ...) -> None: ... - def assertDictEqual(self, d1: Dict[Any, Any], d2: Dict[Any, Any], - msg: Any = ...) -> None: ... + def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ..., delta: Optional[float] = ...) -> None: ... + @overload + def assertNotAlmostEqual( + self, + first: datetime.datetime, + second: datetime.datetime, + places: Optional[int] = ..., + msg: Any = ..., + delta: Optional[datetime.timedelta] = ..., + ) -> None: ... + def assertRegex(self, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ... + def assertNotRegex(self, text: AnyStr, unexpected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ... + def assertCountEqual(self, first: Iterable[Any], second: Iterable[Any], msg: Any = ...) -> None: ... + def addTypeEqualityFunc(self, typeobj: Type[Any], function: Callable[..., None]) -> None: ... + def assertMultiLineEqual(self, first: str, second: str, msg: Any = ...) -> None: ... + def assertSequenceEqual( + self, seq1: Sequence[Any], seq2: Sequence[Any], msg: Any = ..., seq_type: Optional[Type[Sequence[Any]]] = ... + ) -> None: ... + def assertListEqual(self, list1: List[Any], list2: List[Any], msg: Any = ...) -> None: ... + def assertTupleEqual(self, tuple1: Tuple[Any, ...], tuple2: Tuple[Any, ...], msg: Any = ...) -> None: ... + def assertSetEqual( + self, set1: Union[Set[Any], FrozenSet[Any]], set2: Union[Set[Any], FrozenSet[Any]], msg: Any = ... + ) -> None: ... + def assertDictEqual(self, d1: Dict[Any, Any], d2: Dict[Any, Any], msg: Any = ...) -> None: ... def fail(self, msg: Any = ...) -> NoReturn: ... def countTestCases(self) -> int: ... def defaultTestResult(self) -> unittest.result.TestResult: ... def id(self) -> str: ... def shortDescription(self) -> Optional[str]: ... - def addCleanup(self, function: Callable[..., Any], *args: Any, - **kwargs: Any) -> None: ... + if sys.version_info >= (3, 8): + def addCleanup(self, __function: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... + else: + def addCleanup(self, function: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ... def doCleanups(self) -> None: ... if sys.version_info >= (3, 8): @classmethod @@ -176,75 +202,84 @@ def _formatMessage(self, msg: Optional[str], standardMsg: str) -> str: ... # undocumented def _getAssertEqualityFunc(self, first: Any, second: Any) -> Callable[..., None]: ... # undocumented # below is deprecated - def failUnlessEqual(self, first: Any, second: Any, - msg: Any = ...) -> None: ... + def failUnlessEqual(self, first: Any, second: Any, msg: Any = ...) -> None: ... def assertEquals(self, first: Any, second: Any, msg: Any = ...) -> None: ... def failIfEqual(self, first: Any, second: Any, msg: Any = ...) -> None: ... - def assertNotEquals(self, first: Any, second: Any, - msg: Any = ...) -> None: ... + def assertNotEquals(self, first: Any, second: Any, msg: Any = ...) -> None: ... def failUnless(self, expr: bool, msg: Any = ...) -> None: ... def assert_(self, expr: bool, msg: Any = ...) -> None: ... def failIf(self, expr: bool, msg: Any = ...) -> None: ... @overload - def failUnlessRaises(self, # type: ignore - exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], - callable: Callable[..., Any] = ..., - *args: Any, **kwargs: Any) -> None: ... - @overload - def failUnlessRaises(self, - exception: Union[Type[_E], Tuple[Type[_E], ...]], - msg: Any = ...) -> _AssertRaisesContext[_E]: ... - def failUnlessAlmostEqual(self, first: float, second: float, - places: int = ..., msg: Any = ...) -> None: ... - def assertAlmostEquals(self, first: float, second: float, places: int = ..., - msg: Any = ..., delta: float = ...) -> None: ... - def failIfAlmostEqual(self, first: float, second: float, places: int = ..., - msg: Any = ...) -> None: ... - def assertNotAlmostEquals(self, first: float, second: float, - places: int = ..., msg: Any = ..., - delta: float = ...) -> None: ... - def assertRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]], - msg: Any = ...) -> None: ... - @overload - def assertRaisesRegexp(self, # type: ignore - exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - callable: Callable[..., Any], - *args: Any, **kwargs: Any) -> None: ... - @overload - def assertRaisesRegexp(self, - exception: Union[Type[_E], Tuple[Type[_E], ...]], - expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], - msg: Any = ...) -> _AssertRaisesContext[_E]: ... - def assertDictContainsSubset(self, - expected: Mapping[Any, Any], - actual: Mapping[Any, Any], - msg: object = ...) -> None: ... + def failUnlessRaises( # type: ignore + self, + exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], + callable: Callable[..., Any] = ..., + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def failUnlessRaises(self, exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any = ...) -> _AssertRaisesContext[_E]: ... + def failUnlessAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + def assertAlmostEquals(self, first: float, second: float, places: int = ..., msg: Any = ..., delta: float = ...) -> None: ... + def failIfAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ... + def assertNotAlmostEquals( + self, first: float, second: float, places: int = ..., msg: Any = ..., delta: float = ... + ) -> None: ... + def assertRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ... + def assertNotRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ... + @overload + def assertRaisesRegexp( # type: ignore + self, + exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + callable: Callable[..., Any], + *args: Any, + **kwargs: Any, + ) -> None: ... + @overload + def assertRaisesRegexp( + self, + exception: Union[Type[_E], Tuple[Type[_E], ...]], + expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]], + msg: Any = ..., + ) -> _AssertRaisesContext[_E]: ... + def assertDictContainsSubset(self, subset: Mapping[Any, Any], dictionary: Mapping[Any, Any], msg: object = ...) -> None: ... class FunctionTestCase(TestCase): - def __init__(self, testFunc: Callable[[], None], - setUp: Optional[Callable[[], None]] = ..., - tearDown: Optional[Callable[[], None]] = ..., - description: Optional[str] = ...) -> None: ... + def __init__( + self, + testFunc: Callable[[], None], + setUp: Optional[Callable[[], None]] = ..., + tearDown: Optional[Callable[[], None]] = ..., + description: Optional[str] = ..., + ) -> None: ... + def runTest(self) -> None: ... class _AssertRaisesContext(Generic[_E]): exception: _E def __enter__(self) -> _AssertRaisesContext[_E]: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> bool: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> bool: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class _AssertWarnsContext: - warning: warnings.WarningMessage + warning: WarningMessage filename: str lineno: int - warnings: List[warnings.WarningMessage] + warnings: List[WarningMessage] def __enter__(self) -> _AssertWarnsContext: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... class _AssertLogsContext: + LOGGING_FORMAT: str records: List[logging.LogRecord] output: List[str] + def __init__(self, test_case: TestCase, logger_name: str, level: int) -> None: ... def __enter__(self) -> _AssertLogsContext: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], - exc_tb: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,32 +1,11 @@ -# Stubs for unittest - -from typing import Iterable, List, Optional, Type, Union -from types import ModuleType - +from typing import Optional from unittest.async_case import * from unittest.case import * from unittest.loader import * +from unittest.main import * from unittest.result import TestResult as TestResult from unittest.runner import * from unittest.signals import * from unittest.suite import * - -# not really documented -class TestProgram: - result: TestResult - def runTests(self) -> None: ... # undocumented - - -def main(module: Union[None, str, ModuleType] = ..., - defaultTest: Union[str, Iterable[str], None] = ..., - argv: Optional[List[str]] = ..., - testRunner: Union[Type[TestRunner], TestRunner, None] = ..., - testLoader: TestLoader = ..., exit: bool = ..., verbosity: int = ..., - failfast: Optional[bool] = ..., catchbreak: Optional[bool] = ..., - buffer: Optional[bool] = ..., - warnings: Optional[str] = ...) -> TestProgram: ... - - -def load_tests(loader: TestLoader, tests: TestSuite, - pattern: Optional[str]) -> TestSuite: ... +def load_tests(loader: TestLoader, tests: TestSuite, pattern: Optional[str]) -> TestSuite: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/loader.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/loader.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/loader.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/loader.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,50 @@ +import sys import unittest.case -import unittest.suite import unittest.result +import unittest.suite from types import ModuleType from typing import Any, Callable, List, Optional, Sequence, Type +_SortComparisonMethod = Callable[[str, str], int] +_SuiteClass = Callable[[List[unittest.case.TestCase]], unittest.suite.TestSuite] class TestLoader: errors: List[Type[BaseException]] testMethodPrefix: str - sortTestMethodsUsing: Callable[[str, str], bool] - suiteClass: Callable[[List[unittest.case.TestCase]], unittest.suite.TestSuite] - def loadTestsFromTestCase(self, - testCaseClass: Type[unittest.case.TestCase]) -> unittest.suite.TestSuite: ... - def loadTestsFromModule(self, module: ModuleType, *, pattern: Any = ...) -> unittest.suite.TestSuite: ... - def loadTestsFromName(self, name: str, - module: Optional[ModuleType] = ...) -> unittest.suite.TestSuite: ... - def loadTestsFromNames(self, names: Sequence[str], - module: Optional[ModuleType] = ...) -> unittest.suite.TestSuite: ... - def getTestCaseNames(self, - testCaseClass: Type[unittest.case.TestCase]) -> Sequence[str]: ... - def discover(self, start_dir: str, pattern: str = ..., - top_level_dir: Optional[str] = ...) -> unittest.suite.TestSuite: ... + sortTestMethodsUsing: _SortComparisonMethod + + if sys.version_info >= (3, 7): + testNamePatterns: Optional[List[str]] + + suiteClass: _SuiteClass + def loadTestsFromTestCase(self, testCaseClass: Type[unittest.case.TestCase]) -> unittest.suite.TestSuite: ... + def loadTestsFromModule(self, module: ModuleType, *args: Any, pattern: Any = ...) -> unittest.suite.TestSuite: ... + def loadTestsFromName(self, name: str, module: Optional[ModuleType] = ...) -> unittest.suite.TestSuite: ... + def loadTestsFromNames(self, names: Sequence[str], module: Optional[ModuleType] = ...) -> unittest.suite.TestSuite: ... + def getTestCaseNames(self, testCaseClass: Type[unittest.case.TestCase]) -> Sequence[str]: ... + def discover(self, start_dir: str, pattern: str = ..., top_level_dir: Optional[str] = ...) -> unittest.suite.TestSuite: ... defaultTestLoader: TestLoader + +if sys.version_info >= (3, 7): + def getTestCaseNames( + testCaseClass: Type[unittest.case.TestCase], + prefix: str, + sortUsing: _SortComparisonMethod = ..., + testNamePatterns: Optional[List[str]] = ..., + ) -> Sequence[str]: ... + +else: + def getTestCaseNames( + testCaseClass: Type[unittest.case.TestCase], prefix: str, sortUsing: _SortComparisonMethod = ... + ) -> Sequence[str]: ... + +def makeSuite( + testCaseClass: Type[unittest.case.TestCase], + prefix: str = ..., + sortUsing: _SortComparisonMethod = ..., + suiteClass: _SuiteClass = ..., +) -> unittest.suite.TestSuite: ... +def findTestCases( + module: ModuleType, prefix: str = ..., sortUsing: _SortComparisonMethod = ..., suiteClass: _SuiteClass = ... +) -> unittest.suite.TestSuite: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/main.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/main.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/main.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/main.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,49 @@ +import sys +import unittest.case +import unittest.loader +import unittest.result +import unittest.suite +from types import ModuleType +from typing import Any, Iterable, List, Optional, Protocol, Type, Union + +class _TestRunner(Protocol): + def run(self, test: Union[unittest.suite.TestSuite, unittest.case.TestCase]) -> unittest.result.TestResult: ... + +# not really documented +class TestProgram: + result: unittest.result.TestResult + module: Union[None, str, ModuleType] + verbosity: int + failfast: Optional[bool] + catchbreak: Optional[bool] + buffer: Optional[bool] + progName: Optional[str] + warnings: Optional[str] + + if sys.version_info >= (3, 7): + testNamePatterns: Optional[List[str]] + def __init__( + self, + module: Union[None, str, ModuleType] = ..., + defaultTest: Union[str, Iterable[str], None] = ..., + argv: Optional[List[str]] = ..., + testRunner: Union[Type[_TestRunner], _TestRunner, None] = ..., + testLoader: unittest.loader.TestLoader = ..., + exit: bool = ..., + verbosity: int = ..., + failfast: Optional[bool] = ..., + catchbreak: Optional[bool] = ..., + buffer: Optional[bool] = ..., + warnings: Optional[str] = ..., + *, + tb_locals: bool = ..., + ) -> None: ... + def usageExit(self, msg: Any = ...) -> None: ... + def parseArgs(self, argv: List[str]) -> None: ... + if sys.version_info >= (3, 7): + def createTests(self, from_discovery: bool = ..., Loader: Optional[unittest.loader.TestLoader] = ...) -> None: ... + else: + def createTests(self) -> None: ... + def runTests(self) -> None: ... # undocumented + +main = TestProgram diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/mock.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/mock.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/mock.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/mock.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,26 +1,27 @@ -# Stubs for mock - import sys -from typing import Any, List, Optional, Sequence, Text, Tuple, Type, TypeVar +from typing import Any, Callable, Generic, List, Mapping, Optional, Sequence, Tuple, Type, TypeVar, Union, overload +_F = TypeVar("_F", bound=Callable[..., Any]) _T = TypeVar("_T") +_TT = TypeVar("_TT", bound=Type[Any]) +_R = TypeVar("_R") __all__ = [ - 'Mock', - 'MagicMock', - 'patch', - 'sentinel', - 'DEFAULT', - 'ANY', - 'call', - 'create_autospec', - 'AsyncMock', - 'FILTER_DIR', - 'NonCallableMock', - 'NonCallableMagicMock', - 'mock_open', - 'PropertyMock', - 'seal', + "Mock", + "MagicMock", + "patch", + "sentinel", + "DEFAULT", + "ANY", + "call", + "create_autospec", + "AsyncMock", + "FILTER_DIR", + "NonCallableMock", + "NonCallableMagicMock", + "mock_open", + "PropertyMock", + "seal", ] __version__: str @@ -40,21 +41,24 @@ DEFAULT: Any class _Call(Tuple[Any, ...]): - def __new__(cls, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ...) -> Any: ... + def __new__( + cls, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ... + ) -> Any: ... name: Any parent: Any from_kall: Any - def __init__(self, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ...) -> None: ... + def __init__( + self, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ... + ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + def __call__(self, *args: Any, **kwargs: Any) -> _Call: ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ... def call_list(self) -> Any: ... -call: Any - +call: _Call class _CallList(List[_Call]): def __contains__(self, value: Any) -> bool: ... @@ -68,42 +72,52 @@ class Base: def __init__(self, *args: Any, **kwargs: Any) -> None: ... - class NonCallableMock(Base, Any): # type: ignore + def __new__(__cls, *args: Any, **kw: Any) -> NonCallableMock: ... + def __init__( + self, + spec: Union[List[str], object, Type[object], None] = ..., + wraps: Optional[Any] = ..., + name: Optional[str] = ..., + spec_set: Union[List[str], object, Type[object], None] = ..., + parent: Optional[NonCallableMock] = ..., + _spec_state: Optional[Any] = ..., + _new_name: str = ..., + _new_parent: Optional[NonCallableMock] = ..., + _spec_as_instance: bool = ..., + _eat_self: Optional[bool] = ..., + unsafe: bool = ..., + **kwargs: Any, + ) -> None: ... def __getattr__(self, name: str) -> Any: ... if sys.version_info >= (3, 8): def _calls_repr(self, prefix: str = ...) -> str: ... - def assert_called_with(self, *args: Any, **kwargs: Any) -> None: ... def assert_not_called(self) -> None: ... def assert_called_once_with(self, *args: Any, **kwargs: Any) -> None: ... - def _format_mock_failure_message(self, args: Any, kwargs: Any, action: str = ...) -> str: ... elif sys.version_info >= (3, 5): def assert_called_with(_mock_self, *args: Any, **kwargs: Any) -> None: ... def assert_not_called(_mock_self) -> None: ... def assert_called_once_with(_mock_self, *args: Any, **kwargs: Any) -> None: ... - def _format_mock_failure_message(self, args: Any, kwargs: Any) -> str: ... - if sys.version_info >= (3, 8): + def assert_called(self) -> None: ... def assert_called_once(self) -> None: ... elif sys.version_info >= (3, 6): + def assert_called(_mock_self) -> None: ... def assert_called_once(_mock_self) -> None: ... - if sys.version_info >= (3, 6): def reset_mock(self, visited: Any = ..., *, return_value: bool = ..., side_effect: bool = ...) -> None: ... elif sys.version_info >= (3, 5): def reset_mock(self, visited: Any = ...) -> None: ... - if sys.version_info >= (3, 7): def _extract_mock_name(self) -> str: ... def _get_call_signature_from_name(self, name: str) -> Any: ... - def assert_any_call(self, *args: Any, **kwargs: Any) -> None: ... def assert_has_calls(self, calls: Sequence[_Call], any_order: bool = ...) -> None: ... def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ... - def _mock_add_spec(self, spec: Any, spec_set, _spec_as_instance: bool = ..., _eat_self: bool = ...) -> None: ... + def _mock_add_spec(self, spec: Any, spec_set: bool, _spec_as_instance: bool = ..., _eat_self: bool = ...) -> None: ... def attach_mock(self, mock: NonCallableMock, attribute: str) -> None: ... def configure_mock(self, **kwargs: Any) -> None: ... return_value: Any @@ -117,40 +131,80 @@ def _call_matcher(self, _call: Tuple[_Call, ...]) -> _Call: ... def _get_child_mock(self, **kw: Any) -> NonCallableMock: ... - class CallableMixin(Base): side_effect: Any - def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ... + def __init__( + self, + spec: Optional[Any] = ..., + side_effect: Optional[Any] = ..., + return_value: Any = ..., + wraps: Optional[Any] = ..., + name: Optional[Any] = ..., + spec_set: Optional[Any] = ..., + parent: Optional[Any] = ..., + _spec_state: Optional[Any] = ..., + _new_name: Any = ..., + _new_parent: Optional[Any] = ..., + **kwargs: Any, + ) -> None: ... def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ... class Mock(CallableMixin, NonCallableMock): ... -class _patch: +class _patch(Generic[_T]): attribute_name: Any - getter: Any - attribute: Any - new: Any + getter: Callable[[], Any] + attribute: str + new: _T new_callable: Any spec: Any create: bool has_local: Any spec_set: Any autospec: Any - kwargs: Any + kwargs: Mapping[str, Any] additional_patchers: Any - def __init__(self, getter: Any, attribute: Any, new: Any, spec: Any, create: Any, spec_set: Any, autospec: Any, new_callable: Any, kwargs: Any) -> None: ... - def copy(self) -> Any: ... - def __call__(self, func: Any) -> Any: ... - def decorate_class(self, klass: Any) -> Any: ... - def decorate_callable(self, func: Any) -> Any: ... - def get_original(self) -> Any: ... + @overload + def __init__( + self: _patch[MagicMock], + getter: Callable[[], Any], + attribute: str, + *, + spec: Optional[Any], + create: bool, + spec_set: Optional[Any], + autospec: Optional[Any], + new_callable: Optional[Any], + kwargs: Mapping[str, Any], + ) -> None: ... + # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any]. + # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock], + # but that's impossible with the current type system. + @overload + def __init__( + self: _patch[_T], + getter: Callable[[], Any], + attribute: str, + new: _T, + spec: Optional[Any], + create: bool, + spec_set: Optional[Any], + autospec: Optional[Any], + new_callable: Optional[Any], + kwargs: Mapping[str, Any], + ) -> None: ... + def copy(self) -> _patch[_T]: ... + def __call__(self, func: Callable[..., _R]) -> Callable[..., _R]: ... + def decorate_class(self, klass: _TT) -> _TT: ... + def decorate_callable(self, func: _F) -> _F: ... + def get_original(self) -> Tuple[Any, bool]: ... target: Any temp_original: Any - is_local: Any - def __enter__(self) -> Any: ... - def __exit__(self, *exc_info: Any) -> Any: ... - def start(self) -> Any: ... - def stop(self) -> Any: ... + is_local: bool + def __enter__(self) -> _T: ... + def __exit__(self, *exc_info: Any) -> None: ... + def start(self) -> _T: ... + def stop(self) -> None: ... class _patch_dict: in_dict: Any @@ -167,9 +221,69 @@ class _patcher: TEST_PREFIX: str dict: Type[_patch_dict] - def __call__(self, target: Any, new: Optional[Any] = ..., spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... - def object(self, target: Any, attribute: Text, new: Optional[Any] = ..., spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... - def multiple(self, target: Any, spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... + @overload + def __call__( # type: ignore + self, + target: Any, + *, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[MagicMock]: ... + # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any]. + # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock], + # but that's impossible with the current type system. + @overload + def __call__( + self, + target: Any, + new: _T, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[_T]: ... + @overload + def object( # type: ignore + self, + target: Any, + attribute: str, + *, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[MagicMock]: ... + @overload + def object( + self, + target: Any, + attribute: str, + new: _T = ..., + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[_T]: ... + def multiple( + self, + target: Any, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: _T, + ) -> _patch[_T]: ... def stopall(self) -> None: ... patch: _patcher @@ -200,7 +314,9 @@ ANY: Any -def create_autospec(spec: Any, spec_set: Any = ..., instance: Any = ..., _parent: Optional[Any] = ..., _name: Optional[Any] = ..., **kwargs: Any) -> Any: ... +def create_autospec( + spec: Any, spec_set: Any = ..., instance: Any = ..., _parent: Optional[Any] = ..., _name: Optional[Any] = ..., **kwargs: Any +) -> Any: ... class _SpecState: spec: Any @@ -209,7 +325,15 @@ parent: Any instance: Any name: Any - def __init__(self, spec: Any, spec_set: Any = ..., parent: Optional[Any] = ..., name: Optional[Any] = ..., ids: Optional[Any] = ..., instance: Any = ...) -> None: ... + def __init__( + self, + spec: Any, + spec_set: Any = ..., + parent: Optional[Any] = ..., + name: Optional[Any] = ..., + ids: Optional[Any] = ..., + instance: Any = ..., + ) -> None: ... def mock_open(mock: Optional[Any] = ..., read_data: Any = ...) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/result.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/result.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/result.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/result.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,14 @@ -from typing import Any, Callable, List, Optional, Tuple, Type, TypeVar, Union -from types import TracebackType import unittest.case +from types import TracebackType +from typing import Any, Callable, List, Optional, TextIO, Tuple, Type, TypeVar, Union - -_SysExcInfoType = Union[ - Tuple[Type[BaseException], BaseException, TracebackType], - Tuple[None, None, None], -] +_SysExcInfoType = Union[Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]] _F = TypeVar("_F", bound=Callable[..., Any]) # undocumented def failfast(method: _F) -> _F: ... - class TestResult: errors: List[Tuple[unittest.case.TestCase, str]] failures: List[Tuple[unittest.case.TestCase, str]] @@ -25,6 +20,10 @@ buffer: bool failfast: bool tb_locals: bool + def __init__( + self, stream: Optional[TextIO] = ..., descriptions: Optional[bool] = ..., verbosity: Optional[int] = ... + ) -> None: ... + def printErrors(self) -> None: ... def wasSuccessful(self) -> bool: ... def stop(self) -> None: ... def startTest(self, test: unittest.case.TestCase) -> None: ... @@ -35,8 +34,8 @@ def addFailure(self, test: unittest.case.TestCase, err: _SysExcInfoType) -> None: ... def addSuccess(self, test: unittest.case.TestCase) -> None: ... def addSkip(self, test: unittest.case.TestCase, reason: str) -> None: ... - def addExpectedFailure(self, test: unittest.case.TestCase, - err: _SysExcInfoType) -> None: ... + def addExpectedFailure(self, test: unittest.case.TestCase, err: _SysExcInfoType) -> None: ... def addUnexpectedSuccess(self, test: unittest.case.TestCase) -> None: ... - def addSubTest(self, test: unittest.case.TestCase, subtest: unittest.case.TestCase, - outcome: Optional[_SysExcInfoType]) -> None: ... + def addSubTest( + self, test: unittest.case.TestCase, subtest: unittest.case.TestCase, err: Optional[_SysExcInfoType] + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/runner.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/runner.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/runner.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/runner.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,10 @@ -from typing import Callable, Optional, TextIO, Tuple, Type, Union import unittest.case import unittest.result import unittest.suite - +from typing import Callable, Optional, TextIO, Tuple, Type, Union _ResultClassType = Callable[[TextIO, bool, int], unittest.result.TestResult] - class TextTestResult(unittest.result.TestResult): descriptions: bool # undocumented dots: bool # undocumented @@ -14,18 +12,13 @@ separator2: str showall: bool # undocumented stream: TextIO # undocumented - def __init__(self, stream: TextIO, descriptions: bool, - verbosity: int) -> None: ... + def __init__(self, stream: TextIO, descriptions: bool, verbosity: int) -> None: ... def getDescription(self, test: unittest.case.TestCase) -> str: ... def printErrors(self) -> None: ... def printErrorList(self, flavour: str, errors: Tuple[unittest.case.TestCase, str]) -> None: ... - -class TestRunner: - def run(self, test: Union[unittest.suite.TestSuite, unittest.case.TestCase]) -> unittest.result.TestResult: ... - - -class TextTestRunner(TestRunner): +class TextTestRunner(object): + resultclass: _ResultClassType def __init__( self, stream: Optional[TextIO] = ..., @@ -39,3 +32,4 @@ tb_locals: bool = ..., ) -> None: ... def _makeResult(self) -> unittest.result.TestResult: ... + def run(self, test: Union[unittest.suite.TestSuite, unittest.case.TestCase]) -> unittest.result.TestResult: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/signals.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/signals.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/signals.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/signals.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,12 @@ -from typing import Any, Callable, overload, TypeVar import unittest.result +from typing import Any, Callable, TypeVar, overload - -_F = TypeVar('_F', bound=Callable[..., Any]) - +_F = TypeVar("_F", bound=Callable[..., Any]) def installHandler() -> None: ... def registerResult(result: unittest.result.TestResult) -> None: ... def removeResult(result: unittest.result.TestResult) -> bool: ... @overload -def removeHandler() -> None: ... +def removeHandler(method: None = ...) -> None: ... @overload -def removeHandler(function: _F) -> _F: ... +def removeHandler(method: _F) -> _F: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/suite.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/suite.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/suite.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/suite.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,9 @@ -from typing import Iterable, Iterator, List, Union import unittest.case import unittest.result - +from typing import Iterable, Iterator, List, Union _TestType = Union[unittest.case.TestCase, TestSuite] - class BaseTestSuite(Iterable[_TestType]): _tests: List[unittest.case.TestCase] _removed_tests: int @@ -18,5 +16,5 @@ def countTestCases(self) -> int: ... def __iter__(self) -> Iterator[_TestType]: ... - -class TestSuite(BaseTestSuite): ... +class TestSuite(BaseTestSuite): + def run(self, result: unittest.result.TestResult, debug: bool = ...) -> unittest.result.TestResult: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/util.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/unittest/util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,6 @@ -# undocumented from typing import Any, List, Sequence, Tuple, TypeVar -_T = TypeVar('_T') +_T = TypeVar("_T") _Mismatch = Tuple[_T, _T, int] _MAX_LENGTH: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/error.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/error.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/error.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/error.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,13 @@ -from typing import Dict, Union +from typing import IO, Mapping, Optional, Union from urllib.response import addinfourl # Stubs for urllib.error class URLError(IOError): reason: Union[str, BaseException] + class HTTPError(URLError, addinfourl): code: int - def __init__(self, url, code, msg, hdrs, fp) -> None: ... + def __init__(self, url: str, code: int, msg: str, hdrs: Mapping[str, str], fp: Optional[IO[bytes]]) -> None: ... + class ContentTooShortError(URLError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/parse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/parse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/parse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/parse.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,10 @@ -# Stubs for urllib.parse -from typing import Any, List, Dict, Tuple, AnyStr, Generic, overload, Sequence, Mapping, Union, NamedTuple, Callable, Optional import sys +from typing import Any, AnyStr, Callable, Dict, Generic, List, Mapping, NamedTuple, Optional, Sequence, Tuple, Union, overload -_Str = Union[bytes, str] +if sys.version_info >= (3, 9): + from types import GenericAlias +_Str = Union[bytes, str] uses_relative: List[str] uses_netloc: List[str] @@ -20,32 +21,31 @@ class _ResultMixinStr(_ResultMixinBase[str]): def encode(self, encoding: str = ..., errors: str = ...) -> _ResultMixinBytes: ... - class _ResultMixinBytes(_ResultMixinBase[str]): def decode(self, encoding: str = ..., errors: str = ...) -> _ResultMixinStr: ... - class _NetlocResultMixinBase(Generic[AnyStr]): username: Optional[AnyStr] password: Optional[AnyStr] hostname: Optional[AnyStr] port: Optional[int] + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class _NetlocResultMixinStr(_NetlocResultMixinBase[str], _ResultMixinStr): ... - class _NetlocResultMixinBytes(_NetlocResultMixinBase[bytes], _ResultMixinBytes): ... class _DefragResultBase(Tuple[Any, ...], Generic[AnyStr]): url: AnyStr fragment: AnyStr - class _SplitResultBase(NamedTuple): scheme: str netloc: str path: str query: str fragment: str + class _SplitResultBytesBase(NamedTuple): scheme: bytes netloc: bytes @@ -60,6 +60,7 @@ params: str query: str fragment: str + class _ParseResultBytesBase(NamedTuple): scheme: bytes netloc: bytes @@ -70,16 +71,12 @@ # Structured result objects for string data class DefragResult(_DefragResultBase[str], _ResultMixinStr): ... - class SplitResult(_SplitResultBase, _NetlocResultMixinStr): ... - class ParseResult(_ParseResultBase, _NetlocResultMixinStr): ... # Structured result objects for bytes data class DefragResultBytes(_DefragResultBase[bytes], _ResultMixinBytes): ... - class SplitResultBytes(_SplitResultBytesBase, _NetlocResultMixinBytes): ... - class ParseResultBytes(_ParseResultBytesBase, _NetlocResultMixinBytes): ... if sys.version_info >= (3, 8): @@ -102,35 +99,28 @@ else: def parse_qs( - qs: Optional[AnyStr], keep_blank_values: bool = ..., strict_parsing: bool = ..., encoding: str = ..., errors: str = ..., + qs: Optional[AnyStr], keep_blank_values: bool = ..., strict_parsing: bool = ..., encoding: str = ..., errors: str = ... ) -> Dict[AnyStr, List[AnyStr]]: ... def parse_qsl( - qs: Optional[AnyStr], keep_blank_values: bool = ..., strict_parsing: bool = ..., encoding: str = ..., errors: str = ..., + qs: Optional[AnyStr], keep_blank_values: bool = ..., strict_parsing: bool = ..., encoding: str = ..., errors: str = ... ) -> List[Tuple[AnyStr, AnyStr]]: ... @overload def quote(string: str, safe: _Str = ..., encoding: Optional[str] = ..., errors: Optional[str] = ...) -> str: ... @overload def quote(string: bytes, safe: _Str = ...) -> str: ... - def quote_from_bytes(bs: bytes, safe: _Str = ...) -> str: ... - @overload def quote_plus(string: str, safe: _Str = ..., encoding: Optional[str] = ..., errors: Optional[str] = ...) -> str: ... @overload def quote_plus(string: bytes, safe: _Str = ...) -> str: ... - def unquote(string: str, encoding: str = ..., errors: str = ...) -> str: ... - def unquote_to_bytes(string: _Str) -> bytes: ... - def unquote_plus(string: str, encoding: str = ..., errors: str = ...) -> str: ... - @overload def urldefrag(url: str) -> DefragResult: ... @overload def urldefrag(url: Optional[bytes]) -> DefragResultBytes: ... - def urlencode( query: Union[Mapping[Any, Any], Mapping[Any, Sequence[Any]], Sequence[Tuple[Any, Any]], Sequence[Tuple[Any, Sequence[Any]]]], doseq: bool = ..., @@ -139,27 +129,24 @@ errors: str = ..., quote_via: Callable[[str, AnyStr, str, str], str] = ..., ) -> str: ... - def urljoin(base: AnyStr, url: Optional[AnyStr], allow_fragments: bool = ...) -> AnyStr: ... - @overload def urlparse(url: str, scheme: Optional[str] = ..., allow_fragments: bool = ...) -> ParseResult: ... @overload def urlparse(url: Optional[bytes], scheme: Optional[bytes] = ..., allow_fragments: bool = ...) -> ParseResultBytes: ... - @overload def urlsplit(url: str, scheme: Optional[str] = ..., allow_fragments: bool = ...) -> SplitResult: ... @overload def urlsplit(url: Optional[bytes], scheme: Optional[bytes] = ..., allow_fragments: bool = ...) -> SplitResultBytes: ... - @overload def urlunparse( components: Tuple[Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr]] ) -> AnyStr: ... @overload def urlunparse(components: Sequence[Optional[AnyStr]]) -> AnyStr: ... - @overload -def urlunsplit(components: Tuple[Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr]]) -> AnyStr: ... +def urlunsplit( + components: Tuple[Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr], Optional[AnyStr]] +) -> AnyStr: ... @overload def urlunsplit(components: Sequence[Optional[AnyStr]]) -> AnyStr: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/request.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/request.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/request.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/request.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,30 +1,43 @@ -# Stubs for urllib.request (Python 3.4) - +import os +import ssl +from email.message import Message +from http.client import HTTPMessage, HTTPResponse, _HTTPConnectionProtocol +from http.cookiejar import CookieJar from typing import ( - Any, Callable, ClassVar, Dict, List, IO, Mapping, Optional, Sequence, Tuple, - TypeVar, Union, overload, NoReturn, + IO, + Any, + Callable, + ClassVar, + Dict, + List, + Mapping, + NoReturn, + Optional, + Pattern, + Sequence, + Tuple, + TypeVar, + Union, + overload, ) -from http.client import HTTPResponse, HTTPMessage, _HTTPConnectionProtocol -from http.cookiejar import CookieJar -from email.message import Message +from urllib.error import HTTPError from urllib.response import addinfourl -import ssl -import sys -import os -_T = TypeVar('_T') +_T = TypeVar("_T") _UrlopenRet = Any def urlopen( - url: Union[str, Request], data: Optional[bytes] = ..., - timeout: Optional[float] = ..., *, cafile: Optional[str] = ..., - capath: Optional[str] = ..., cadefault: bool = ..., - context: Optional[ssl.SSLContext] = ... + url: Union[str, Request], + data: Optional[bytes] = ..., + timeout: Optional[float] = ..., + *, + cafile: Optional[str] = ..., + capath: Optional[str] = ..., + cadefault: bool = ..., + context: Optional[ssl.SSLContext] = ..., ) -> _UrlopenRet: ... def install_opener(opener: OpenerDirector) -> None: ... -def build_opener( - *handlers: Union[BaseHandler, Callable[[], BaseHandler]] -) -> OpenerDirector: ... +def build_opener(*handlers: Union[BaseHandler, Callable[[], BaseHandler]]) -> OpenerDirector: ... def url2pathname(pathname: str) -> str: ... def pathname2url(pathname: str) -> str: ... def getproxies() -> Dict[str, str]: ... @@ -47,9 +60,15 @@ headers: Dict[str, str] unverifiable: bool method: Optional[str] - def __init__(self, url: str, data: Optional[bytes] = ..., - headers: Dict[str, str] = ..., origin_req_host: Optional[str] = ..., - unverifiable: bool = ..., method: Optional[str] = ...) -> None: ... + def __init__( + self, + url: str, + data: Optional[bytes] = ..., + headers: Dict[str, str] = ..., + origin_req_host: Optional[str] = ..., + unverifiable: bool = ..., + method: Optional[str] = ..., + ) -> None: ... def get_method(self) -> str: ... def add_header(self, key: str, val: str) -> None: ... def add_unredirected_header(self, key: str, val: str) -> None: ... @@ -62,87 +81,103 @@ @overload def get_header(self, header_name: str, default: _T) -> Union[str, _T]: ... def header_items(self) -> List[Tuple[str, str]]: ... + def has_proxy(self) -> bool: ... class OpenerDirector: addheaders: List[Tuple[str, str]] def add_handler(self, handler: BaseHandler) -> None: ... - def open(self, fullurl: Union[str, Request], data: Optional[bytes] = ..., - timeout: Optional[float] = ...) -> _UrlopenRet: ... + def open(self, fullurl: Union[str, Request], data: Optional[bytes] = ..., timeout: Optional[float] = ...) -> _UrlopenRet: ... def error(self, proto: str, *args: Any) -> _UrlopenRet: ... - + def close(self) -> None: ... class BaseHandler: handler_order: ClassVar[int] parent: OpenerDirector def add_parent(self, parent: OpenerDirector) -> None: ... def close(self) -> None: ... - def http_error_nnn(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> _UrlopenRet: ... + def http_error_nnn(self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str]) -> _UrlopenRet: ... -class HTTPDefaultErrorHandler(BaseHandler): ... +class HTTPDefaultErrorHandler(BaseHandler): + def http_error_default( + self, req: Request, fp: IO[bytes], code: int, msg: str, hdrs: Mapping[str, str] + ) -> HTTPError: ... # undocumented class HTTPRedirectHandler(BaseHandler): - def redirect_request(self, req: Request, fp: IO[str], code: int, msg: str, - headers: Mapping[str, str], - newurl: str) -> Optional[Request]: ... - def http_error_301(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... - def http_error_302(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... - def http_error_303(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... - def http_error_307(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... + max_redirections: ClassVar[int] # undocumented + max_repeats: ClassVar[int] # undocumented + inf_msg: ClassVar[str] # undocumented + def redirect_request( + self, req: Request, fp: IO[str], code: int, msg: str, headers: Mapping[str, str], newurl: str + ) -> Optional[Request]: ... + def http_error_301( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... + def http_error_302( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... + def http_error_303( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... + def http_error_307( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... class HTTPCookieProcessor(BaseHandler): cookiejar: CookieJar def __init__(self, cookiejar: Optional[CookieJar] = ...) -> None: ... + def http_request(self, request: Request) -> Request: ... # undocumented + def http_response(self, request: Request, response: HTTPResponse) -> HTTPResponse: ... # undocumented + def https_request(self, request: Request) -> Request: ... # undocumented + def https_response(self, request: Request, response: HTTPResponse) -> HTTPResponse: ... # undocumented class ProxyHandler(BaseHandler): def __init__(self, proxies: Optional[Dict[str, str]] = ...) -> None: ... + def proxy_open(self, req: Request, proxy: str, type: str) -> Optional[_UrlopenRet]: ... # undocumented # TODO add a method for every (common) proxy protocol class HTTPPasswordMgr: - def add_password(self, realm: str, uri: Union[str, Sequence[str]], - user: str, passwd: str) -> None: ... + def add_password(self, realm: str, uri: Union[str, Sequence[str]], user: str, passwd: str) -> None: ... def find_user_password(self, realm: str, authuri: str) -> Tuple[Optional[str], Optional[str]]: ... + def is_suburi(self, base: str, test: str) -> bool: ... # undocumented + def reduce_uri(self, uri: str, default_port: bool = ...) -> str: ... # undocumented class HTTPPasswordMgrWithDefaultRealm(HTTPPasswordMgr): - def add_password(self, realm: Optional[str], uri: Union[str, Sequence[str]], - user: str, passwd: str) -> None: ... + def add_password(self, realm: Optional[str], uri: Union[str, Sequence[str]], user: str, passwd: str) -> None: ... def find_user_password(self, realm: Optional[str], authuri: str) -> Tuple[Optional[str], Optional[str]]: ... class HTTPPasswordMgrWithPriorAuth(HTTPPasswordMgrWithDefaultRealm): def add_password( - self, - realm: Optional[str], - uri: Union[str, Sequence[str]], - user: str, - passwd: str, - is_authenticated: bool = ..., + self, realm: Optional[str], uri: Union[str, Sequence[str]], user: str, passwd: str, is_authenticated: bool = ... ) -> None: ... def update_authenticated(self, uri: Union[str, Sequence[str]], is_authenticated: bool = ...) -> None: ... def is_authenticated(self, authuri: str) -> bool: ... class AbstractBasicAuthHandler: - def __init__(self, - password_mgr: Optional[HTTPPasswordMgr] = ...) -> None: ... - def http_error_auth_reqed(self, authreq: str, host: str, req: Request, - headers: Mapping[str, str]) -> None: ... + rx: ClassVar[Pattern] # undocumented + def __init__(self, password_mgr: Optional[HTTPPasswordMgr] = ...) -> None: ... + def http_error_auth_reqed(self, authreq: str, host: str, req: Request, headers: Mapping[str, str]) -> None: ... + def http_request(self, req: Request) -> Request: ... # undocumented + def http_response(self, req: Request, response: HTTPResponse) -> HTTPResponse: ... # undocumented + def https_request(self, req: Request) -> Request: ... # undocumented + def https_response(self, req: Request, response: HTTPResponse) -> HTTPResponse: ... # undocumented + def retry_http_basic_auth(self, host: str, req: Request, realm: str) -> Optional[_UrlopenRet]: ... # undocumented class HTTPBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): - def http_error_401(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... + auth_header: ClassVar[str] # undocumented + def http_error_401( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): - def http_error_407(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... + auth_header: ClassVar[str] + def http_error_407( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... class AbstractDigestAuthHandler: def __init__(self, passwd: Optional[HTTPPasswordMgr] = ...) -> None: ... def reset_retry_count(self) -> None: ... - def http_error_auth_reqed(self, auth_header: str, host: str, req: Request, - headers: Mapping[str, str]) -> None: ... + def http_error_auth_reqed(self, auth_header: str, host: str, req: Request, headers: Mapping[str, str]) -> None: ... def retry_http_digest_auth(self, req: Request, auth: str) -> Optional[_UrlopenRet]: ... def get_cnonce(self, nonce: str) -> str: ... def get_authorization(self, req: Request, chal: Mapping[str, str]) -> str: ... @@ -150,73 +185,157 @@ def get_entity_digest(self, data: Optional[bytes], chal: Mapping[str, str]) -> Optional[str]: ... class HTTPDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler): - def http_error_401(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... + auth_header: ClassVar[str] # undocumented + def http_error_401( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... class ProxyDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler): - def http_error_407(self, req: Request, fp: IO[str], code: int, msg: int, - headers: Mapping[str, str]) -> Optional[_UrlopenRet]: ... + auth_header: ClassVar[str] # undocumented + def http_error_407( + self, req: Request, fp: IO[str], code: int, msg: int, headers: Mapping[str, str] + ) -> Optional[_UrlopenRet]: ... class AbstractHTTPHandler(BaseHandler): # undocumented def __init__(self, debuglevel: int = ...) -> None: ... def set_http_debuglevel(self, level: int) -> None: ... def do_request_(self, request: Request) -> Request: ... - def do_open(self, - http_class: _HTTPConnectionProtocol, - req: Request, - **http_conn_args: Any) -> HTTPResponse: ... + def do_open(self, http_class: _HTTPConnectionProtocol, req: Request, **http_conn_args: Any) -> HTTPResponse: ... class HTTPHandler(AbstractHTTPHandler): def http_open(self, req: Request) -> HTTPResponse: ... def http_request(self, request: Request) -> Request: ... # undocumented class HTTPSHandler(AbstractHTTPHandler): - def __init__(self, debuglevel: int = ..., - context: Optional[ssl.SSLContext] = ..., - check_hostname: Optional[bool] = ...) -> None: ... + def __init__( + self, debuglevel: int = ..., context: Optional[ssl.SSLContext] = ..., check_hostname: Optional[bool] = ... + ) -> None: ... def https_open(self, req: Request) -> HTTPResponse: ... def https_request(self, request: Request) -> Request: ... # undocumented class FileHandler(BaseHandler): + names: ClassVar[Optional[Tuple[str, ...]]] # undocumented def file_open(self, req: Request) -> addinfourl: ... + def get_names(self) -> Tuple[str, ...]: ... # undocumented + def open_local_file(self, req: Request) -> addinfourl: ... # undocumented class DataHandler(BaseHandler): def data_open(self, req: Request) -> addinfourl: ... +class ftpwrapper: # undocumented + def __init__( + self, user: str, passwd: str, host: str, port: int, dirs: str, timeout: Optional[float] = ..., persistent: bool = ... + ) -> None: ... + class FTPHandler(BaseHandler): def ftp_open(self, req: Request) -> addinfourl: ... + def connect_ftp( + self, user: str, passwd: str, host: str, port: int, dirs: str, timeout: float + ) -> ftpwrapper: ... # undocumented class CacheFTPHandler(FTPHandler): def setTimeout(self, t: float) -> None: ... def setMaxConns(self, m: int) -> None: ... + def check_cache(self) -> None: ... # undocumented + def clear_cache(self) -> None: ... # undocumented + def connect_ftp( + self, user: str, passwd: str, host: str, port: int, dirs: str, timeout: float + ) -> ftpwrapper: ... # undocumented class UnknownHandler(BaseHandler): def unknown_open(self, req: Request) -> NoReturn: ... class HTTPErrorProcessor(BaseHandler): - def http_response(self, request, response) -> _UrlopenRet: ... - def https_response(self, request, response) -> _UrlopenRet: ... + def http_response(self, request: Request, response: HTTPResponse) -> _UrlopenRet: ... + def https_response(self, request: Request, response: HTTPResponse) -> _UrlopenRet: ... -if sys.version_info >= (3, 6): - def urlretrieve(url: str, filename: Optional[Union[str, os.PathLike[Any]]] = ..., - reporthook: Optional[Callable[[int, int, int], None]] = ..., - data: Optional[bytes] = ...) -> Tuple[str, HTTPMessage]: ... -else: - def urlretrieve(url: str, filename: Optional[str] = ..., - reporthook: Optional[Callable[[int, int, int], None]] = ..., - data: Optional[bytes] = ...) -> Tuple[str, HTTPMessage]: ... +def urlretrieve( + url: str, + filename: Optional[Union[str, os.PathLike[Any]]] = ..., + reporthook: Optional[Callable[[int, int, int], None]] = ..., + data: Optional[bytes] = ..., +) -> Tuple[str, HTTPMessage]: ... def urlcleanup() -> None: ... class URLopener: version: ClassVar[str] - def __init__(self, proxies: Optional[Dict[str, str]] = ..., - **x509: str) -> None: ... + def __init__(self, proxies: Optional[Dict[str, str]] = ..., **x509: str) -> None: ... def open(self, fullurl: str, data: Optional[bytes] = ...) -> _UrlopenRet: ... - def open_unknown(self, fullurl: str, - data: Optional[bytes] = ...) -> _UrlopenRet: ... - def retrieve(self, url: str, filename: Optional[str] = ..., - reporthook: Optional[Callable[[int, int, int], None]] = ..., - data: Optional[bytes] = ...) -> Tuple[str, Optional[Message]]: ... + def open_unknown(self, fullurl: str, data: Optional[bytes] = ...) -> _UrlopenRet: ... + def retrieve( + self, + url: str, + filename: Optional[str] = ..., + reporthook: Optional[Callable[[int, int, int], None]] = ..., + data: Optional[bytes] = ..., + ) -> Tuple[str, Optional[Message]]: ... + def addheader(self, *args: Tuple[str, str]) -> None: ... # undocumented + def cleanup(self) -> None: ... # undocumented + def close(self) -> None: ... # undocumented + def http_error( + self, url: str, fp: IO[bytes], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] = ... + ) -> _UrlopenRet: ... # undocumented + def http_error_default( + self, url: str, fp: IO[bytes], errcode: int, errmsg: str, headers: Mapping[str, str] + ) -> _UrlopenRet: ... # undocumented + def open_data(self, url: str, data: Optional[bytes] = ...) -> addinfourl: ... # undocumented + def open_file(self, url: str) -> addinfourl: ... # undocumented + def open_ftp(self, url: str) -> addinfourl: ... # undocumented + def open_http(self, url: str, data: Optional[bytes] = ...) -> _UrlopenRet: ... # undocumented + def open_https(self, url: str, data: Optional[bytes] = ...) -> _UrlopenRet: ... # undocumented + def open_local_file(self, url: str) -> addinfourl: ... # undocumented + def open_unknown_proxy(self, proxy: str, fullurl: str, data: Optional[bytes] = ...) -> None: ... # undocumented class FancyURLopener(URLopener): def prompt_user_passwd(self, host: str, realm: str) -> Tuple[str, str]: ... + def get_user_passwd(self, host: str, realm: str, clear_cache: int = ...) -> Tuple[str, str]: ... # undocumented + def http_error_301( + self, url: str, fp: IO[str], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] = ... + ) -> Optional[Union[_UrlopenRet, addinfourl]]: ... # undocumented + def http_error_302( + self, url: str, fp: IO[str], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] = ... + ) -> Optional[Union[_UrlopenRet, addinfourl]]: ... # undocumented + def http_error_303( + self, url: str, fp: IO[str], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] = ... + ) -> Optional[Union[_UrlopenRet, addinfourl]]: ... # undocumented + def http_error_307( + self, url: str, fp: IO[str], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] = ... + ) -> Optional[Union[_UrlopenRet, addinfourl]]: ... # undocumented + def http_error_401( + self, + url: str, + fp: IO[str], + errcode: int, + errmsg: str, + headers: Mapping[str, str], + data: Optional[bytes] = ..., + retry: bool = ..., + ) -> Optional[_UrlopenRet]: ... # undocumented + def http_error_407( + self, + url: str, + fp: IO[str], + errcode: int, + errmsg: str, + headers: Mapping[str, str], + data: Optional[bytes] = ..., + retry: bool = ..., + ) -> Optional[_UrlopenRet]: ... # undocumented + def http_error_default( + self, url: str, fp: IO[bytes], errcode: int, errmsg: str, headers: Mapping[str, str] + ) -> addinfourl: ... # undocumented + def redirect_internal( + self, url: str, fp: IO[str], errcode: int, errmsg: str, headers: Mapping[str, str], data: Optional[bytes] + ) -> Optional[_UrlopenRet]: ... # undocumented + def retry_http_basic_auth( + self, url: str, realm: str, data: Optional[bytes] = ... + ) -> Optional[_UrlopenRet]: ... # undocumented + def retry_https_basic_auth( + self, url: str, realm: str, data: Optional[bytes] = ... + ) -> Optional[_UrlopenRet]: ... # undocumented + def retry_proxy_http_basic_auth( + self, url: str, realm: str, data: Optional[bytes] = ... + ) -> Optional[_UrlopenRet]: ... # undocumented + def retry_proxy_https_basic_auth( + self, url: str, realm: str, data: Optional[bytes] = ... + ) -> Optional[_UrlopenRet]: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/response.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/response.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/response.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/response.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,6 @@ -# private module, we only expose what's needed - -from typing import Any, BinaryIO, Callable, IO, Iterable, List, Mapping, Optional, Tuple, Type, TypeVar from email.message import Message from types import TracebackType +from typing import IO, Any, BinaryIO, Callable, Iterable, List, Optional, Tuple, Type, TypeVar _AIUT = TypeVar("_AIUT", bound=addbase) @@ -10,7 +8,9 @@ fp: IO[bytes] def __init__(self, fp: IO[bytes]) -> None: ... def __enter__(self: _AIUT) -> _AIUT: ... - def __exit__(self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]) -> None: ... + def __exit__( + self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> None: ... def __iter__(self: _AIUT) -> _AIUT: ... def __next__(self) -> bytes: ... def close(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/robotparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/robotparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/robotparser.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/urllib/robotparser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for urllib.robotparser (Python 3.4) - -from typing import Iterable, List, NamedTuple, Optional import sys +from typing import Iterable, List, NamedTuple, Optional class _RequestRate(NamedTuple): requests: int @@ -15,8 +13,7 @@ def can_fetch(self, user_agent: str, url: str) -> bool: ... def mtime(self) -> int: ... def modified(self) -> None: ... - if sys.version_info >= (3, 6): - def crawl_delay(self, useragent: str) -> Optional[str]: ... - def request_rate(self, useragent: str) -> Optional[_RequestRate]: ... + def crawl_delay(self, useragent: str) -> Optional[str]: ... + def request_rate(self, useragent: str) -> Optional[_RequestRate]: ... if sys.version_info >= (3, 8): def site_maps(self) -> Optional[List[str]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/venv/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/venv/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/venv/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/venv/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ import sys from _typeshed import AnyPath -from typing import Optional, Sequence, Text from types import SimpleNamespace +from typing import Optional, Sequence class EnvBuilder: system_site_packages: bool @@ -13,11 +13,35 @@ prompt: Optional[str] if sys.version_info >= (3, 9): - def __init__(self, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., upgrade: bool = ..., with_pip: bool = ..., prompt: Optional[str] = ..., upgrade_deps: bool = ...) -> None: ... + def __init__( + self, + system_site_packages: bool = ..., + clear: bool = ..., + symlinks: bool = ..., + upgrade: bool = ..., + with_pip: bool = ..., + prompt: Optional[str] = ..., + upgrade_deps: bool = ..., + ) -> None: ... elif sys.version_info >= (3, 6): - def __init__(self, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., upgrade: bool = ..., with_pip: bool = ..., prompt: Optional[str] = ...) -> None: ... + def __init__( + self, + system_site_packages: bool = ..., + clear: bool = ..., + symlinks: bool = ..., + upgrade: bool = ..., + with_pip: bool = ..., + prompt: Optional[str] = ..., + ) -> None: ... else: - def __init__(self, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., upgrade: bool = ..., with_pip: bool = ...) -> None: ... + def __init__( + self, + system_site_packages: bool = ..., + clear: bool = ..., + symlinks: bool = ..., + upgrade: bool = ..., + with_pip: bool = ..., + ) -> None: ... def create(self, env_dir: AnyPath) -> None: ... def clear_directory(self, path: AnyPath) -> None: ... # undocumented def ensure_directories(self, env_dir: AnyPath) -> SimpleNamespace: ... @@ -33,10 +57,29 @@ def upgrade_dependencies(self, context: SimpleNamespace) -> None: ... if sys.version_info >= (3, 9): - def create(env_dir: AnyPath, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., with_pip: bool = ..., prompt: Optional[str] = ..., upgrade_deps: bool = ...) -> None: ... + def create( + env_dir: AnyPath, + system_site_packages: bool = ..., + clear: bool = ..., + symlinks: bool = ..., + with_pip: bool = ..., + prompt: Optional[str] = ..., + upgrade_deps: bool = ..., + ) -> None: ... + elif sys.version_info >= (3, 6): - def create(env_dir: AnyPath, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., with_pip: bool = ..., prompt: Optional[str] = ...) -> None: ... + def create( + env_dir: AnyPath, + system_site_packages: bool = ..., + clear: bool = ..., + symlinks: bool = ..., + with_pip: bool = ..., + prompt: Optional[str] = ..., + ) -> None: ... + else: - def create(env_dir: AnyPath, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., with_pip: bool = ...) -> None: ... + def create( + env_dir: AnyPath, system_site_packages: bool = ..., clear: bool = ..., symlinks: bool = ..., with_pip: bool = ... + ) -> None: ... -def main(args: Optional[Sequence[Text]] = ...) -> None: ... +def main(args: Optional[Sequence[str]] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_winapi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_winapi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/_winapi.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/_winapi.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,5 +1,5 @@ import sys -from typing import Any, Union, Tuple, Optional, overload, Dict, NoReturn, Sequence +from typing import Any, Dict, NoReturn, Optional, Sequence, Tuple, Union, overload from typing_extensions import Literal CREATE_NEW_CONSOLE: int @@ -47,24 +47,58 @@ WAIT_TIMEOUT: int def CloseHandle(__handle: int) -> None: ... - @overload def ConnectNamedPipe(handle: int, overlapped: Literal[True]) -> Overlapped: ... @overload def ConnectNamedPipe(handle: int, overlapped: Literal[False] = ...) -> None: ... @overload def ConnectNamedPipe(handle: int, overlapped: bool) -> Optional[Overlapped]: ... - -def CreateFile(__file_name: str, __desired_access: int, __share_mode: int, __security_attributes: int, __creation_disposition: int, __flags_and_attributes: int, __template_file: int) -> int: ... +def CreateFile( + __file_name: str, + __desired_access: int, + __share_mode: int, + __security_attributes: int, + __creation_disposition: int, + __flags_and_attributes: int, + __template_file: int, +) -> int: ... def CreateJunction(__src_path: str, __dst_path: str) -> None: ... -def CreateNamedPipe(__name: str, __open_mode: int, __pipe_mode: int, __max_instances: int, __out_buffer_size: int, __in_buffer_size: int, __default_timeout: int, __security_attributes: int) -> int: ... +def CreateNamedPipe( + __name: str, + __open_mode: int, + __pipe_mode: int, + __max_instances: int, + __out_buffer_size: int, + __in_buffer_size: int, + __default_timeout: int, + __security_attributes: int, +) -> int: ... def CreatePipe(__pipe_attrs: Any, __size: int) -> Tuple[int, int]: ... -def CreateProcess(__application_name: Optional[str], __command_line: Optional[str], __proc_attrs: Any, __thread_attrs: Any, __inherit_handles: bool, __creation_flags: int, __env_mapping: Dict[str, str], __current_directory: Optional[str], __startup_info: Any) -> Tuple[int, int, int, int]: ... -def DuplicateHandle(__source_process_handle: int, __source_handle: int, __target_process_handle: int, __desired_access: int, __inherit_handle: bool, __options: int = ...) -> int: ... +def CreateProcess( + __application_name: Optional[str], + __command_line: Optional[str], + __proc_attrs: Any, + __thread_attrs: Any, + __inherit_handles: bool, + __creation_flags: int, + __env_mapping: Dict[str, str], + __current_directory: Optional[str], + __startup_info: Any, +) -> Tuple[int, int, int, int]: ... +def DuplicateHandle( + __source_process_handle: int, + __source_handle: int, + __target_process_handle: int, + __desired_access: int, + __inherit_handle: bool, + __options: int = ..., +) -> int: ... def ExitProcess(__ExitCode: int) -> NoReturn: ... + if sys.version_info >= (3, 7): def GetACP() -> int: ... def GetFileType(handle: int) -> int: ... + def GetCurrentProcess() -> int: ... def GetExitCodeProcess(__process: int) -> int: ... def GetLastError() -> int: ... @@ -73,21 +107,19 @@ def GetVersion() -> int: ... def OpenProcess(__desired_access: int, __inherit_handle: bool, __process_id: int) -> int: ... def PeekNamedPipe(__handle: int, __size: int = ...) -> Union[Tuple[int, int], Tuple[bytes, int, int]]: ... - @overload def ReadFile(handle: int, size: int, overlapped: Literal[True]) -> Tuple[Overlapped, int]: ... @overload def ReadFile(handle: int, size: int, overlapped: Literal[False] = ...) -> Tuple[bytes, int]: ... @overload def ReadFile(handle: int, size: int, overlapped: Union[int, bool]) -> Tuple[Any, int]: ... - -def SetNamedPipeHandleState(__named_pipe: int, __mode: Optional[int], __max_collection_count: Optional[int], __collect_data_timeout: Optional[int]) -> None: ... +def SetNamedPipeHandleState( + __named_pipe: int, __mode: Optional[int], __max_collection_count: Optional[int], __collect_data_timeout: Optional[int] +) -> None: ... def TerminateProcess(__handle: int, __exit_code: int) -> None: ... def WaitForMultipleObjects(__handle_seq: Sequence[int], __wait_flag: bool, __milliseconds: int = ...) -> int: ... def WaitForSingleObject(__handle: int, __milliseconds: int) -> int: ... def WaitNamedPipe(__name: str, __timeout: int) -> None: ... - - @overload def WriteFile(handle: int, buffer: bytes, overlapped: Literal[True]) -> Tuple[Overlapped, int]: ... @overload @@ -95,7 +127,6 @@ @overload def WriteFile(handle: int, buffer: bytes, overlapped: Union[int, bool]) -> Tuple[Any, int]: ... - class Overlapped: event: int = ... def GetOverlappedResult(self, __wait: bool) -> Tuple[int, int]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/winreg.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/winreg.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/winreg.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/winreg.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,10 @@ - import sys - -from typing import Optional, Type, Union, Tuple, Any from types import TracebackType +from typing import Any, Optional, Tuple, Type, Union _KeyType = Union[HKEYType, int] -def CloseKey(__hkey: _KeyType): ... +def CloseKey(__hkey: _KeyType) -> None: ... def ConnectRegistry(__computer_name: Optional[str], __key: _KeyType) -> HKEYType: ... def CreateKey(__key: _KeyType, __sub_key: Optional[str]) -> HKEYType: ... def CreateKeyEx(key: _KeyType, sub_key: Optional[str], reserved: int = ..., access: int = ...) -> HKEYType: ... @@ -25,7 +23,9 @@ def QueryValueEx(__key: _KeyType, __name: str) -> Tuple[Any, int]: ... def SaveKey(__key: _KeyType, __file_name: str) -> None: ... def SetValue(__key: _KeyType, __sub_key: str, __type: int, __value: str) -> None: ... -def SetValueEx(__key: _KeyType, __value_name: str, __reserved: Any, __type: int, __value: str) -> None: ... # reserved is ignored +def SetValueEx( + __key: _KeyType, __value_name: Optional[str], __reserved: Any, __type: int, __value: Union[str, int] +) -> None: ... # reserved is ignored def DisableReflectionKey(__key: _KeyType) -> None: ... def EnableReflectionKey(__key: _KeyType) -> None: ... def QueryReflectionKey(__key: _KeyType) -> bool: ... @@ -93,7 +93,8 @@ def __bool__(self) -> bool: ... def __int__(self) -> int: ... def __enter__(self) -> HKEYType: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> Optional[bool]: ... - + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> Optional[bool]: ... def Close(self) -> None: ... def Detach(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/client.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/client.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/client.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/client.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,17 +1,17 @@ -import io -import sys -import time import gzip import http.client - -from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Protocol, Text, Tuple, Type, Union, overload -from typing_extensions import Literal -from types import TracebackType -from datetime import datetime +import sys +import time from _typeshed import SupportsRead, SupportsWrite +from datetime import datetime +from io import BytesIO +from types import TracebackType +from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Protocol, Tuple, Type, Union, overload +from typing_extensions import Literal class _SupportsTimeTuple(Protocol): def timetuple(self) -> time.struct_time: ... + _DateTimeComparable = Union[DateTime, datetime, str, _SupportsTimeTuple] _Marshallable = Union[None, bool, int, float, str, bytes, tuple, list, dict, datetime, DateTime, Binary] _XMLDate = Union[int, datetime, Tuple[int, ...], time.struct_time] @@ -41,7 +41,6 @@ errcode: int errmsg: str headers: Dict[str, str] - def __init__(self, url: str, errcode: int, errmsg: str, headers: Dict[str, str]) -> None: ... class ResponseError(Error): ... @@ -50,10 +49,8 @@ faultCode: str faultString: str - def __init__(self, faultCode: str, faultString: str, **extra: Any) -> None: ... - boolean = bool Boolean = bool @@ -63,8 +60,7 @@ class DateTime: value: str # undocumented - - def __init__(self, value: Union[int, str, datetime, time.struct_time, Tuple[int, ...]] = ...): ... + def __init__(self, value: Union[int, str, datetime, time.struct_time, Tuple[int, ...]] = ...) -> None: ... def __lt__(self, other: _DateTimeComparable) -> bool: ... def __le__(self, other: _DateTimeComparable) -> bool: ... def __gt__(self, other: _DateTimeComparable) -> bool: ... @@ -81,7 +77,6 @@ class Binary: data: bytes - def __init__(self, data: Optional[bytes] = ...) -> None: ... def decode(self, data: bytes) -> None: ... def encode(self, out: SupportsWrite[str]) -> None: ... @@ -91,20 +86,20 @@ WRAPPERS: Tuple[Type[DateTime], Type[Binary]] # undocumented class ExpatParser: # undocumented - def __init__(self, target: Unmarshaller) -> None: ... - def feed(self, data: Union[Text, bytes]) -> None: ... + def feed(self, data: Union[str, bytes]) -> None: ... def close(self) -> None: ... class Marshaller: - dispatch: Dict[Type[Any], Callable[[Marshaller, Any, Callable[[str], Any]], None]] = ... # TODO: Replace 'Any' with some kind of binding + dispatch: Dict[ + Type[Any], Callable[[Marshaller, Any, Callable[[str], Any]], None] + ] = ... # TODO: Replace 'Any' with some kind of binding memo: Dict[Any, None] data: None encoding: Optional[str] allow_none: bool - def __init__(self, encoding: Optional[str] = ..., allow_none: bool = ...) -> None: ... def dumps(self, values: Union[Fault, Iterable[_Marshallable]]) -> str: ... def __dump(self, value: Union[_Marshallable], write: Callable[[str], Any]) -> None: ... # undocumented @@ -116,7 +111,9 @@ def dump_unicode(self, value: str, write: Callable[[str], Any], escape: Callable[[str], str] = ...) -> None: ... def dump_bytes(self, value: bytes, write: Callable[[str], Any]) -> None: ... def dump_array(self, value: Iterable[_Marshallable], write: Callable[[str], Any]) -> None: ... - def dump_struct(self, value: Mapping[str, _Marshallable], write: Callable[[str], Any], escape: Callable[[str], str] = ...) -> None: ... + def dump_struct( + self, value: Mapping[str, _Marshallable], write: Callable[[str], Any], escape: Callable[[str], str] = ... + ) -> None: ... def dump_datetime(self, value: _XMLDate, write: Callable[[str], Any]) -> None: ... def dump_instance(self, value: object, write: Callable[[str], Any]) -> None: ... @@ -134,7 +131,6 @@ append: Callable[[Any], None] _use_datetime: bool _use_builtin_types: bool - def __init__(self, use_datetime: bool = ..., use_builtin_types: bool = ...) -> None: ... def close(self) -> Tuple[_Marshallable, ...]: ... def getmethodname(self) -> Optional[str]: ... @@ -147,8 +143,7 @@ def end_boolean(self, data: str) -> None: ... def end_int(self, data: str) -> None: ... def end_double(self, data: str) -> None: ... - if sys.version_info >= (3, 6): - def end_bigdecimal(self, data: str) -> None: ... + def end_bigdecimal(self, data: str) -> None: ... def end_string(self, data: str) -> None: ... def end_array(self, data: str) -> None: ... def end_struct(self, data: str) -> None: ... @@ -163,7 +158,6 @@ __call_list: List[Tuple[str, Tuple[_Marshallable, ...]]] __name: str - def __init__(self, call_list: List[Tuple[str, _Marshallable]], name: str) -> None: ... def __getattr__(self, name: str) -> _MultiCallMethod: ... def __call__(self, *args: _Marshallable) -> None: ... @@ -171,7 +165,6 @@ class MultiCallIterator: # undocumented results: List[List[_Marshallable]] - def __init__(self, results: List[List[_Marshallable]]) -> None: ... def __getitem__(self, i: int) -> _Marshallable: ... @@ -179,7 +172,6 @@ __server: ServerProxy __call_list: List[Tuple[str, Tuple[_Marshallable, ...]]] - def __init__(self, server: ServerProxy) -> None: ... def __getattr__(self, item: str) -> _MultiCallMethod: ... def __call__(self) -> MultiCallIterator: ... @@ -190,16 +182,22 @@ FastUnmarshaller: Optional[Unmarshaller] def getparser(use_datetime: bool = ..., use_builtin_types: bool = ...) -> Tuple[ExpatParser, Unmarshaller]: ... -def dumps(params: Union[Fault, Tuple[_Marshallable, ...]], methodname: Optional[str] = ..., methodresponse: Optional[bool] = ..., encoding: Optional[str] = ..., allow_none: bool = ...) -> str: ... -def loads(data: str, use_datetime: bool = ..., use_builtin_types: bool = ...) -> Tuple[Tuple[_Marshallable, ...], Optional[str]]: ... - +def dumps( + params: Union[Fault, Tuple[_Marshallable, ...]], + methodname: Optional[str] = ..., + methodresponse: Optional[bool] = ..., + encoding: Optional[str] = ..., + allow_none: bool = ..., +) -> str: ... +def loads( + data: str, use_datetime: bool = ..., use_builtin_types: bool = ... +) -> Tuple[Tuple[_Marshallable, ...], Optional[str]]: ... def gzip_encode(data: bytes) -> bytes: ... # undocumented def gzip_decode(data: bytes, max_decode: int = ...) -> bytes: ... # undocumented class GzipDecodedResponse(gzip.GzipFile): # undocumented - io: io.BytesIO - + io: BytesIO def __init__(self, response: SupportsRead[bytes]) -> None: ... def close(self) -> None: ... @@ -207,7 +205,6 @@ __send: Callable[[str, Tuple[_Marshallable, ...]], _Marshallable] __name: str - def __init__(self, send: Callable[[str, Tuple[_Marshallable, ...]], _Marshallable], name: str) -> None: ... def __getattr__(self, name: str) -> _Method: ... def __call__(self, *args: _Marshallable) -> _Marshallable: ... @@ -225,11 +222,15 @@ _extra_headers: List[Tuple[str, str]] if sys.version_info >= (3, 8): - def __init__(self, use_datetime: bool = ..., use_builtin_types: bool = ..., *, headers: Iterable[Tuple[str, str]] = ...) -> None: ... + def __init__( + self, use_datetime: bool = ..., use_builtin_types: bool = ..., *, headers: Iterable[Tuple[str, str]] = ... + ) -> None: ... else: def __init__(self, use_datetime: bool = ..., use_builtin_types: bool = ...) -> None: ... def request(self, host: _HostType, handler: str, request_body: bytes, verbose: bool = ...) -> Tuple[_Marshallable, ...]: ... - def single_request(self, host: _HostType, handler: str, request_body: bytes, verbose: bool = ...) -> Tuple[_Marshallable, ...]: ... + def single_request( + self, host: _HostType, handler: str, request_body: bytes, verbose: bool = ... + ) -> Tuple[_Marshallable, ...]: ... def getparser(self) -> Tuple[ExpatParser, Unmarshaller]: ... def get_host_info(self, host: _HostType) -> Tuple[str, List[Tuple[str, str]], Dict[str, str]]: ... def make_connection(self, host: _HostType) -> http.client.HTTPConnection: ... @@ -242,7 +243,14 @@ class SafeTransport(Transport): if sys.version_info >= (3, 8): - def __init__(self, use_datetime: bool = ..., use_builtin_types: bool = ..., *, headers: Iterable[Tuple[str, str]] = ..., context: Optional[Any] = ...) -> None: ... + def __init__( + self, + use_datetime: bool = ..., + use_builtin_types: bool = ..., + *, + headers: Iterable[Tuple[str, str]] = ..., + context: Optional[Any] = ..., + ) -> None: ... else: def __init__(self, use_datetime: bool = ..., use_builtin_types: bool = ..., *, context: Optional[Any] = ...) -> None: ... def make_connection(self, host: _HostType) -> http.client.HTTPSConnection: ... @@ -257,9 +265,32 @@ __allow_none: bool if sys.version_info >= (3, 8): - def __init__(self, uri, transport: Optional[Transport] = ..., encoding: Optional[str] = ..., verbose: bool = ..., allow_none: bool = ..., use_datetime: bool = ..., use_builtin_types: bool = ..., *, headers: Iterable[Tuple[str, str]] = ..., context: Optional[Any] = ...) -> None: ... + def __init__( + self, + uri: str, + transport: Optional[Transport] = ..., + encoding: Optional[str] = ..., + verbose: bool = ..., + allow_none: bool = ..., + use_datetime: bool = ..., + use_builtin_types: bool = ..., + *, + headers: Iterable[Tuple[str, str]] = ..., + context: Optional[Any] = ..., + ) -> None: ... else: - def __init__(self, uri, transport: Optional[Transport] = ..., encoding: Optional[str] = ..., verbose: bool = ..., allow_none: bool = ..., use_datetime: bool = ..., use_builtin_types: bool = ..., *, context: Optional[Any] = ...) -> None: ... + def __init__( + self, + uri: str, + transport: Optional[Transport] = ..., + encoding: Optional[str] = ..., + verbose: bool = ..., + allow_none: bool = ..., + use_datetime: bool = ..., + use_builtin_types: bool = ..., + *, + context: Optional[Any] = ..., + ) -> None: ... def __getattr__(self, name: str) -> _Method: ... @overload def __call__(self, attr: Literal["close"]) -> Callable[[], None]: ... @@ -268,7 +299,9 @@ @overload def __call__(self, attr: str) -> Union[Callable[[], None], Transport]: ... def __enter__(self) -> ServerProxy: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... def __close(self) -> None: ... # undocumented def __request(self, methodname: str, params: Tuple[_Marshallable, ...]) -> Tuple[_Marshallable, ...]: ... # undocumented diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/server.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/server.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/server.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xmlrpc/server.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,38 @@ import http.server -import socketserver import pydoc +import socketserver import sys - -from xmlrpc.client import Fault -from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Pattern, Protocol, Tuple, Type, Union from datetime import datetime +from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Pattern, Protocol, Tuple, Type, Union +from xmlrpc.client import Fault + +_Marshallable = Union[ + None, bool, int, float, str, bytes, tuple, list, dict, datetime +] # TODO: Recursive type on tuple, list, dict + +# The dispatch accepts anywhere from 0 to N arguments, no easy way to allow this in mypy +class _DispatchArity0(Protocol): + def __call__(self) -> _Marshallable: ... + +class _DispatchArity1(Protocol): + def __call__(self, __arg1: _Marshallable) -> _Marshallable: ... + +class _DispatchArity2(Protocol): + def __call__(self, __arg1: _Marshallable, __arg2: _Marshallable) -> _Marshallable: ... + +class _DispatchArity3(Protocol): + def __call__(self, __arg1: _Marshallable, __arg2: _Marshallable, __arg3: _Marshallable) -> _Marshallable: ... -_Marshallable = Union[None, bool, int, float, str, bytes, tuple, list, dict, datetime] -class _DispatchProtocol(Protocol): +class _DispatchArity4(Protocol): + def __call__( + self, __arg1: _Marshallable, __arg2: _Marshallable, __arg3: _Marshallable, __arg4: _Marshallable + ) -> _Marshallable: ... + +class _DispatchArityN(Protocol): def __call__(self, *args: _Marshallable) -> _Marshallable: ... +_DispatchProtocol = Union[_DispatchArity0, _DispatchArity1, _DispatchArity2, _DispatchArity3, _DispatchArity4, _DispatchArityN] + def resolve_dotted_attribute(obj: Any, attr: str, allow_dotted_names: bool = ...) -> Any: ... # undocumented def list_public_methods(obj: Any) -> List[str]: ... # undocumented @@ -21,16 +43,24 @@ allow_none: bool encoding: str use_builtin_types: bool - def __init__(self, allow_none: bool = ..., encoding: Optional[str] = ..., use_builtin_types: bool = ...) -> None: ... def register_instance(self, instance: Any, allow_dotted_names: bool = ...) -> None: ... if sys.version_info >= (3, 7): - def register_function(self, function: Optional[_DispatchProtocol] = ..., name: Optional[str] = ...) -> Callable[..., Any]: ... + def register_function( + self, function: Optional[_DispatchProtocol] = ..., name: Optional[str] = ... + ) -> Callable[..., Any]: ... else: def register_function(self, function: _DispatchProtocol, name: Optional[str] = ...) -> Callable[..., Any]: ... def register_introspection_functions(self) -> None: ... def register_multicall_functions(self) -> None: ... - def _marshaled_dispatch(self, data: str, dispatch_method: Optional[Callable[[Optional[str], Tuple[_Marshallable, ...]], Union[Fault, Tuple[_Marshallable, ...]]]] = ..., path: Optional[Any] = ...) -> str: ... # undocumented + def _marshaled_dispatch( + self, + data: str, + dispatch_method: Optional[ + Callable[[Optional[str], Tuple[_Marshallable, ...]], Union[Fault, Tuple[_Marshallable, ...]]] + ] = ..., + path: Optional[Any] = ..., + ) -> str: ... # undocumented def system_listMethods(self) -> List[str]: ... # undocumented def system_methodSignature(self, method_name: str) -> str: ... # undocumented def system_methodHelp(self, method_name: str) -> str: ... # undocumented @@ -42,7 +72,6 @@ rpc_paths: Tuple[str, str] = ... encode_threshold: int = ... # undocumented aepattern: Pattern[str] # undocumented - def accept_encodings(self) -> Dict[str, float]: ... def is_rpc_path_valid(self) -> bool: ... def do_POST(self) -> None: ... @@ -54,29 +83,50 @@ allow_reuse_address: bool = ... _send_traceback_handler: bool = ... - - def __init__(self, addr: Tuple[str, int], requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., logRequests: bool = ..., allow_none: bool = ..., encoding: Optional[str] = ..., bind_and_activate: bool = ..., use_builtin_types: bool = ...) -> None: ... + def __init__( + self, + addr: Tuple[str, int], + requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., + logRequests: bool = ..., + allow_none: bool = ..., + encoding: Optional[str] = ..., + bind_and_activate: bool = ..., + use_builtin_types: bool = ..., + ) -> None: ... class MultiPathXMLRPCServer(SimpleXMLRPCServer): # undocumented dispatchers: Dict[str, SimpleXMLRPCDispatcher] allow_none: bool encoding: str - - def __init__(self, addr: Tuple[str, int], requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., logRequests: bool = ..., allow_none: bool = ..., encoding: Optional[str] = ..., bind_and_activate: bool = ..., use_builtin_types: bool = ...) -> None: ... + def __init__( + self, + addr: Tuple[str, int], + requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., + logRequests: bool = ..., + allow_none: bool = ..., + encoding: Optional[str] = ..., + bind_and_activate: bool = ..., + use_builtin_types: bool = ..., + ) -> None: ... def add_dispatcher(self, path: str, dispatcher: SimpleXMLRPCDispatcher) -> SimpleXMLRPCDispatcher: ... def get_dispatcher(self, path: str) -> SimpleXMLRPCDispatcher: ... - def _marshaled_dispatch(self, data: str, dispatch_method: Optional[Callable[[Optional[str], Tuple[_Marshallable, ...]], Union[Fault, Tuple[_Marshallable, ...]]]] = ..., path: Optional[Any] = ...) -> str: ... + def _marshaled_dispatch( + self, + data: str, + dispatch_method: Optional[ + Callable[[Optional[str], Tuple[_Marshallable, ...]], Union[Fault, Tuple[_Marshallable, ...]]] + ] = ..., + path: Optional[Any] = ..., + ) -> str: ... class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher): - def __init__(self, allow_none: bool = ..., encoding: Optional[str] = ..., use_builtin_types: bool = ...) -> None: ... def handle_xmlrpc(self, request_text: str) -> None: ... def handle_get(self) -> None: ... def handle_request(self, request_text: Optional[str] = ...) -> None: ... class ServerHTMLDoc(pydoc.HTMLDoc): # undocumented - def docroutine(self, object: object, name: str, mod: Optional[str] = ..., funcs: Mapping[str, str] = ..., classes: Mapping[str, str] = ..., methods: Mapping[str, str] = ..., cl: Optional[type] = ...) -> str: ... # type: ignore def docserver(self, server_name: str, package_documentation: str, methods: Dict[str, str]) -> str: ... @@ -85,7 +135,6 @@ server_name: str server_documentation: str server_title: str - def __init__(self) -> None: ... def set_server_title(self, server_title: str) -> None: ... def set_server_name(self, server_name: str) -> None: ... @@ -93,13 +142,19 @@ def generate_html_documentation(self) -> str: ... class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): - def do_GET(self) -> None: ... class DocXMLRPCServer(SimpleXMLRPCServer, XMLRPCDocGenerator): - - def __init__(self, addr: Tuple[str, int], requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., logRequests: bool = ..., allow_none: bool = ..., encoding: Optional[str] = ..., bind_and_activate: bool = ..., use_builtin_types: bool = ...) -> None: ... + def __init__( + self, + addr: Tuple[str, int], + requestHandler: Type[SimpleXMLRPCRequestHandler] = ..., + logRequests: bool = ..., + allow_none: bool = ..., + encoding: Optional[str] = ..., + bind_and_activate: bool = ..., + use_builtin_types: bool = ..., + ) -> None: ... class DocCGIXMLRPCRequestHandler(CGIXMLRPCRequestHandler, XMLRPCDocGenerator): - def __init__(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xxlimited.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xxlimited.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/xxlimited.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/xxlimited.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,13 @@ +from typing import Any + +class Null: ... +class Str: ... + +class Xxo: + def demo(self) -> None: ... + +class error: ... + +def foo(__i: int, __j: int) -> Any: ... +def new() -> Xxo: ... +def roj(__b: Any) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/zipapp.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/zipapp.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3/zipapp.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3/zipapp.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,5 @@ -# Stubs for zipapp (Python 3.5+) - -from pathlib import Path import sys +from pathlib import Path from typing import BinaryIO, Callable, Optional, Union _Path = Union[str, Path, BinaryIO] @@ -9,8 +7,18 @@ class ZipAppError(ValueError): ... if sys.version_info >= (3, 7): - def create_archive(source: _Path, target: Optional[_Path] = ..., interpreter: Optional[str] = ..., main: Optional[str] = ..., - filter: Optional[Callable[[Path], bool]] = ..., compressed: bool = ...) -> None: ... + def create_archive( + source: _Path, + target: Optional[_Path] = ..., + interpreter: Optional[str] = ..., + main: Optional[str] = ..., + filter: Optional[Callable[[Path], bool]] = ..., + compressed: bool = ..., + ) -> None: ... + else: - def create_archive(source: _Path, target: Optional[_Path] = ..., interpreter: Optional[str] = ..., main: Optional[str] = ...) -> None: ... + def create_archive( + source: _Path, target: Optional[_Path] = ..., interpreter: Optional[str] = ..., main: Optional[str] = ... + ) -> None: ... + def get_interpreter(archive: _Path) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.7/contextvars.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.7/contextvars.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.7/contextvars.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.7/contextvars.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,14 +1,24 @@ -from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar +import sys +from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar, Union, overload -_T = TypeVar('_T') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") +_D = TypeVar("_D") class ContextVar(Generic[_T]): def __init__(self, name: str, *, default: _T = ...) -> None: ... @property def name(self) -> str: ... - def get(self, default: _T = ...) -> _T: ... + @overload + def get(self) -> _T: ... + @overload + def get(self, default: Union[_D, _T]) -> Union[_D, _T]: ... def set(self, value: _T) -> Token[_T]: ... def reset(self, token: Token[_T]) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class Token(Generic[_T]): @property @@ -16,6 +26,8 @@ @property def old_value(self) -> Any: ... # returns either _T or MISSING, but that's hard to express MISSING: ClassVar[object] + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... def copy_context() -> Context: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.7/_py_abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.7/_py_abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.7/_py_abc.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.7/_py_abc.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -1,11 +1,10 @@ +from typing import Any, Dict, Tuple, Type, TypeVar -from typing import Type, TypeVar, Tuple, Any, Dict, NewType - -_T = TypeVar('_T') +_T = TypeVar("_T") # TODO: Change the return into a NewType bound to int after pytype/#597 def get_cache_token() -> object: ... class ABCMeta(type): - def __new__(mcls, __name: str, __bases: Tuple[Type[Any], ...], __namespace: Dict[str, Any]) -> ABCMeta: ... + def __new__(__mcls, __name: str, __bases: Tuple[Type[Any], ...], __namespace: Dict[str, Any]) -> ABCMeta: ... def register(cls, subclass: Type[_T]) -> Type[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.9/graphlib.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.9/graphlib.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.9/graphlib.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.9/graphlib.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,16 @@ +from _typeshed import SupportsItems +from typing import Generic, Iterable, Optional, Tuple, TypeVar + +_T = TypeVar("_T") + +class TopologicalSorter(Generic[_T]): + def __init__(self, graph: Optional[SupportsItems[_T, Iterable[_T]]] = ...) -> None: ... + def add(self, node: _T, *predecessors: _T) -> None: ... + def prepare(self) -> None: ... + def is_active(self) -> bool: ... + def __bool__(self) -> bool: ... + def done(self, *nodes: _T) -> None: ... + def get_ready(self) -> Tuple[_T, ...]: ... + def static_order(self) -> Iterable[_T]: ... + +class CycleError(ValueError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.9/zoneinfo/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.9/zoneinfo/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/stdlib/3.9/zoneinfo/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/stdlib/3.9/zoneinfo/__init__.pyi 2020-12-01 23:26:18.000000000 +0000 @@ -0,0 +1,32 @@ +import os +import typing +from datetime import tzinfo +from typing import Any, AnyStr, Iterable, Optional, Protocol, Sequence, Set, Type, Union + +_T = typing.TypeVar("_T", bound="ZoneInfo") + +class _IOBytes(Protocol): + def read(self, __size: int) -> bytes: ... + def seek(self, __size: int, __whence: int = ...) -> Any: ... + +class ZoneInfo(tzinfo): + @property + def key(self) -> str: ... + def __init__(self, key: str) -> None: ... + @classmethod + def no_cache(cls: Type[_T], key: str) -> _T: ... + @classmethod + def from_file(cls: Type[_T], __fobj: _IOBytes, key: Optional[str] = ...) -> _T: ... + @classmethod + def clear_cache(cls, *, only_keys: Iterable[str] = ...) -> None: ... + +# Note: Both here and in clear_cache, the types allow the use of `str` where +# a sequence of strings is required. This should be remedied if a solution +# to this typing bug is found: https://github.com/python/typing/issues/256 +def reset_tzpath(to: Optional[Sequence[Union[os.PathLike[AnyStr], str]]] = ...) -> None: ... +def available_timezones() -> Set[str]: ... + +TZPATH: Sequence[str] + +class ZoneInfoNotFoundError(KeyError): ... +class InvalidTZPathWarning(RuntimeWarning): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/check_consistent.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/check_consistent.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/check_consistent.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/check_consistent.py 2020-12-01 23:26:19.000000000 +0000 @@ -1,44 +1,27 @@ #!/usr/bin/env python3 # For various reasons we need the contents of certain files to be -# duplicated in two places, for example stdlib/2and3/builtins.pyi and +# duplicated in two places, for example stdlib/2/builtins.pyi and # stdlib/2/__builtin__.pyi must be identical. In the past we used # symlinks but that doesn't always work on Windows, so now you must # manually update both files, and this test verifies that they are # identical. The list below indicates which sets of files must match. -import os import filecmp +import os consistent_files = [ - {'stdlib/2and3/builtins.pyi', 'stdlib/2/__builtin__.pyi'}, - {'stdlib/2/SocketServer.pyi', 'stdlib/3/socketserver.pyi'}, - {'stdlib/2/os2emxpath.pyi', 'stdlib/2and3/posixpath.pyi', - 'stdlib/2and3/ntpath.pyi', - 'stdlib/2/os/path.pyi', 'stdlib/3/os/path.pyi'}, - {'stdlib/3/enum.pyi', 'third_party/2/enum.pyi'}, - {'stdlib/3/unittest/mock.pyi', 'third_party/2and3/mock.pyi'}, - {'stdlib/3/concurrent/__init__.pyi', 'third_party/2/concurrent/__init__.pyi'}, - {'stdlib/3/concurrent/futures/__init__.pyi', 'third_party/2/concurrent/futures/__init__.pyi'}, - {'stdlib/3/concurrent/futures/_base.pyi', 'third_party/2/concurrent/futures/_base.pyi'}, - {'stdlib/3/concurrent/futures/thread.pyi', 'third_party/2/concurrent/futures/thread.pyi'}, - {'stdlib/3/concurrent/futures/process.pyi', 'third_party/2/concurrent/futures/process.pyi'}, - {'stdlib/3.7/dataclasses.pyi', 'third_party/3/dataclasses.pyi'}, - {'stdlib/3/pathlib.pyi', 'third_party/2/pathlib2.pyi'}, - {'stdlib/3.7/contextvars.pyi', 'third_party/3/contextvars.pyi'}, - {'stdlib/3/ipaddress.pyi', 'third_party/2/ipaddress.pyi'}, - {'stdlib/2/copy_reg.pyi', 'stdlib/3/copyreg.pyi'}, - {'stdlib/2and3/threading.pyi', 'stdlib/2and3/_dummy_threading.pyi'}, - {'stdlib/3/winreg.pyi', 'stdlib/2/_winreg.pyi'} + {"stdlib/2/builtins.pyi", "stdlib/2/__builtin__.pyi"}, + {"stdlib/2and3/threading.pyi", "stdlib/2and3/_dummy_threading.pyi"}, ] def main(): - files = [os.path.join(root, file) for root, dir, files in os.walk('.') for file in files] - no_symlink = 'You cannot use symlinks in typeshed, please copy {} to its link.' + files = [os.path.join(root, file) for root, dir, files in os.walk(".") for file in files] + no_symlink = "You cannot use symlinks in typeshed, please copy {} to its link." for file in files: _, ext = os.path.splitext(file) - if ext == '.pyi' and os.path.islink(file): + if ext == ".pyi" and os.path.islink(file): raise ValueError(no_symlink.format(file)) for file1, *others in consistent_files: f1 = os.path.join(os.getcwd(), file1) @@ -51,5 +34,5 @@ ) -if __name__ == '__main__': +if __name__ == "__main__": main() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_self_check.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_self_check.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_self_check.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_self_check.py 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +"""Script to run mypy against its own code base.""" + +import subprocess +import sys +import tempfile +from pathlib import Path + +MYPY_VERSION = "0.790" + + +if __name__ == "__main__": + with tempfile.TemporaryDirectory() as tempdir: + dirpath = Path(tempdir) + subprocess.run( + ["git", "clone", "--depth", "1", "git://github.com/python/mypy", dirpath], + check=True, + ) + try: + subprocess.run([sys.executable, "-m", "pip", "install", f"mypy=={MYPY_VERSION}"], check=True) + subprocess.run([sys.executable, "-m", "pip", "install", "-r", dirpath / "test-requirements.txt"], check=True) + subprocess.run( + [ + "mypy", + "--config-file", + dirpath / "mypy_self_check.ini", + "--custom-typeshed-dir", + ".", + dirpath / "mypy", + dirpath / "mypyc", + ], + check=True, + ) + except subprocess.CalledProcessError as e: + print("mypy self test failed", file=sys.stderr) + sys.exit(e.returncode) + else: + print("mypy self test succeeded", file=sys.stderr) + sys.exit(0) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_selftest.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_selftest.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_selftest.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_selftest.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 -"""Script to run mypy's test suite against this version of typeshed.""" - -from pathlib import Path -import shutil -import subprocess -import sys -import tempfile - - -if __name__ == '__main__': - with tempfile.TemporaryDirectory() as tempdir: - dirpath = Path(tempdir) - subprocess.run(['python2.7', '-m', 'pip', 'install', '--user', 'typing'], check=True) - subprocess.run(['git', 'clone', '--depth', '1', 'git://github.com/python/mypy', - str(dirpath / 'mypy')], check=True) - subprocess.run([sys.executable, '-m', 'pip', 'install', '-U', '-r', - str(dirpath / 'mypy/test-requirements.txt')], check=True) - shutil.copytree('stdlib', str(dirpath / 'mypy/mypy/typeshed/stdlib')) - shutil.copytree('third_party', str(dirpath / 'mypy/mypy/typeshed/third_party')) - try: - subprocess.run(['pytest', '-n12'], cwd=str(dirpath / 'mypy'), check=True) - except subprocess.CalledProcessError as e: - print('mypy tests failed', file=sys.stderr) - sys.exit(e.returncode) - else: - print('mypy tests succeeded', file=sys.stderr) - sys.exit(0) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_test.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_test.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_test.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_test.py 2020-12-01 23:26:19.000000000 +0000 @@ -12,26 +12,26 @@ 5. Repeat steps 2-4 for other mypy runs (e.g. --py2) """ +import argparse import os import re import sys -import argparse -parser = argparse.ArgumentParser(description="Test runner for typeshed. " - "Patterns are unanchored regexps on the full path.") -parser.add_argument('-v', '--verbose', action='count', default=0, help="More output") -parser.add_argument('-n', '--dry-run', action='store_true', help="Don't actually run mypy") -parser.add_argument('-x', '--exclude', type=str, nargs='*', help="Exclude pattern") -parser.add_argument('-p', '--python-version', type=str, nargs='*', - help="These versions only (major[.minor])") -parser.add_argument('--platform', - help="Run mypy for a certain OS platform (defaults to sys.platform)") -parser.add_argument('--warn-unused-ignores', action='store_true', - help="Run mypy with --warn-unused-ignores " - "(hint: only get rid of warnings that are " - "unused for all platforms and Python versions)") +parser = argparse.ArgumentParser(description="Test runner for typeshed. " "Patterns are unanchored regexps on the full path.") +parser.add_argument("-v", "--verbose", action="count", default=0, help="More output") +parser.add_argument("-n", "--dry-run", action="store_true", help="Don't actually run mypy") +parser.add_argument("-x", "--exclude", type=str, nargs="*", help="Exclude pattern") +parser.add_argument("-p", "--python-version", type=str, nargs="*", help="These versions only (major[.minor])") +parser.add_argument("--platform", help="Run mypy for a certain OS platform (defaults to sys.platform)") +parser.add_argument( + "--warn-unused-ignores", + action="store_true", + help="Run mypy with --warn-unused-ignores " + "(hint: only get rid of warnings that are " + "unused for all platforms and Python versions)", +) -parser.add_argument('filter', type=str, nargs='*', help="Include pattern (default all)") +parser.add_argument("filter", type=str, nargs="*", help="Include pattern (default all)") def log(args, *varargs): @@ -39,38 +39,37 @@ print(*varargs) -def match(fn, args, blacklist): - if blacklist.match(fn): - log(args, fn, 'exluded by blacklist') +def match(fn, args, exclude_list): + if exclude_list.match(fn): + log(args, fn, "exluded by exclude list") return False if not args.filter and not args.exclude: - log(args, fn, 'accept by default') + log(args, fn, "accept by default") return True if args.exclude: for f in args.exclude: if re.search(f, fn): - log(args, fn, 'excluded by pattern', f) + log(args, fn, "excluded by pattern", f) return False if args.filter: for f in args.filter: if re.search(f, fn): - log(args, fn, 'accepted by pattern', f) + log(args, fn, "accepted by pattern", f) return True if args.filter: - log(args, fn, 'rejected (no pattern matches)') + log(args, fn, "rejected (no pattern matches)") return False - log(args, fn, 'accepted (no exclude pattern matches)') + log(args, fn, "accepted (no exclude pattern matches)") return True def libpath(major, minor): - versions = ['%d.%d' % (major, minor) - for minor in reversed(range(minor + 1))] + versions = ["%d.%d" % (major, minor) for minor in reversed(range(minor + 1))] versions.append(str(major)) - versions.append('2and3') + versions.append("2and3") paths = [] for v in versions: - for top in ['stdlib', 'third_party']: + for top in ["stdlib", "third_party"]: p = os.path.join(top, v) if os.path.isdir(p): paths.append(p) @@ -80,9 +79,8 @@ def main(): args = parser.parse_args() - with open(os.path.join(os.path.dirname(__file__), "mypy_blacklist.txt")) as f: - blacklist = re.compile("(%s)$" % "|".join( - re.findall(r"^\s*([^\s#]+)\s*(?:#.*)?$", f.read(), flags=re.M))) + with open(os.path.join(os.path.dirname(__file__), "mypy_exclude_list.txt")) as f: + exclude_list = re.compile("(%s)$" % "|".join(re.findall(r"^\s*([^\s#]+)\s*(?:#.*)?$", f.read(), flags=re.M))) try: from mypy.main import main as mypy_main @@ -92,8 +90,7 @@ versions = [(3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7)] if args.python_version: - versions = [v for v in versions - if any(('%d.%d' % v).startswith(av) for av in args.python_version)] + versions = [v for v in versions if any(("%d.%d" % v).startswith(av) for av in args.python_version)] if not versions: print("--- no versions selected ---") sys.exit(1) @@ -103,51 +100,50 @@ for major, minor in versions: roots = libpath(major, minor) files = [] - seen = {'__builtin__', 'builtins', 'typing'} # Always ignore these. + seen = {"__builtin__", "builtins", "typing"} # Always ignore these. for root in roots: names = os.listdir(root) for name in names: full = os.path.join(root, name) mod, ext = os.path.splitext(name) - if mod in seen or mod.startswith('.'): + if mod in seen or mod.startswith("."): continue - if ext in ['.pyi', '.py']: - if match(full, args, blacklist): + if ext in [".pyi", ".py"]: + if match(full, args, exclude_list): seen.add(mod) files.append(full) - elif (os.path.isfile(os.path.join(full, '__init__.pyi')) or - os.path.isfile(os.path.join(full, '__init__.py'))): + elif os.path.isfile(os.path.join(full, "__init__.pyi")) or os.path.isfile(os.path.join(full, "__init__.py")): for r, ds, fs in os.walk(full): ds.sort() fs.sort() for f in fs: m, x = os.path.splitext(f) - if x in ['.pyi', '.py']: + if x in [".pyi", ".py"]: fn = os.path.join(r, f) - if match(fn, args, blacklist): + if match(fn, args, exclude_list): seen.add(mod) files.append(fn) if files: runs += 1 - flags = ['--python-version', '%d.%d' % (major, minor)] - flags.append('--strict-optional') - flags.append('--no-site-packages') - flags.append('--show-traceback') - flags.append('--no-implicit-optional') - flags.append('--disallow-any-generics') - flags.append('--disallow-subclassing-any') + flags = ["--python-version", "%d.%d" % (major, minor)] + flags.append("--strict-optional") + flags.append("--no-site-packages") + flags.append("--show-traceback") + flags.append("--no-implicit-optional") + flags.append("--disallow-any-generics") + flags.append("--disallow-subclassing-any") if args.warn_unused_ignores: - flags.append('--warn-unused-ignores') + flags.append("--warn-unused-ignores") if args.platform: - flags.extend(['--platform', args.platform]) - sys.argv = ['mypy'] + flags + files + flags.extend(["--platform", args.platform]) + sys.argv = ["mypy"] + flags + files if args.verbose: - print("running", ' '.join(sys.argv)) + print("running", " ".join(sys.argv)) else: - print("running mypy", ' '.join(flags), "# with", len(files), "files") + print("running mypy", " ".join(flags), "# with", len(files), "files") try: if not args.dry_run: - mypy_main('', sys.stdout, sys.stderr) + mypy_main("", sys.stdout, sys.stderr) except SystemExit as err: code = max(code, err.code) if code: @@ -158,5 +154,5 @@ sys.exit(1) -if __name__ == '__main__': +if __name__ == "__main__": main() diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_test_suite.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_test_suite.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/mypy_test_suite.py 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/mypy_test_suite.py 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,28 @@ +#!/usr/bin/env python3 +"""Script to run mypy's test suite against this version of typeshed.""" + +import shutil +import subprocess +import sys +import tempfile +from pathlib import Path + +if __name__ == "__main__": + with tempfile.TemporaryDirectory() as tempdir: + dirpath = Path(tempdir) + subprocess.run(["git", "clone", "--depth", "1", "git://github.com/python/mypy", dirpath / "mypy"], check=True) + + subprocess.run(["python2.7", "-m", "pip", "install", "--user", "typing"], check=True) + subprocess.run( + [sys.executable, "-m", "pip", "install", "-U", "-r", dirpath / "mypy/test-requirements.txt"], check=True + ) + shutil.copytree("stdlib", dirpath / "mypy/mypy/typeshed/stdlib") + shutil.copytree("third_party", dirpath / "mypy/mypy/typeshed/third_party") + try: + subprocess.run([sys.executable, "runtests.py", "typeshed-ci"], cwd=dirpath / "mypy", check=True) + except subprocess.CalledProcessError as e: + print("mypy tests failed", file=sys.stderr) + sys.exit(e.returncode) + else: + print("mypy tests succeeded", file=sys.stderr) + sys.exit(0) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_blacklist.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_blacklist.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_blacklist.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_blacklist.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# Pytype blacklist. Files will not be tested with pytype. - -# pytype has its own version of these files, and thus doesn't mind if it -# can't parse the typeshed version: -stdlib/2/__builtin__.pyi -stdlib/2/typing.pyi -stdlib/2and3/builtins.pyi -stdlib/3/typing.pyi - -# third_party stubs with constructs that pytype doesn't yet support: -third_party/2/fb303/FacebookService.pyi -third_party/2/scribe/scribe.pyi -third_party/2and3/attr/__init__.pyi -third_party/2and3/attr/converters.pyi -third_party/2and3/attr/filters.pyi -third_party/2and3/attr/validators.pyi -third_party/2and3/pynamodb/models.pyi diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_exclude_list.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_exclude_list.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_exclude_list.txt 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_exclude_list.txt 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,18 @@ +# Pytype exclude list. Files will not be tested with pytype. + +# pytype has its own version of these files, and thus doesn't mind if it +# can't parse the typeshed version: +stdlib/2/__builtin__.pyi +stdlib/2/builtins.pyi +stdlib/2/typing.pyi +stdlib/3/builtins.pyi +stdlib/3/typing.pyi + +# third_party stubs with constructs that pytype doesn't yet support: +third_party/2/fb303/FacebookService.pyi +third_party/2/scribe/scribe.pyi +third_party/2and3/attr/__init__.pyi +third_party/2and3/attr/converters.pyi +third_party/2and3/attr/filters.pyi +third_party/2and3/attr/validators.pyi +third_party/2and3/pynamodb/models.pyi diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_test.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_test.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/pytype_test.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/pytype_test.py 2020-12-01 23:26:19.000000000 +0000 @@ -4,17 +4,15 @@ Depends on pytype being installed. If pytype is installed: - 1. For every pyi, do nothing if it is in pytype_blacklist.txt. + 1. For every pyi, do nothing if it is in pytype_exclude_list.txt. 2. Otherwise, call 'pytype.io.parse_pyi'. Option two will load the file and all the builtins, typeshed dependencies. This will also discover incorrect usage of imported modules. """ import argparse -import itertools import os import re -import subprocess import traceback from typing import List, Match, Optional, Sequence, Tuple @@ -32,13 +30,10 @@ typeshed_location = args.typeshed_location or os.getcwd() subdir_paths = [os.path.join(typeshed_location, d) for d in TYPESHED_SUBDIRS] check_subdirs_discoverable(subdir_paths) - check_python_exes_runnable(python27_exe_arg=args.python27_exe, python36_exe_arg=args.python36_exe) - files_to_test = determine_files_to_test(typeshed_location=typeshed_location, subdir_paths=subdir_paths) + files_to_test = determine_files_to_test(typeshed_location=typeshed_location, paths=args.files or subdir_paths) run_all_tests( files_to_test=files_to_test, typeshed_location=typeshed_location, - python27_exe=args.python27_exe, - python36_exe=args.python36_exe, print_stderr=args.print_stderr, dry_run=args.dry_run, ) @@ -53,9 +48,13 @@ parser.add_argument( "--print-stderr", action="store_true", default=False, help="Print stderr every time an error is encountered." ) - # We need to invoke python2.7 and 3.6. - parser.add_argument("--python27-exe", type=str, default="python2.7", help="Path to a python 2.7 interpreter.") - parser.add_argument("--python36-exe", type=str, default="python3.6", help="Path to a python 3.6 interpreter.") + parser.add_argument( + "files", + metavar="FILE", + type=str, + nargs="*", + help="Files or directories to check. (Default: Check all files.)", + ) return parser @@ -70,8 +69,8 @@ return self.matcher.search(path) -def load_blacklist(typeshed_location: str) -> List[str]: - filename = os.path.join(typeshed_location, "tests", "pytype_blacklist.txt") +def load_exclude_list(typeshed_location: str) -> List[str]: + filename = os.path.join(typeshed_location, "tests", "pytype_exclude_list.txt") skip_re = re.compile(r"^\s*([^\s#]+)\s*(?:#.*)?$") skip = [] @@ -84,14 +83,11 @@ return skip -def run_pytype(*, filename: str, python_version: str, python_exe: str, typeshed_location: str) -> Optional[str]: +def run_pytype(*, filename: str, python_version: str, typeshed_location: str) -> Optional[str]: """Runs pytype, returning the stderr if any.""" options = pytype_config.Options.create( - filename, - module_name=_get_module_name(filename), - parse_pyi=True, - python_version=python_version, - python_exe=python_exe) + filename, module_name=_get_module_name(filename), parse_pyi=True, python_version=python_version + ) old_typeshed_home = os.environ.get(TYPESHED_HOME, UNSET) os.environ[TYPESHED_HOME] = typeshed_location try: @@ -124,15 +120,6 @@ return ".".join(_get_relative(filename).split(os.path.sep)[2:]).replace(".pyi", "").replace(".__init__", "") -def can_run(exe: str, *, args: List[str]) -> bool: - try: - subprocess.run([exe] + args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) - except OSError: - return False - else: - return True - - def _is_version(path: str, version: str) -> bool: return any("{}{}{}".format(d, os.path.sep, version) in path for d in TYPESHED_SUBDIRS) @@ -143,52 +130,41 @@ raise SystemExit("Cannot find typeshed subdir at {} (specify parent dir via --typeshed-location)".format(p)) -def check_python_exes_runnable(*, python27_exe_arg: str, python36_exe_arg: str) -> None: - for exe, version_str in zip([python27_exe_arg, python36_exe_arg], ["27", "36"]): - if can_run(exe, args=["--version"]): - continue - formatted_version = ".".join(list(version_str)) - script_arg = "--python{}-exe".format(version_str) - raise SystemExit( - "Cannot run Python {version}. (point to a valid executable via {arg})".format( - version=formatted_version, arg=script_arg - ) - ) - - -def determine_files_to_test(*, typeshed_location: str, subdir_paths: Sequence[str]) -> List[Tuple[str, int]]: - """Determine all files to test, checking if it's in the blacklist and which Python versions to use. +def determine_files_to_test(*, typeshed_location: str, paths: Sequence[str]) -> List[Tuple[str, int]]: + """Determine all files to test, checking if it's in the exclude list and which Python versions to use. Returns a list of pairs of the file path and Python version as an int.""" - skipped = PathMatcher(load_blacklist(typeshed_location)) + skipped = PathMatcher(load_exclude_list(typeshed_location)) + filenames = find_stubs_in_paths(paths) files = [] - for root, _, filenames in itertools.chain.from_iterable(os.walk(p) for p in subdir_paths): - for f in sorted(f for f in filenames if f.endswith(".pyi")): - f = os.path.join(root, f) - rel = _get_relative(f) - if skipped.search(rel): - continue - if _is_version(f, "2and3"): - files.append((f, 2)) - files.append((f, 3)) - elif _is_version(f, "2"): - files.append((f, 2)) - elif _is_version(f, "3"): - files.append((f, 3)) - else: - print("Unrecognized path: {}".format(f)) + for f in sorted(filenames): + rel = _get_relative(f) + if skipped.search(rel): + continue + if _is_version(f, "2and3"): + files.append((f, 2)) + files.append((f, 3)) + elif _is_version(f, "2"): + files.append((f, 2)) + elif _is_version(f, "3"): + files.append((f, 3)) + else: + print("Unrecognized path: {}".format(f)) return files -def run_all_tests( - *, - files_to_test: Sequence[Tuple[str, int]], - typeshed_location: str, - python27_exe: str, - python36_exe: str, - print_stderr: bool, - dry_run: bool -) -> None: +def find_stubs_in_paths(paths: Sequence[str]) -> List[str]: + filenames = [] + for path in paths: + if os.path.isdir(path): + for root, _, fns in os.walk(path): + filenames.extend(os.path.join(root, fn) for fn in fns if fn.endswith(".pyi")) + else: + filenames.append(path) + return filenames + + +def run_all_tests(*, files_to_test: Sequence[Tuple[str, int]], typeshed_location: str, print_stderr: bool, dry_run: bool) -> None: bad = [] errors = 0 total_tests = len(files_to_test) @@ -198,7 +174,6 @@ run_pytype( filename=f, python_version="2.7" if version == 2 else "3.6", - python_exe=python27_exe if version == 2 else python36_exe, typeshed_location=typeshed_location, ) if not dry_run diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_test.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_test.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_test.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_test.py 2020-12-01 23:26:19.000000000 +0000 @@ -3,16 +3,16 @@ stubtest is a script in the mypy project that compares stubs to the actual objects at runtime. Note that therefore the output of stubtest depends on which Python version it is run with. -In typeshed CI, we run stubtest with each Python minor version from 3.5 through 3.9 inclusive. +In typeshed CI, we run stubtest with each currently supported Python minor version, except 2.7. We pin the version of mypy / stubtest we use in .travis.yml so changes to those don't break typeshed CI. """ -from pathlib import Path import subprocess import sys +from pathlib import Path def run_stubtest(typeshed_dir: Path) -> int: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_unused.py pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_unused.py --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_unused.py 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_unused.py 2020-12-01 23:26:19.000000000 +0000 @@ -2,12 +2,12 @@ # Runs stubtest and prints each unused whitelist entry with filename. -from typing import List, Tuple import os.path import subprocess import sys +from typing import List, Tuple -_UNUSED_NOTE = "note: unused whitelist entry " +_UNUSED_NOTE = "note: unused allowlist entry " _WHITELIST_PATH = os.path.join("tests", "stubtest_whitelists") @@ -22,11 +22,9 @@ def run_stubtest() -> List[str]: - proc = subprocess.run( - ["./tests/stubtest_test.py"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT - ) + proc = subprocess.run(["./tests/stubtest_test.py"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) output = proc.stdout.decode("utf-8").splitlines() - return [line[len(_UNUSED_NOTE):].strip() for line in output if line.startswith(_UNUSED_NOTE)] + return [line[len(_UNUSED_NOTE) :].strip() for line in output if line.startswith(_UNUSED_NOTE)] def unused_files(unused: str) -> List[Tuple[str, str]]: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py35.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py35.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py35.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py35.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -asyncio.unix_events._UnixSelectorEventLoop.create_unix_server -pwd.getpwnam -socket.NETLINK_CRYPTO -ssl.PROTOCOL_SSLv3 -ssl.RAND_egd diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py36.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py36.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py36.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py36.txt 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,4 @@ asyncio.unix_events._UnixSelectorEventLoop.create_unix_server pwd.getpwnam -site.getsitepackages -site.getuserbase -site.getusersitepackages ssl.PROTOCOL_SSLv3 ssl.RAND_egd diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py37.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py37.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py37.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py37.txt 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,3 @@ pwd.getpwnam -site.getsitepackages -site.getuserbase -site.getusersitepackages time.CLOCK_PROF time.CLOCK_UPTIME -typing.IO.closed # Incorrect definition in CPython, fixed in bpo-39493 \ No newline at end of file diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py38.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py38.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py38.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux-py38.txt 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,4 @@ os.MFD_HUGE_32MB os.MFD_HUGE_512MB -site.getsitepackages -site.getuserbase -site.getusersitepackages time.CLOCK_PROF time.CLOCK_UPTIME -typing.IO.closed # Incorrect definition in CPython, fixed in bpo-39493 \ No newline at end of file diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/linux.txt 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ - _posixsubprocess.cloexec_pipe builtins.WindowsError curses.COLORS @@ -53,5 +52,5 @@ os.SCHED_[A-Z_]+ # Loadable SQLite extensions are disabled on GitHub runners -sqlite3(.dbapi2)?.Connection.enable_load_extension -sqlite3(.dbapi2)?.Connection.load_extension +(sqlite3(.dbapi2)?.Connection.enable_load_extension)? +(sqlite3(.dbapi2)?.Connection.load_extension)? diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py35.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py35.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py35.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py35.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -asyncio.Future._callbacks -asyncio.Future._exception -asyncio.Future._loop -asyncio.Future._tb_logger -asyncio.Task.__init__ -asyncio.Task._wakeup -asyncio.base_futures # Added in Python 3.6 -asyncio.base_tasks # Added in Python 3.6 -asyncio.exceptions # Added in Python 3.8 -asyncio.format_helpers # Added in Python 3.7 -asyncio.futures.Future._callbacks -asyncio.futures.Future._exception -asyncio.futures.Future._loop -asyncio.futures.Future._tb_logger -asyncio.futures._TracebackLogger.__init__ -asyncio.runners -asyncio.staggered # Added in Python 3.8 -asyncio.tasks.Task.__init__ -asyncio.tasks.Task._wakeup -asyncio.threads # Added in Python 3.9 -asyncio.trsock # Added in Python 3.8 -bdb.GENERATOR_AND_COROUTINE_FLAGS -builtins.str.maketrans -cmath.log -codecs.StreamRecoder.seek -collections.Reversible -collections.UserString.maketrans -contextlib._GeneratorContextManager.__init__ -ctypes.CDLL.__init__ -fractions.Fraction.__new__ # private _normalize param was made keyword-only in Python 3.6 -importlib.metadata -importlib.resources -io.StringIO.readline -ipaddress._BaseNetwork.__init__ -json.dump -json.dumps -json.load -json.loads -mmap.ACCESS_DEFAULT -multiprocessing.context.BaseContext.reducer -multiprocessing.shared_memory -nntplib._NNTPBase.starttls -os.DirEntry -os.utime -plistlib.Dict.__init__ -pyexpat.XMLParserType.ExternalEntityParserCreate -smtpd.SMTPChannel.__init__ -smtpd.SMTPServer.__init__ -sre_compile.dis -ssl.SSLSocket.__init__ -typing.AbstractSet.isdisjoint -typing.Coroutine.cr_await -typing.Coroutine.cr_code -typing.Coroutine.cr_frame -typing.Coroutine.cr_running -typing.Generator.__new__ -typing.Generator.gi_code -typing.Generator.gi_frame -typing.Generator.gi_running -typing.Generator.gi_yieldfrom -typing.GenericMeta.__new__ -typing.IO.closed # Incorrect definition in CPython, fixed in bpo-39493 -typing.Mapping.get -typing.MutableMapping.pop -typing.MutableMapping.setdefault -typing.MutableSequence.append -typing.MutableSequence.extend -typing.MutableSequence.insert -typing.MutableSequence.remove -typing.MutableSet.add -typing.MutableSet.discard -typing.MutableSet.remove -typing.NamedTuple.__new__ -typing.NamedTuple._asdict -typing.NamedTuple._make -typing.NamedTuple._replace -typing.Sequence.count -typing.Sequence.index -typing.runtime_checkable -unittest.async_case -unittest.case._AssertLogsContext.__init__ -uuid.UUID.int -xml.etree.ElementTree.TreeBuilder.start # Discrepancy between Python and C modules, fixed in bpo-39495 -xml.etree.cElementTree.Element.__bool__ -xml.etree.cElementTree.Element.copy -xml.etree.cElementTree.TreeBuilder.start # bpo-39495 -xml.etree.cElementTree.XMLPullParser -xml.parsers.expat.XMLParserType.ExternalEntityParserCreate -zipfile.ZipFile.open -zlib.compress diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py36.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py36.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py36.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py36.txt 2020-12-01 23:26:19.000000000 +0000 @@ -24,6 +24,8 @@ ctypes.CDLL.__init__ email.message.MIMEPart.as_string enum.Enum._generate_next_value_ +fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve +hmac.HMAC.__init__ importlib.metadata importlib.resources io.StringIO.readline @@ -35,11 +37,12 @@ os.utime plistlib.Dict.__init__ pyexpat.XMLParserType.ExternalEntityParserCreate +random.Random.randrange # missing undocumented arg _int +random.randrange # missing undocumented arg _int secrets.SystemRandom.getstate smtplib.SMTP.sendmail sre_compile.dis ssl.SSLSocket.__init__ -typing.AbstractSet.isdisjoint typing.AsyncGenerator.ag_await typing.AsyncGenerator.ag_code typing.AsyncGenerator.ag_frame @@ -56,30 +59,26 @@ typing.GenericMeta.__new__ typing.IO.closed # Incorrect definition in CPython, fixed in bpo-39493 typing.Mapping.get -typing.MutableMapping.pop -typing.MutableMapping.setdefault -typing.MutableSequence.append -typing.MutableSequence.extend -typing.MutableSequence.insert -typing.MutableSequence.remove -typing.MutableSet.add -typing.MutableSet.discard -typing.MutableSet.remove typing.NamedTuple.__new__ typing.NamedTuple._asdict typing.NamedTuple._make typing.NamedTuple._replace -typing.Sequence.count typing.Sequence.index typing.runtime_checkable -unittest.async_case -unittest.case._AssertLogsContext.__init__ +unittest.async_case # Added in Python 3.8 urllib.parse.parse_qs urllib.parse.parse_qsl uuid.UUID.int webbrowser.Opera.raise_opts xml.etree.ElementTree.TreeBuilder.start # Discrepancy between Python and C modules, fixed in bpo-39495 -xml.etree.cElementTree.Element.__bool__ -xml.etree.cElementTree.Element.copy xml.etree.cElementTree.TreeBuilder.start # bpo-39495 xml.parsers.expat.XMLParserType.ExternalEntityParserCreate +# These enums derive from (int, IntEnum) or (str, Enum). See comment in py3_common.txt +enum.IntFlag.__new__ +re.RegexFlag.__new__ +socket.AddressInfo.__new__ +socket.MsgFlag.__new__ +ssl.Options.__new__ +ssl.VerifyFlags.__new__ +ssl.VerifyMode.__new__ +tkinter.EventType.__new__ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py37.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py37.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py37.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py37.txt 2020-12-01 23:26:19.000000000 +0000 @@ -10,7 +10,6 @@ asyncio.threads # Added in Python 3.9 asyncio.trsock # Added in Python 3.8 builtins.dict.get -builtins.reversed builtins.str.maketrans cmath.log collections.AsyncGenerator.ag_await @@ -22,15 +21,17 @@ collections.abc.AsyncGenerator.ag_code collections.abc.AsyncGenerator.ag_frame collections.abc.AsyncGenerator.ag_running -concurrent.futures.ProcessPoolExecutor.map contextvars.Context.__init__ contextvars.Context.get +contextvars.ContextVar.get copy.PyStringMap ctypes.CDLL.__init__ dataclasses.Field.__init__ dataclasses.field email.message.MIMEPart.as_string enum.Enum._generate_next_value_ +fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve +hmac.HMAC.__init__ http.client.HTTPSConnection.__init__ http.server.SimpleHTTPRequestHandler.__init__ importlib.metadata @@ -42,6 +43,8 @@ os.utime pyexpat.XMLParserType.ExternalEntityParserCreate queue.SimpleQueue.__init__ +random.Random.randrange # missing undocumented arg _int +random.randrange # missing undocumented arg _int secrets.SystemRandom.getstate smtplib.SMTP.sendmail sre_constants.RANGE_IGNORE @@ -56,8 +59,7 @@ typing._SpecialForm.__init__ typing._SpecialForm.__new__ typing.runtime_checkable -unittest.async_case -unittest.case._AssertLogsContext.__init__ +unittest.async_case # Added in Python 3.8 urllib.parse.parse_qs urllib.parse.parse_qsl uuid.UUID.int @@ -65,7 +67,16 @@ uuid.getnode # undocumented, unused parameter getters that was later removed webbrowser.Opera.raise_opts xml.etree.ElementTree.TreeBuilder.start # Discrepancy between Python and C modules, fixed in bpo-39495 -xml.etree.cElementTree.Element.__bool__ -xml.etree.cElementTree.Element.copy xml.etree.cElementTree.TreeBuilder.start # bpo-39495 xml.parsers.expat.XMLParserType.ExternalEntityParserCreate +# These enums derive from (int, IntEnum) or (str, Enum). See comment in py3_common.txt +enum.IntFlag.__new__ +pstats.SortKey.__new__ +re.RegexFlag.__new__ +socket.AddressInfo.__new__ +socket.MsgFlag.__new__ +ssl.Options.__new__ +ssl.TLSVersion.__new__ +ssl.VerifyFlags.__new__ +ssl.VerifyMode.__new__ +tkinter.EventType.__new__ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py38.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py38.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py38.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py38.txt 2020-12-01 23:26:19.000000000 +0000 @@ -13,10 +13,10 @@ asyncio.futures.Future.__init__ asyncio.futures.Future._callbacks asyncio.proactor_events._ProactorBasePipeTransport.__del__ +asyncio.run # Bugfix involving this was backported to 3.8 +asyncio.runners.run # It just hasn't been released yet asyncio.threads # Added in Python 3.9 -builtins.compile builtins.dict.get -builtins.reversed collections.AsyncGenerator.ag_await collections.AsyncGenerator.ag_code collections.AsyncGenerator.ag_frame @@ -31,7 +31,6 @@ collections.abc.ItemsView.__reversed__ collections.abc.KeysView.__reversed__ collections.abc.ValuesView.__reversed__ -concurrent.futures.ProcessPoolExecutor.map contextvars.Context.__init__ contextvars.Context.get copy.PyStringMap @@ -40,6 +39,7 @@ dataclasses.field email.message.MIMEPart.as_string enum.Enum._generate_next_value_ +fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve functools.partialmethod.__get__ functools.singledispatchmethod.__call__ # A lie to reflect that the descriptor get returns a callable gettext.install @@ -50,9 +50,6 @@ http.server.SimpleHTTPRequestHandler.__init__ importlib.metadata.DistributionFinder.Context.pattern importlib.metadata.EntryPointBase -inspect.isasyncgenfunction -inspect.iscoroutinefunction -inspect.isgeneratorfunction ipaddress.IPv4Interface.hostmask ipaddress.IPv6Interface.hostmask ipaddress._BaseNetwork.broadcast_address @@ -69,13 +66,15 @@ pickle.Pickler.reducer_override platform.DEV_NULL queue.SimpleQueue.__init__ +random.Random.randrange # missing undocumented arg _int +random.randrange # missing undocumented arg _int secrets.SystemRandom.getstate +select.epoll.register smtplib.SMTP.sendmail sre_constants.RANGE_IGNORE ssl.PROTOCOL_SSLv3 ssl.RAND_egd sys.UnraisableHookArgs -threading.ExceptHookArgs types.ClassMethodDescriptorType.__get__ types.CodeType.replace types.MethodDescriptorType.__get__ @@ -93,16 +92,23 @@ typing.SupportsRound.__init__ typing._SpecialForm.__init__ typing._SpecialForm.__new__ -unittest.case._AssertLogsContext.__init__ unittest.doModuleCleanups uuid.getnode # undocumented, unused parameter getters that was later removed -weakref.WeakValueDictionary.__init__ weakref.WeakValueDictionary.update webbrowser.Opera.raise_opts xml.etree.ElementTree.TreeBuilder.start # Discrepancy between Python and C modules, fixed in bpo-39495 xml.etree.ElementTree.XMLParser.__init__ -xml.etree.cElementTree.Element.__bool__ -xml.etree.cElementTree.Element.copy xml.etree.cElementTree.TreeBuilder.start # bpo-39495 xml.etree.cElementTree.XMLParser.__init__ zipfile.Path.open +# These enums derive from (int, IntEnum) or (str, Enum). See comment in py3_common.txt +enum.IntFlag.__new__ +pstats.SortKey.__new__ +re.RegexFlag.__new__ +socket.AddressInfo.__new__ +socket.MsgFlag.__new__ +ssl.Options.__new__ +ssl.TLSVersion.__new__ +ssl.VerifyFlags.__new__ +ssl.VerifyMode.__new__ +tkinter.EventType.__new__ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py39.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py39.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py39.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py39.txt 2020-12-01 23:26:19.000000000 +0000 @@ -2,7 +2,6 @@ _dummy_thread _thread.ExceptHookArgs _thread._ExceptHookArgs -_weakref.getweakrefcount ast.Bytes.__new__ ast.Ellipsis.__new__ ast.ExtSlice.__new__ @@ -12,115 +11,62 @@ ast.Num.__new__ ast.Str.__new__ asyncio.AbstractEventLoop.sock_sendfile -asyncio.compat # removed in 3.7 +asyncio.compat # module removed in 3.7 asyncio.Future.__init__ asyncio.Future._callbacks asyncio.events.AbstractEventLoop.sock_sendfile asyncio.futures.Future.__init__ asyncio.futures.Future._callbacks asyncio.proactor_events._ProactorBasePipeTransport.__del__ -builtins.bytearray.extend -builtins.bytearray.pop -builtins.compile builtins.dict.get -builtins.reversed -bz2.BZ2Compressor.compress -bz2.BZ2File.read -bz2.BZ2File.read1 -bz2.BZ2File.readline -bz2.BZ2File.seek -codecs.lookup -codecs.lookup_error -codecs.register collections.AsyncGenerator.ag_await collections.AsyncGenerator.ag_code collections.AsyncGenerator.ag_frame collections.AsyncGenerator.ag_running -collections.Container.__contains__ collections.ItemsView.__reversed__ collections.KeysView.__reversed__ -collections.OrderedDict.fromkeys -collections.OrderedDict.setdefault collections.ValuesView.__reversed__ collections.abc.AsyncGenerator.ag_await collections.abc.AsyncGenerator.ag_code collections.abc.AsyncGenerator.ag_frame collections.abc.AsyncGenerator.ag_running -collections.abc.Container.__contains__ collections.abc.ItemsView.__reversed__ collections.abc.KeysView.__reversed__ collections.abc.ValuesView.__reversed__ -compileall.compile_dir -compileall.compile_file -concurrent.futures.Executor.submit -concurrent.futures.ProcessPoolExecutor.map -concurrent.futures.ProcessPoolExecutor.shutdown -concurrent.futures.ProcessPoolExecutor.submit -concurrent.futures.ThreadPoolExecutor.shutdown -concurrent.futures.ThreadPoolExecutor.submit -concurrent.futures._base.Executor.submit -concurrent.futures.process.ProcessPoolExecutor.shutdown -concurrent.futures.process.ProcessPoolExecutor.submit -concurrent.futures.thread.ThreadPoolExecutor.shutdown -concurrent.futures.thread.ThreadPoolExecutor.submit -contextlib.AbstractContextManager.__exit__ -contextlib.AsyncExitStack.callback -contextlib.AsyncExitStack.push_async_callback -contextlib.ExitStack.callback contextvars.Context.__init__ contextvars.Context.get -contextvars.ContextVar.reset -contextvars.ContextVar.set copy.PyStringMap dataclasses.Field.__init__ dataclasses.InitVar.__init__ -dataclasses.dataclass dataclasses.field -dataclasses.replace dummy_threading email.message.MIMEPart.as_string enum.Enum._generate_next_value_ +fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve ftplib.FTP.__init__ ftplib.FTP_TLS.__init__ functools.partialmethod.__get__ functools.singledispatchmethod.__call__ gettext.install gettext.translation -hmac.compare_digest hmac.new # Stub is a white lie; see comments in the stub http.client.HTTPSConnection.__init__ http.cookiejar.DefaultCookiePolicy.__init__ http.server.SimpleHTTPRequestHandler.__init__ -imaplib.IMAP4.__init__ -imaplib.IMAP4.open -imaplib.IMAP4_SSL.__init__ -imaplib.IMAP4_SSL.open importlib.metadata.DistributionFinder.Context.pattern importlib.metadata.EntryPointBase -inspect.isasyncgenfunction -inspect.iscoroutinefunction -inspect.isgeneratorfunction -io.IncrementalNewlineDecoder.setstate ipaddress.IPv4Interface.hostmask ipaddress.IPv6Interface.hostmask ipaddress._BaseNetwork.broadcast_address ipaddress._BaseNetwork.hostmask -itertools.tee logging.FileHandler.__init__ logging.handlers.BaseRotatingHandler.__init__ logging.handlers.RotatingFileHandler.__init__ logging.handlers.TimedRotatingFileHandler.__init__ logging.handlers.WatchedFileHandler.__init__ -lzma.LZMACompressor.compress -lzma.is_check_supported -macpath -macurl2path # removed in 3.7 -mmap.MADV_AUTOSYNC -mmap.MADV_CORE -mmap.MADV_NOCORE -mmap.MADV_NOSYNC -mmap.MADV_PROTECT -mmap.MADV_SOFT_OFFLINE +macpath # module removed in 3.8 +macurl2path # module removed in 3.7 +mmap.MADV_[A-Z_]+ # platform dependent constants multiprocessing.managers.SharedMemoryServer.__init__ multiprocessing.pool.CLOSE multiprocessing.pool.RUN @@ -130,37 +76,15 @@ os.MFD_HUGE_32MB os.MFD_HUGE_512MB os.getgrouplist -os.initgroups -os.pipe2 -os.posix_fadvise -os.posix_fallocate -os.sched_getaffinity -os.sched_getparam -os.sched_getscheduler -os.sched_rr_get_interval -os.sched_setaffinity -os.sched_setparam -os.sched_setscheduler os.sendfile -os.setresgid -os.setresuid -os.waitid -pickle.Pickler.dump pickle.Pickler.reducer_override -pickle.loads -platform.DEV_NULL +# platform.uname_result's processor field is now dynamically made to exist platform.uname_result.__new__ platform.uname_result._fields platform.uname_result.processor -pwd.getpwnam -pwd.getpwuid queue.SimpleQueue.__init__ -random.SystemRandom.getrandbits secrets.SystemRandom.getstate -secrets.SystemRandom.getrandbits -secrets.compare_digest -signal.sigtimedwait -signal.sigwaitinfo +select.epoll.register smtplib.LMTP.__init__ smtplib.SMTP.sendmail sre_constants.RANGE_IGNORE @@ -169,16 +93,14 @@ ssl.RAND_egd symtable.SymbolTable.has_exec sys.UnraisableHookArgs -threading.ExceptHookArgs time.CLOCK_PROF time.CLOCK_UPTIME -trace.Trace.runfunc types.ClassMethodDescriptorType.__get__ types.CodeType.replace +types.GenericAlias.__getattr__ types.MethodDescriptorType.__get__ types.WrapperDescriptorType.__get__ -typing.Annotated -typing.NamedTuple +typing.ForwardRef._evaluate typing.SupportsAbs.__init__ typing.SupportsBytes.__init__ typing.SupportsComplex.__init__ @@ -195,16 +117,77 @@ typing._TypedDict.setdefault typing._TypedDict.update typing._TypedDict.values -unittest.TestCase.addCleanup -unittest.case.TestCase.addCleanup unittest.doModuleCleanups -weakref.WeakValueDictionary.__init__ weakref.WeakValueDictionary.update -weakref.getweakrefcount webbrowser.Opera.raise_opts -xml.etree.ElementTree.Element.getchildren -xml.etree.ElementTree.Element.getiterator -xml.etree.ElementTree.ElementTree.getiterator xml.etree.ElementTree.XMLParser.__init__ -xml.etree.cElementTree +xml.etree.cElementTree.XMLParser.__init__ + +# positional-only complaints +builtins.bytearray.pop +builtins.bytearray.remove +bz2.BZ2Compressor.compress +bz2.BZ2File.read +bz2.BZ2File.read1 +bz2.BZ2File.readline +bz2.BZ2File.seek +collections.AsyncGenerator.asend +collections.AsyncGenerator.athrow +collections.Container.__contains__ +collections.Coroutine.send +collections.Coroutine.throw +collections.Generator.send +collections.Generator.throw +collections.OrderedDict.fromkeys +collections.OrderedDict.setdefault +collections.abc.AsyncGenerator.asend +collections.abc.AsyncGenerator.athrow +collections.abc.Container.__contains__ +collections.abc.Coroutine.send +collections.abc.Coroutine.throw +collections.abc.Generator.send +collections.abc.Generator.throw +contextlib.AsyncExitStack.callback +contextlib.AsyncExitStack.push_async_callback +contextlib.ExitStack.callback +contextvars.ContextVar.reset +contextvars.ContextVar.set +dataclasses.dataclass +dataclasses.replace +io.IncrementalNewlineDecoder.setstate +itertools.tee +lzma.LZMACompressor.compress +lzma.is_check_supported +os.initgroups +os.pipe2 +os.posix_fadvise +os.posix_fallocate +os.sched_getaffinity +os.sched_getparam +os.sched_getscheduler +os.sched_rr_get_interval +os.sched_setaffinity +os.sched_setparam +os.sched_setscheduler +os.setresgid +os.setresuid +os.waitid +pwd.getpwnam +pwd.getpwuid +random.SystemRandom.getrandbits +secrets.SystemRandom.getrandbits +signal.sigtimedwait +signal.sigwaitinfo +trace.Trace.runfunc zipfile.ZipExtFile.seek +# These enums derive from (int, IntEnum) or (str, Enum). See comment in py3_common.txt +enum.IntFlag.__new__ +pstats.SortKey.__new__ +re.RegexFlag.__new__ +socket.AddressInfo.__new__ +socket.MsgFlag.__new__ +ssl.Options.__new__ +ssl.TLSVersion.__new__ +ssl.VerifyFlags.__new__ +ssl.VerifyMode.__new__ +tkinter.EventType.__new__ diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py3_common.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py3_common.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py3_common.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/py3_common.txt 2020-12-01 23:26:19.000000000 +0000 @@ -32,8 +32,8 @@ builtins.bytearray.__float__ builtins.bytearray.__int__ builtins.bytearray.append +builtins.bytearray.extend builtins.bytearray.maketrans -builtins.bytearray.remove builtins.bytes.__float__ builtins.bytes.__int__ builtins.bytes.maketrans @@ -56,30 +56,24 @@ bz2.BZ2File.write bz2.BZ2File.writelines codecs.BufferedIncrementalDecoder.decode -codecs.CodecInfo.__new__ codecs.CodecInfo.decode codecs.CodecInfo.encode codecs.CodecInfo.incrementaldecoder codecs.CodecInfo.incrementalencoder codecs.CodecInfo.streamreader codecs.CodecInfo.streamwriter -codecs.EncodedFile -codecs.IncrementalDecoder.decode codecs.IncrementalEncoder.encode codecs.StreamReader.__getattr__ codecs.StreamReader.readline codecs.StreamReader.readlines codecs.StreamWriter.__getattr__ codecs.StreamWriter.write -codecs.open -codecs.register_error codecs.utf_16_be_decode codecs.utf_16_be_encode collections.Callable collections.ChainMap.get collections.ChainMap.maps collections.ChainMap.new_child -collections.ChainMap.pop collections.Coroutine.cr_await collections.Coroutine.cr_code collections.Coroutine.cr_frame @@ -90,18 +84,7 @@ collections.Generator.gi_running collections.Generator.gi_yieldfrom collections.Mapping.get -collections.MutableMapping.pop -collections.MutableMapping.setdefault -collections.MutableSequence.append -collections.MutableSequence.extend -collections.MutableSequence.insert -collections.MutableSequence.remove -collections.MutableSet.add -collections.MutableSet.discard -collections.MutableSet.remove -collections.Sequence.count collections.Sequence.index -collections.Set.isdisjoint collections.abc.Callable collections.abc.Coroutine.cr_await collections.abc.Coroutine.cr_code @@ -112,29 +95,13 @@ collections.abc.Generator.gi_running collections.abc.Generator.gi_yieldfrom collections.abc.Mapping.get -collections.abc.MutableMapping.pop -collections.abc.MutableMapping.setdefault -collections.abc.MutableSequence.append -collections.abc.MutableSequence.extend -collections.abc.MutableSequence.insert -collections.abc.MutableSequence.remove -collections.abc.MutableSet.add -collections.abc.MutableSet.discard -collections.abc.MutableSet.remove -collections.abc.Sequence.count collections.abc.Sequence.index -collections.abc.Set.isdisjoint collections.deque.__hash__ -concurrent.futures.Executor.map -concurrent.futures._base.Executor.map -concurrent.futures.ProcessPoolExecutor.map -concurrent.futures.process.ProcessPoolExecutor.map configparser.LegacyInterpolation.before_get configparser.SectionProxy.__getattr__ configparser.SectionProxy.getboolean configparser.SectionProxy.getfloat configparser.SectionProxy.getint -contextlib.ContextManager csv.Dialect.delimiter csv.Dialect.doublequote csv.Dialect.lineterminator @@ -143,8 +110,6 @@ ctypes.Array.__iter__ ctypes.CDLL._FuncPtr ctypes.cast -ctypes.create_string_buffer -ctypes.create_unicode_buffer ctypes.memmove ctypes.memset ctypes.pointer @@ -165,8 +130,6 @@ distutils.version.Version._cmp distutils.version.Version.parse email.errors.MessageDefect.__init__ -email.feedparser.BytesFeedParser.__init__ -email.feedparser.FeedParser.__init__ email.generator.BytesGenerator.__init__ email.generator.DecodedGenerator.__init__ email.generator.Generator.__init__ @@ -197,7 +160,6 @@ enum.EnumMeta.__call__ enum.EnumMeta.__new__ getopt.GetoptError.__init__ -hmac.HMAC.__init__ html.parser.HTMLParser.feed http.HTTPStatus.description http.HTTPStatus.phrase @@ -216,7 +178,6 @@ http.cookies.Morsel.update http.server.HTTPServer.__init__ imaplib.IMAP4_SSL.ssl -imaplib.IMAP4_stream.open importlib.abc.FileLoader.get_filename importlib.abc.Loader.exec_module importlib.abc.MetaPathFinder.find_spec @@ -233,11 +194,13 @@ importlib.machinery.WindowsRegistryFinder.find_spec importlib.util.spec_from_file_location importlib.util.spec_from_loader -inspect.BoundArguments.__init__ +inspect.Parameter.KEYWORD_ONLY +inspect.Parameter.POSITIONAL_ONLY +inspect.Parameter.POSITIONAL_OR_KEYWORD +inspect.Parameter.VAR_KEYWORD +inspect.Parameter.VAR_POSITIONAL inspect.Parameter.replace inspect.Signature.replace -inspect.getabsfile -inspect.getmodule io.BufferedRandom.truncate io.BufferedReader.seek io.BufferedReader.truncate @@ -261,7 +224,6 @@ ipaddress._BaseNetwork.max_prefixlen itertools.accumulate itertools.chain.from_iterable -itertools.combinations itertools.combinations_with_replacement itertools.compress itertools.count @@ -289,13 +251,9 @@ mailbox.mbox.__init__ mimetypes.read_mime_types mmap.mmap.__iter__ -multiprocessing.Array -multiprocessing.Event multiprocessing.JoinableQueue multiprocessing.Queue multiprocessing.SimpleQueue -multiprocessing.Value -multiprocessing.context.BaseContext.Event multiprocessing.managers.BaseManager.shutdown multiprocessing.managers.Server.__init__ multiprocessing.managers.SyncManager.Event @@ -305,18 +263,11 @@ multiprocessing.pool.ApplyResult.__init__ multiprocessing.pool.IMapIterator.__init__ multiprocessing.pool.MapResult.__init__ -multiprocessing.pool.Pool.imap -multiprocessing.pool.Pool.imap_unordered -multiprocessing.pool.Pool.map -multiprocessing.pool.Pool.map_async -multiprocessing.pool.Pool.starmap -multiprocessing.pool.Pool.starmap_async multiprocessing.queues.JoinableQueue.__init__ multiprocessing.queues.Queue.__init__ multiprocessing.queues.Queue.put_nowait multiprocessing.queues.SimpleQueue.__init__ multiprocessing.queues.SimpleQueue.put -multiprocessing.set_executable multiprocessing.synchronize.Barrier.__init__ multiprocessing.synchronize.Condition.acquire multiprocessing.synchronize.Condition.release @@ -338,7 +289,6 @@ os._Environ.setdefault os._wrap_close.__init__ pickle.Pickler.persistent_id -pickle.Unpickler.find_class pickle.Unpickler.persistent_load pipes.Template.copy pkgutil.ImpImporter.__init__ @@ -351,9 +301,7 @@ pydoc.TextDoc.docother pydoc.TextDoc.docproperty pydoc.TextDoc.docroutine -random.Random.randrange random.SystemRandom.getstate -random.randrange re.error.__init__ runpy.run_path sched.Event.__doc__ @@ -374,9 +322,7 @@ socketserver.BaseServer.server_bind sqlite3.Row.__len__ sqlite3.dbapi2.Row.__len__ -sqlite3.dbapi2.register_adapters_and_converters sqlite3.dbapi2.version_info -sqlite3.register_adapters_and_converters sqlite3.version_info sre_constants.error.__init__ ssl.PROTOCOL_SSLv2 @@ -402,9 +348,7 @@ sys.implementation sysconfig.is_python_build sysconfig.parse_config_h -tarfile.TarFile.__init__ tarfile.TarFile.errors -tarfile.TarFile.tarinfo tempfile.SpooledTemporaryFile.__next__ tempfile.SpooledTemporaryFile.readable tempfile.SpooledTemporaryFile.seekable @@ -416,6 +360,9 @@ threading.Semaphore.acquire threading.Thread.__init__ timeit.main +tkinter.Misc.grid_propagate +tkinter.Misc.pack_propagate +tkinter.Tk.report_callback_exception # A bit of a lie, since it's actually a method, but typing it as an attribute allows it to be assigned to trace.CoverageResults.__init__ traceback.FrameSummary.__init__ traceback.TracebackException.__init__ @@ -432,32 +379,7 @@ typing.IO.__iter__ typing.IO.__next__ typing.type_check_only -unittest.TestCase.assertAlmostEqual -unittest.TestCase.assertDictContainsSubset -unittest.TestCase.assertNotAlmostEqual -unittest.TestCase.assertSequenceEqual -unittest.TestLoader.loadTestsFromModule -unittest.TestProgram.__init__ -unittest.TestResult.__init__ -unittest.TestResult.addSubTest -unittest.TestRunner -unittest.TestSuite.run -unittest.case.TestCase.assertAlmostEqual -unittest.case.TestCase.assertDictContainsSubset -unittest.case.TestCase.assertNotAlmostEqual -unittest.case.TestCase.assertSequenceEqual -unittest.case.expectedFailure -unittest.expectedFailure -unittest.loader.TestLoader.loadTestsFromModule -unittest.main -unittest.mock.NonCallableMock.__init__ -unittest.mock.NonCallableMock.__new__ -unittest.removeHandler -unittest.result.TestResult.__init__ -unittest.result.TestResult.addSubTest -unittest.runner.TestRunner -unittest.signals.removeHandler -unittest.suite.TestSuite.run +unittest.mock.patch # It's a complicated overload and I haven't been able to figure out why stubtest doesn't like it urllib.error.ContentTooShortError.__init__ urllib.error.URLError.__init__ urllib.parse._DefragResultBase.__new__ @@ -466,17 +388,11 @@ urllib.robotparser.RobotFileParser.can_fetch warnings.catch_warnings.__init__ weakref.CallableProxyType.__getattr__ -weakref.KeyedRef.__new__ weakref.ProxyType.__getattr__ weakref.ReferenceType.__call__ -weakref.WeakKeyDictionary.__init__ weakref.WeakKeyDictionary.get -weakref.WeakKeyDictionary.pop -weakref.WeakKeyDictionary.setdefault weakref.WeakKeyDictionary.update weakref.WeakValueDictionary.get -weakref.WeakValueDictionary.pop -weakref.WeakValueDictionary.setdefault webbrowser.Mozilla.raise_opts webbrowser.UnixBrowser.raise_opts webbrowser.UnixBrowser.remote_action @@ -484,13 +400,23 @@ webbrowser.UnixBrowser.remote_action_newwin wsgiref.types # Doesn't exist, see comments in file xml.etree.ElementPath._SelectorContext.parent_map -xml.etree.ElementTree.Element.__bool__ -xml.etree.ElementTree.Element.copy xml.sax.xmlreader.AttributesImpl.has_key zipfile.ZipExtFile.read zipfile.ZipExtFile.readline zlib.compressobj +# These enums derive from (int, IntEnum) or (str, Enum). Strangely, +# at runtime, they inherit Enum.__new__, not int.__new__ or +# str.__new__ as the mro would dictate, which is why stubtest balks. +enum.IntEnum.__new__ +http.HTTPStatus.__new__ +inspect._ParameterKind.__new__ +signal.Handlers.__new__ +signal.Sigmasks.__new__ +signal.Signals.__new__ +socket.AddressFamily.__new__ +socket.SocketKind.__new__ + # ========== # Whitelist entries that cannot or should not be fixed # ========== diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py35.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py35.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py35.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py35.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -posixpath.splitunc # This doesn't exist, but our hands are tied by check_consistent diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py38.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py38.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py38.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32-py38.txt 2020-12-01 23:26:19.000000000 +0000 @@ -1,2 +1 @@ -os._AddedDllDirectory.__init__ # Parameters mismatch -importlib.metadata.DistributionFinder.Context.pattern \ No newline at end of file +importlib.metadata.DistributionFinder.Context.pattern diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32.txt pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32.txt --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32.txt 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/tests/stubtest_whitelists/win32.txt 2020-12-01 23:26:19.000000000 +0000 @@ -17,6 +17,7 @@ asyncio.unix_events crypt dbm.gnu +dbm.ndbm fcntl grp nis @@ -27,6 +28,7 @@ spwd syslog termios +xxlimited # Modules that rely on _curses curses diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/_base.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/_base.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/_base.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/_base.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,8 @@ import threading +from abc import abstractmethod from logging import Logger -from typing import TypeVar, Generic, Any, Iterable, Iterator, Callable, Tuple, Optional, Set, List from types import TracebackType -import sys +from typing import Any, Callable, Container, Generic, Iterable, Iterator, List, Optional, Protocol, Set, Tuple, TypeVar FIRST_COMPLETED: str FIRST_EXCEPTION: str @@ -17,13 +17,17 @@ class Error(Exception): ... class CancelledError(Error): ... class TimeoutError(Error): ... -if sys.version_info >= (3, 8): - class InvalidStateError(Error): ... -if sys.version_info >= (3, 7): - class BrokenExecutor(RuntimeError): ... +_T = TypeVar("_T") -_T = TypeVar('_T') +_T_co = TypeVar("_T_co", covariant=True) + +# Copied over Collection implementation as it does not exist in Python 2 and <3.6. +# Also to solve pytype issues with _Collection. +class _Collection(Iterable[_T_co], Container[_T_co], Protocol[_T_co]): + # Implement Sized (but don't have it as a base class). + @abstractmethod + def __len__(self) -> int: ... class Future(Generic[_T]): def __init__(self) -> None: ... @@ -35,32 +39,22 @@ def result(self, timeout: Optional[float] = ...) -> _T: ... def set_running_or_notify_cancel(self) -> bool: ... def set_result(self, result: _T) -> None: ... - - if sys.version_info >= (3,): - def exception(self, timeout: Optional[float] = ...) -> Optional[BaseException]: ... - def set_exception(self, exception: Optional[BaseException]) -> None: ... - else: - def exception(self, timeout: Optional[float] = ...) -> Any: ... - def exception_info(self, timeout: Optional[float] = ...) -> Tuple[Any, Optional[TracebackType]]: ... - def set_exception(self, exception: Any) -> None: ... - def set_exception_info(self, exception: Any, traceback: Optional[TracebackType]) -> None: ... - + def exception(self, timeout: Optional[float] = ...) -> Any: ... + def exception_info(self, timeout: Optional[float] = ...) -> Tuple[Any, Optional[TracebackType]]: ... + def set_exception(self, exception: Any) -> None: ... + def set_exception_info(self, exception: Any, traceback: Optional[TracebackType]) -> None: ... class Executor: def submit(self, fn: Callable[..., _T], *args: Any, **kwargs: Any) -> Future[_T]: ... - if sys.version_info >= (3, 5): - def map(self, func: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ..., - chunksize: int = ...) -> Iterator[_T]: ... - else: - def map(self, func: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ...,) -> Iterator[_T]: ... + def map(self, func: Callable[..., _T], *iterables: Iterable[Any], timeout: Optional[float] = ...) -> Iterator[_T]: ... def shutdown(self, wait: bool = ...) -> None: ... def __enter__(self: _T) -> _T: ... def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> Optional[bool]: ... def as_completed(fs: Iterable[Future[_T]], timeout: Optional[float] = ...) -> Iterator[Future[_T]]: ... - -def wait(fs: Iterable[Future[_T]], timeout: Optional[float] = ..., return_when: str = ...) -> Tuple[Set[Future[_T]], - Set[Future[_T]]]: ... +def wait( + fs: _Collection[Future[_T]], timeout: Optional[float] = ..., return_when: str = ... +) -> Tuple[Set[Future[_T]], Set[Future[_T]]]: ... class _Waiter: event: threading.Event @@ -70,7 +64,6 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AsCompletedWaiter(_Waiter): lock: threading.Lock def __init__(self) -> None: ... @@ -78,13 +71,11 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _FirstCompletedWaiter(_Waiter): def add_result(self, future: Future[Any]) -> None: ... def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AllCompletedWaiter(_Waiter): num_pending_calls: int stop_on_exception: bool @@ -94,7 +85,6 @@ def add_exception(self, future: Future[Any]) -> None: ... def add_cancelled(self, future: Future[Any]) -> None: ... - class _AcquireFutures: futures: Iterable[Future[Any]] def __init__(self, futures: Iterable[Future[Any]]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,13 @@ -import sys from ._base import ( + ALL_COMPLETED as ALL_COMPLETED, FIRST_COMPLETED as FIRST_COMPLETED, FIRST_EXCEPTION as FIRST_EXCEPTION, - ALL_COMPLETED as ALL_COMPLETED, CancelledError as CancelledError, - TimeoutError as TimeoutError, - Future as Future, Executor as Executor, - wait as wait, + Future as Future, + TimeoutError as TimeoutError, as_completed as as_completed, + wait as wait, ) -if sys.version_info >= (3, 8): - from ._base import InvalidStateError as InvalidStateError -if sys.version_info >= (3, 7): - from ._base import BrokenExecutor as BrokenExecutor -from .thread import ThreadPoolExecutor as ThreadPoolExecutor from .process import ProcessPoolExecutor as ProcessPoolExecutor +from .thread import ThreadPoolExecutor as ThreadPoolExecutor diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/process.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/process.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/process.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/process.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,23 +1,8 @@ -from typing import Any, Callable, Optional, Tuple +from typing import Any, Optional + from ._base import Executor -import sys EXTRA_QUEUED_CALLS: Any -if sys.version_info >= (3, 7): - from ._base import BrokenExecutor - class BrokenProcessPool(BrokenExecutor): ... -elif sys.version_info >= (3,): - class BrokenProcessPool(RuntimeError): ... - -if sys.version_info >= (3, 7): - from multiprocessing.context import BaseContext - - class ProcessPoolExecutor(Executor): - def __init__(self, max_workers: Optional[int] = ..., - mp_context: Optional[BaseContext] = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Tuple[Any, ...] = ...) -> None: ... -else: - class ProcessPoolExecutor(Executor): - def __init__(self, max_workers: Optional[int] = ...) -> None: ... +class ProcessPoolExecutor(Executor): + def __init__(self, max_workers: Optional[int] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/thread.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/thread.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/thread.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/concurrent/futures/thread.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,11 @@ -from typing import Any, Callable, Iterable, Mapping, Optional, Tuple, TypeVar, Generic -from ._base import Executor, Future -import sys +from typing import Any, Callable, Generic, Iterable, Mapping, Optional, Tuple, TypeVar -if sys.version_info >= (3, 7): - from ._base import BrokenExecutor - class BrokenThreadPool(BrokenExecutor): ... +from ._base import Executor, Future -_S = TypeVar('_S') +_S = TypeVar("_S") class ThreadPoolExecutor(Executor): - if sys.version_info >= (3, 7): - def __init__(self, max_workers: Optional[int] = ..., - thread_name_prefix: str = ..., - initializer: Optional[Callable[..., None]] = ..., - initargs: Tuple[Any, ...] = ...) -> None: ... - elif sys.version_info >= (3, 6) or sys.version_info < (3,): - def __init__(self, max_workers: Optional[int] = ..., - thread_name_prefix: str = ...) -> None: ... - else: - def __init__(self, max_workers: Optional[int] = ...) -> None: ... - + def __init__(self, max_workers: Optional[int] = ..., thread_name_prefix: str = ...) -> None: ... class _WorkItem(Generic[_S]): future: Future[_S] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/ipaddress.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/ipaddress.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/ipaddress.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/ipaddress.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,4 @@ -from typing import (Any, Container, Generic, Iterable, Iterator, Optional, - overload, SupportsInt, Text, Tuple, TypeVar) - -import sys +from typing import Any, Container, Generic, Iterable, Iterator, Optional, SupportsInt, Text, Tuple, TypeVar, overload # Undocumented length constants IPV4LENGTH: int @@ -86,12 +83,9 @@ def max_prefixlen(self) -> int: ... @property def num_addresses(self) -> int: ... - def overlaps(self, other: _BaseNetwork) -> bool: ... + def overlaps(self, other: _BaseNetwork[_A]) -> bool: ... @property def prefixlen(self) -> int: ... - if sys.version_info >= (3, 7): - def subnet_of(self: _T, other: _T) -> bool: ... - def supernet_of(self: _T, other: _T) -> bool: ... def subnets(self: _T, prefixlen_diff: int = ..., new_prefix: Optional[int] = ...) -> Iterator[_T]: ... def supernet(self: _T, prefixlen_diff: int = ..., new_prefix: Optional[int] = ...) -> _T: ... @property diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/pathlib2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/pathlib2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/pathlib2.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/pathlib2.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,15 @@ -from _typeshed import OpenBinaryMode, OpenTextMode -from typing import (Any, BinaryIO, Generator, IO, List, Optional, Sequence, - TextIO, Tuple, Type, TypeVar, Union, overload) -from types import TracebackType import os import sys +from _typeshed import OpenBinaryMode, OpenBinaryModeReading, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenTextMode +from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper +from types import TracebackType +from typing import IO, Any, BinaryIO, Generator, List, Optional, Sequence, Text, TextIO, Tuple, Type, TypeVar, Union, overload +from typing_extensions import Literal -_P = TypeVar('_P', bound=PurePath) +_P = TypeVar("_P", bound=PurePath) -if sys.version_info >= (3, 6): - _PurePathBase = os.PathLike[str] -else: - _PurePathBase = object +_PurePathBase = object +_PathLike = PurePath class PurePath(_PurePathBase): parts: Tuple[str, ...] @@ -21,46 +20,25 @@ suffix: str suffixes: List[str] stem: str - if sys.version_info < (3, 5): - def __init__(self, *pathsegments: str) -> None: ... - elif sys.version_info < (3, 6): - def __new__(cls: Type[_P], *args: Union[str, PurePath]) -> _P: ... - else: - def __new__(cls: Type[_P], *args: Union[str, os.PathLike[str]]) -> _P: ... + def __new__(cls: Type[_P], *args: Union[str, _PathLike]) -> _P: ... def __hash__(self) -> int: ... def __lt__(self, other: PurePath) -> bool: ... def __le__(self, other: PurePath) -> bool: ... def __gt__(self, other: PurePath) -> bool: ... def __ge__(self, other: PurePath) -> bool: ... - if sys.version_info < (3, 6): - def __truediv__(self: _P, key: Union[str, PurePath]) -> _P: ... - def __rtruediv__(self: _P, key: Union[str, PurePath]) -> _P: ... - else: - def __truediv__(self: _P, key: Union[str, os.PathLike[str]]) -> _P: ... - def __rtruediv__(self: _P, key: Union[str, os.PathLike[str]]) -> _P: ... - if sys.version_info < (3,): - def __div__(self: _P, key: Union[str, PurePath]) -> _P: ... + def __truediv__(self: _P, key: Union[str, _PathLike]) -> _P: ... + def __rtruediv__(self: _P, key: Union[str, _PathLike]) -> _P: ... + def __div__(self: _P, key: Union[str, PurePath]) -> _P: ... def __bytes__(self) -> bytes: ... def as_posix(self) -> str: ... def as_uri(self) -> str: ... def is_absolute(self) -> bool: ... def is_reserved(self) -> bool: ... - if sys.version_info >= (3, 9): - def is_relative_to(self, *other: Union[str, os.PathLike[str]]) -> bool: ... def match(self, path_pattern: str) -> bool: ... - if sys.version_info < (3, 6): - def relative_to(self: _P, *other: Union[str, PurePath]) -> _P: ... - else: - def relative_to(self: _P, *other: Union[str, os.PathLike[str]]) -> _P: ... + def relative_to(self: _P, *other: Union[str, _PathLike]) -> _P: ... def with_name(self: _P, name: str) -> _P: ... - if sys.version_info >= (3, 9): - def with_stem(self: _P, stem: str) -> _P: ... def with_suffix(self: _P, suffix: str) -> _P: ... - if sys.version_info < (3, 6): - def joinpath(self: _P, *other: Union[str, PurePath]) -> _P: ... - else: - def joinpath(self: _P, *other: Union[str, os.PathLike[str]]) -> _P: ... - + def joinpath(self: _P, *other: Union[str, _PathLike]) -> _P: ... @property def parents(self: _P) -> Sequence[_P]: ... @property @@ -70,10 +48,11 @@ class PureWindowsPath(PurePath): ... class Path(PurePath): + def __new__(cls: Type[_P], *args: Union[str, _PathLike], **kwargs: Any) -> _P: ... def __enter__(self) -> Path: ... - def __exit__(self, exc_type: Optional[Type[BaseException]], - exc_value: Optional[BaseException], - traceback: Optional[TracebackType]) -> Optional[bool]: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_value: Optional[BaseException], traceback: Optional[TracebackType] + ) -> Optional[bool]: ... @classmethod def cwd(cls: Type[_P]) -> _P: ... def stat(self) -> os.stat_result: ... @@ -83,8 +62,6 @@ def group(self) -> str: ... def is_dir(self) -> bool: ... def is_file(self) -> bool: ... - if sys.version_info >= (3, 7): - def is_mount(self) -> bool: ... def is_symlink(self) -> bool: ... def is_socket(self) -> bool: ... def is_fifo(self) -> bool: ... @@ -93,66 +70,34 @@ def iterdir(self) -> Generator[Path, None, None]: ... def lchmod(self, mode: int) -> None: ... def lstat(self) -> os.stat_result: ... - if sys.version_info < (3, 5): - def mkdir(self, mode: int = ..., - parents: bool = ...) -> None: ... - else: - def mkdir(self, mode: int = ..., parents: bool = ..., - exist_ok: bool = ...) -> None: ... - @overload - def open(self, mode: OpenTextMode = ..., buffering: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ..., - newline: Optional[str] = ...) -> TextIO: ... - @overload - def open(self, mode: OpenBinaryMode, buffering: int = ..., encoding: None = ..., errors: None = ..., - newline: None = ...) -> BinaryIO: ... - @overload - def open(self, mode: str, buffering: int = ..., encoding: Optional[str] = ..., errors: Optional[str] = ..., - newline: Optional[str] = ...) -> IO[Any]: ... + def mkdir(self, mode: int = ..., parents: bool = ...) -> None: ... + # Adapted from _io.open + def open( + self, + mode: Text = ..., + buffering: int = ..., + encoding: Optional[Text] = ..., + errors: Optional[Text] = ..., + newline: Optional[Text] = ..., + ) -> IO[Any]: ... def owner(self) -> str: ... - if sys.version_info >= (3, 9): - def readlink(self: _P) -> _P: ... - if sys.version_info >= (3, 8): - def rename(self: _P, target: Union[str, PurePath]) -> _P: ... - def replace(self: _P, target: Union[str, PurePath]) -> _P: ... - else: - def rename(self, target: Union[str, PurePath]) -> None: ... - def replace(self, target: Union[str, PurePath]) -> None: ... - if sys.version_info < (3, 6): - def resolve(self: _P) -> _P: ... - else: - def resolve(self: _P, strict: bool = ...) -> _P: ... + def rename(self, target: Union[str, PurePath]) -> None: ... + def replace(self, target: Union[str, PurePath]) -> None: ... + def resolve(self: _P) -> _P: ... def rglob(self, pattern: str) -> Generator[Path, None, None]: ... def rmdir(self) -> None: ... - def symlink_to(self, target: Union[str, Path], - target_is_directory: bool = ...) -> None: ... + def symlink_to(self, target: Union[str, Path], target_is_directory: bool = ...) -> None: ... def touch(self, mode: int = ..., exist_ok: bool = ...) -> None: ... - if sys.version_info >= (3, 8): - def unlink(self, missing_ok: bool = ...) -> None: ... - else: - def unlink(self) -> None: ... - - if sys.version_info >= (3, 5): - @classmethod - def home(cls: Type[_P]) -> _P: ... - if sys.version_info < (3, 6): - def __new__(cls: Type[_P], *args: Union[str, PurePath], - **kwargs: Any) -> _P: ... - else: - def __new__(cls: Type[_P], *args: Union[str, os.PathLike[str]], - **kwargs: Any) -> _P: ... - - def absolute(self: _P) -> _P: ... - def expanduser(self: _P) -> _P: ... - def read_bytes(self) -> bytes: ... - def read_text(self, encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> str: ... - def samefile(self, other_path: Union[str, bytes, int, Path]) -> bool: ... - def write_bytes(self, data: bytes) -> int: ... - def write_text(self, data: str, encoding: Optional[str] = ..., - errors: Optional[str] = ...) -> int: ... - if sys.version_info >= (3, 8): - def link_to(self, target: Union[str, bytes, os.PathLike[str]]) -> None: ... - + def unlink(self) -> None: ... + @classmethod + def home(cls: Type[_P]) -> _P: ... + def absolute(self: _P) -> _P: ... + def expanduser(self: _P) -> _P: ... + def read_bytes(self) -> bytes: ... + def read_text(self, encoding: Optional[str] = ..., errors: Optional[str] = ...) -> str: ... + def samefile(self, other_path: Union[str, bytes, int, Path]) -> bool: ... + def write_bytes(self, data: bytes) -> int: ... + def write_text(self, data: str, encoding: Optional[str] = ..., errors: Optional[str] = ...) -> int: ... class PosixPath(Path, PurePosixPath): ... class WindowsPath(Path, PureWindowsPath): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,22 +1,39 @@ from __future__ import print_function import types -from typing import ( - Any, AnyStr, Callable, Dict, Iterable, Mapping, NoReturn, Optional, - Pattern, Text, Tuple, Type, TypeVar, Union, overload, ValuesView, KeysView, ItemsView, -) import typing import unittest - from __builtin__ import unichr as unichr -from StringIO import StringIO as StringIO, StringIO as BytesIO from functools import wraps as wraps +from StringIO import StringIO as StringIO +from typing import ( + Any, + AnyStr, + Callable, + Dict, + ItemsView, + Iterable, + KeysView, + Mapping, + NoReturn, + Optional, + Pattern, + Text, + Tuple, + Type, + TypeVar, + Union, + ValuesView, + overload, +) + from . import moves +BytesIO = StringIO -_T = TypeVar('_T') -_K = TypeVar('_K') -_V = TypeVar('_V') +_T = TypeVar("_T") +_K = TypeVar("_K") +_V = TypeVar("_V") __version__: str @@ -35,10 +52,10 @@ MAXSIZE: int def advance_iterator(it: typing.Iterator[_T]) -> _T: ... + next = advance_iterator def callable(obj: object) -> bool: ... - def get_unbound_function(unbound: types.MethodType) -> types.FunctionType: ... def create_bound_method(func: types.FunctionType, obj: object) -> types.MethodType: ... def create_unbound_method(func: types.FunctionType, cls: Union[type, types.ClassType]) -> types.MethodType: ... @@ -52,33 +69,34 @@ def get_function_code(fun: types.FunctionType) -> types.CodeType: ... def get_function_defaults(fun: types.FunctionType) -> Optional[Tuple[Any, ...]]: ... def get_function_globals(fun: types.FunctionType) -> Dict[str, Any]: ... - def iterkeys(d: Mapping[_K, _V]) -> typing.Iterator[_K]: ... def itervalues(d: Mapping[_K, _V]) -> typing.Iterator[_V]: ... def iteritems(d: Mapping[_K, _V]) -> typing.Iterator[Tuple[_K, _V]]: ... + # def iterlists def viewkeys(d: Mapping[_K, _V]) -> KeysView[_K]: ... def viewvalues(d: Mapping[_K, _V]) -> ValuesView[_V]: ... def viewitems(d: Mapping[_K, _V]) -> ItemsView[_K, _V]: ... - def b(s: str) -> binary_type: ... def u(s: str) -> text_type: ... + int2byte = chr + def byte2int(bs: binary_type) -> int: ... def indexbytes(buf: binary_type, i: int) -> int: ... def iterbytes(buf: binary_type) -> typing.Iterator[int]: ... - def assertCountEqual(self: unittest.TestCase, first: Iterable[_T], second: Iterable[_T], msg: str = ...) -> None: ... @overload def assertRaisesRegex(self: unittest.TestCase, msg: str = ...) -> Any: ... @overload def assertRaisesRegex(self: unittest.TestCase, callable_obj: Callable[..., Any], *args: Any, **kwargs: Any) -> Any: ... -def assertRegex(self: unittest.TestCase, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], - msg: str = ...) -> None: ... - -def reraise(tp: Optional[Type[BaseException]], value: Optional[BaseException], - tb: Optional[types.TracebackType] = ...) -> NoReturn: ... +def assertRegex( + self: unittest.TestCase, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], msg: str = ... +) -> None: ... +def reraise( + tp: Optional[Type[BaseException]], value: Optional[BaseException], tb: Optional[types.TracebackType] = ... +) -> NoReturn: ... def exec_(_code_: Union[unicode, types.CodeType], _globs_: Dict[str, Any] = ..., _locs_: Dict[str, Any] = ...): ... def raise_from(value: Union[BaseException, Type[BaseException]], from_value: Optional[BaseException]) -> NoReturn: ... @@ -104,7 +122,9 @@ class MovedAttribute(_LazyDescriptor): mod: str attr: str - def __init__(self, name: str, old_mod: str, new_mod: str, old_attr: Optional[str] = ..., new_attr: Optional[str] = ...) -> None: ... + def __init__( + self, name: str, old_mod: str, new_mod: str, old_attr: Optional[str] = ..., new_attr: Optional[str] = ... + ) -> None: ... def add_move(move: Union[MovedModule, MovedAttribute]) -> None: ... def remove_move(name: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,47 +2,17 @@ # # Note: Commented out items means they weren't implemented at the time. # Uncomment them when the modules have been added to the typeshed. -from cStringIO import StringIO as cStringIO -from itertools import ifilter as filter -from itertools import ifilterfalse as filterfalse -from __builtin__ import raw_input as input -from __builtin__ import intern as intern -from itertools import imap as map -from os import getcwdu as getcwd -from os import getcwd as getcwdb -from __builtin__ import xrange as range -from __builtin__ import reload as reload_module -from __builtin__ import reduce as reduce -from pipes import quote as shlex_quote +import __builtin__ +import itertools +import os +import pipes +from __builtin__ import intern as intern, reduce as reduce, xrange as xrange +from cStringIO import StringIO as _cStringIO from StringIO import StringIO as StringIO from UserDict import UserDict as UserDict from UserList import UserList as UserList from UserString import UserString as UserString -from __builtin__ import xrange as xrange -from itertools import izip as zip -from itertools import izip_longest as zip_longest -import __builtin__ as builtins -from . import configparser -# import copy_reg as copyreg -# import gdbm as dbm_gnu -from . import _dummy_thread -from . import http_cookiejar -from . import http_cookies -from . import html_entities -from . import html_parser -from . import http_client -# import email.MIMEMultipart as email_mime_multipart -# import email.MIMENonMultipart as email_mime_nonmultipart -from . import email_mime_text -# import email.MIMEBase as email_mime_base -from . import BaseHTTPServer -from . import CGIHTTPServer -from . import SimpleHTTPServer -from . import cPickle -from . import queue -from . import reprlib -from . import socketserver -from . import _thread + # import Tkinter as tkinter # import Dialog as tkinter_dialog # import FileDialog as tkinter_filedialog @@ -58,9 +28,51 @@ # import tkFont as tkinter_font # import tkMessageBox as tkinter_messagebox # import tkSimpleDialog as tkinter_tksimpledialog -from . import urllib_parse -from . import urllib_error -from . import urllib -from . import urllib_robotparser -from . import xmlrpc_client +# import email.MIMEBase as email_mime_base +# import email.MIMEMultipart as email_mime_multipart +# import email.MIMENonMultipart as email_mime_nonmultipart +# import copy_reg as copyreg +# import gdbm as dbm_gnu +from . import ( + BaseHTTPServer, + CGIHTTPServer, + SimpleHTTPServer, + _dummy_thread, + _thread, + configparser, + cPickle, + email_mime_text, + html_entities, + html_parser, + http_client, + http_cookiejar, + http_cookies, + queue, + reprlib, + socketserver, + urllib, + urllib_error, + urllib_parse, + urllib_robotparser, + xmlrpc_client, +) + # import SimpleXMLRPCServer as xmlrpc_server + +builtins = __builtin__ +input = __builtin__.raw_input +reload_module = __builtin__.reload +range = __builtin__.xrange + +cStringIO = _cStringIO + +filter = itertools.ifilter +filterfalse = itertools.ifilterfalse +map = itertools.imap +zip = itertools.izip +zip_longest = itertools.izip_longest + +getcwdb = os.getcwd +getcwd = os.getcwdu + +shlex_quote = pipes.quote diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/error.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/error.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/error.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/error.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,3 +1,2 @@ -from urllib2 import URLError as URLError -from urllib2 import HTTPError as HTTPError from urllib import ContentTooShortError as ContentTooShortError +from urllib2 import HTTPError as HTTPError, URLError as URLError diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/parse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/parse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/parse.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/parse.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,29 @@ -# Stubs for six.moves.urllib.parse -from urlparse import ParseResult as ParseResult -from urlparse import SplitResult as SplitResult -from urlparse import parse_qs as parse_qs -from urlparse import parse_qsl as parse_qsl -from urlparse import urldefrag as urldefrag -from urlparse import urljoin as urljoin -from urlparse import urlparse as urlparse -from urlparse import urlsplit as urlsplit -from urlparse import urlunparse as urlunparse -from urlparse import urlunsplit as urlunsplit -from urllib import quote as quote -from urllib import quote_plus as quote_plus -from urllib import unquote as unquote -from urllib import unquote as unquote_to_bytes -from urllib import unquote_plus as unquote_plus -from urllib import urlencode as urlencode -from urllib import splitquery as splitquery -from urllib import splittag as splittag -from urllib import splituser as splituser -from urlparse import uses_fragment as uses_fragment -from urlparse import uses_netloc as uses_netloc -from urlparse import uses_params as uses_params -from urlparse import uses_query as uses_query -from urlparse import uses_relative as uses_relative +from urllib import ( + quote as quote, + quote_plus as quote_plus, + splitquery as splitquery, + splittag as splittag, + splituser as splituser, + unquote as unquote, + unquote_plus as unquote_plus, + urlencode as urlencode, +) +from urlparse import ( + ParseResult as ParseResult, + SplitResult as SplitResult, + parse_qs as parse_qs, + parse_qsl as parse_qsl, + urldefrag as urldefrag, + urljoin as urljoin, + urlparse as urlparse, + urlsplit as urlsplit, + urlunparse as urlunparse, + urlunsplit as urlunsplit, + uses_fragment as uses_fragment, + uses_netloc as uses_netloc, + uses_params as uses_params, + uses_query as uses_query, + uses_relative as uses_relative, +) + +unquote_to_bytes = unquote diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/request.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/request.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/request.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/request.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,36 +1,39 @@ -# Stubs for six.moves.urllib.request -from urllib2 import urlopen as urlopen -from urllib2 import install_opener as install_opener -from urllib2 import build_opener as build_opener -from urllib import pathname2url as pathname2url -from urllib import url2pathname as url2pathname -from urllib import getproxies as getproxies -from urllib2 import Request as Request -from urllib2 import OpenerDirector as OpenerDirector -from urllib2 import HTTPDefaultErrorHandler as HTTPDefaultErrorHandler -from urllib2 import HTTPRedirectHandler as HTTPRedirectHandler -from urllib2 import HTTPCookieProcessor as HTTPCookieProcessor -from urllib2 import ProxyHandler as ProxyHandler -from urllib2 import BaseHandler as BaseHandler -from urllib2 import HTTPPasswordMgr as HTTPPasswordMgr -from urllib2 import HTTPPasswordMgrWithDefaultRealm as HTTPPasswordMgrWithDefaultRealm -from urllib2 import AbstractBasicAuthHandler as AbstractBasicAuthHandler -from urllib2 import HTTPBasicAuthHandler as HTTPBasicAuthHandler -from urllib2 import ProxyBasicAuthHandler as ProxyBasicAuthHandler -from urllib2 import AbstractDigestAuthHandler as AbstractDigestAuthHandler -from urllib2 import HTTPDigestAuthHandler as HTTPDigestAuthHandler -from urllib2 import ProxyDigestAuthHandler as ProxyDigestAuthHandler -from urllib2 import HTTPHandler as HTTPHandler -from urllib2 import HTTPSHandler as HTTPSHandler -from urllib2 import FileHandler as FileHandler -from urllib2 import FTPHandler as FTPHandler -from urllib2 import CacheFTPHandler as CacheFTPHandler -from urllib2 import UnknownHandler as UnknownHandler -from urllib2 import HTTPErrorProcessor as HTTPErrorProcessor -from urllib import urlretrieve as urlretrieve -from urllib import urlcleanup as urlcleanup -from urllib import URLopener as URLopener -from urllib import FancyURLopener as FancyURLopener -from urllib import proxy_bypass as proxy_bypass -from urllib2 import parse_http_list as parse_http_list -from urllib2 import parse_keqv_list as parse_keqv_list +from urllib import ( + FancyURLopener as FancyURLopener, + URLopener as URLopener, + getproxies as getproxies, + pathname2url as pathname2url, + proxy_bypass as proxy_bypass, + url2pathname as url2pathname, + urlcleanup as urlcleanup, + urlretrieve as urlretrieve, +) +from urllib2 import ( + AbstractBasicAuthHandler as AbstractBasicAuthHandler, + AbstractDigestAuthHandler as AbstractDigestAuthHandler, + BaseHandler as BaseHandler, + CacheFTPHandler as CacheFTPHandler, + FileHandler as FileHandler, + FTPHandler as FTPHandler, + HTTPBasicAuthHandler as HTTPBasicAuthHandler, + HTTPCookieProcessor as HTTPCookieProcessor, + HTTPDefaultErrorHandler as HTTPDefaultErrorHandler, + HTTPDigestAuthHandler as HTTPDigestAuthHandler, + HTTPErrorProcessor as HTTPErrorProcessor, + HTTPHandler as HTTPHandler, + HTTPPasswordMgr as HTTPPasswordMgr, + HTTPPasswordMgrWithDefaultRealm as HTTPPasswordMgrWithDefaultRealm, + HTTPRedirectHandler as HTTPRedirectHandler, + HTTPSHandler as HTTPSHandler, + OpenerDirector as OpenerDirector, + ProxyBasicAuthHandler as ProxyBasicAuthHandler, + ProxyDigestAuthHandler as ProxyDigestAuthHandler, + ProxyHandler as ProxyHandler, + Request as Request, + UnknownHandler as UnknownHandler, + build_opener as build_opener, + install_opener as install_opener, + parse_http_list as parse_http_list, + parse_keqv_list as parse_keqv_list, + urlopen as urlopen, +) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/response.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/response.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/response.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2/six/moves/urllib/response.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1 @@ -# Stubs for six.moves.urllib.response -from urllib import addbase as addbase -from urllib import addclosehook as addclosehook -from urllib import addinfo as addinfo -from urllib import addinfourl as addinfourl +from urllib import addbase as addbase, addclosehook as addclosehook, addinfo as addinfo, addinfourl as addinfourl diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/atomicwrites/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/atomicwrites/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/atomicwrites/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/atomicwrites/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,9 @@ -import sys -from typing import Any, AnyStr, Callable, ContextManager, Generic, IO, Optional, Text, Type, Union from _typeshed import AnyPath +from typing import IO, Any, AnyStr, Callable, ContextManager, Optional, Text, Type def replace_atomic(src: AnyStr, dst: AnyStr) -> None: ... def move_atomic(src: AnyStr, dst: AnyStr) -> None: ... + class AtomicWriter(object): def __init__(self, path: AnyPath, mode: Text = ..., overwrite: bool = ...) -> None: ... def open(self) -> ContextManager[IO[Any]]: ... @@ -12,6 +12,5 @@ def sync(self, f: IO[Any]) -> None: ... def commit(self, f: IO[Any]) -> None: ... def rollback(self, f: IO[Any]) -> None: ... -def atomic_write( - path: AnyPath, writer_cls: Type[AtomicWriter] = ..., **cls_kwargs: object, -) -> ContextManager[IO[Any]]: ... + +def atomic_write(path: AnyPath, writer_cls: Type[AtomicWriter] = ..., **cls_kwargs: object) -> ContextManager[IO[Any]]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/converters.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/converters.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/converters.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/converters.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,10 @@ -from typing import TypeVar, Optional, Callable, overload +from typing import Callable, Optional, TypeVar, overload + from . import _ConverterType _T = TypeVar("_T") -def optional( - converter: _ConverterType[_T] -) -> _ConverterType[Optional[_T]]: ... +def optional(converter: _ConverterType[_T]) -> _ConverterType[Optional[_T]]: ... @overload def default_if_none(default: _T) -> _ConverterType[_T]: ... @overload diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/filters.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/filters.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/filters.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/filters.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ -from typing import Union, Any +from typing import Any, Union + from . import Attribute, _FilterType def include(*what: Union[type, Attribute[Any]]) -> _FilterType[Any]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,7 @@ -from typing import ( - Any, - Callable, - Dict, - Generic, - List, - Optional, - Sequence, - Mapping, - Tuple, - Type, - TypeVar, - Union, - overload, -) +from typing import Any, Callable, Dict, Generic, List, Mapping, Optional, Sequence, Tuple, Type, TypeVar, Union, overload # `import X as X` is required to make these public -from . import exceptions as exceptions -from . import filters as filters -from . import converters as converters -from . import validators as validators - +from . import converters as converters, exceptions as exceptions, filters as filters, validators as validators from ._version_info import VersionInfo __version__: str @@ -55,10 +37,7 @@ @overload def Factory(factory: Callable[[], _T]) -> _T: ... @overload -def Factory( - factory: Union[Callable[[Any], _T], Callable[[], _T]], - takes_self: bool = ..., -) -> _T: ... +def Factory(factory: Union[Callable[[Any], _T], Callable[[], _T]], takes_self: bool = ...) -> _T: ... class Attribute(Generic[_T]): name: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/validators.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/validators.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/validators.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/attr/validators.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,20 @@ from typing import ( - Container, - List, - Union, - TypeVar, - Type, Any, - Optional, - Tuple, + AnyStr, + Callable, + Container, Iterable, + List, Mapping, - Callable, Match, - AnyStr, + Optional, + Tuple, + Type, + TypeVar, + Union, overload, ) + from . import _ValidatorType _T = TypeVar("_T") @@ -32,35 +33,22 @@ @overload def instance_of(type: Tuple[Type[_T]]) -> _ValidatorType[_T]: ... @overload -def instance_of( - type: Tuple[Type[_T1], Type[_T2]] -) -> _ValidatorType[Union[_T1, _T2]]: ... +def instance_of(type: Tuple[Type[_T1], Type[_T2]]) -> _ValidatorType[Union[_T1, _T2]]: ... @overload -def instance_of( - type: Tuple[Type[_T1], Type[_T2], Type[_T3]] -) -> _ValidatorType[Union[_T1, _T2, _T3]]: ... +def instance_of(type: Tuple[Type[_T1], Type[_T2], Type[_T3]]) -> _ValidatorType[Union[_T1, _T2, _T3]]: ... @overload def instance_of(type: Tuple[type, ...]) -> _ValidatorType[Any]: ... def provides(interface: Any) -> _ValidatorType[Any]: ... -def optional( - validator: Union[_ValidatorType[_T], List[_ValidatorType[_T]]] -) -> _ValidatorType[Optional[_T]]: ... +def optional(validator: Union[_ValidatorType[_T], List[_ValidatorType[_T]]]) -> _ValidatorType[Optional[_T]]: ... def in_(options: Container[_T]) -> _ValidatorType[_T]: ... def and_(*validators: _ValidatorType[_T]) -> _ValidatorType[_T]: ... def matches_re( - regex: AnyStr, - flags: int = ..., - func: Optional[ - Callable[[AnyStr, AnyStr, int], Optional[Match[AnyStr]]] - ] = ..., + regex: AnyStr, flags: int = ..., func: Optional[Callable[[AnyStr, AnyStr, int], Optional[Match[AnyStr]]]] = ... ) -> _ValidatorType[AnyStr]: ... def deep_iterable( - member_validator: _ValidatorType[_T], - iterable_validator: Optional[_ValidatorType[_I]] = ..., + member_validator: _ValidatorType[_T], iterable_validator: Optional[_ValidatorType[_I]] = ... ) -> _ValidatorType[_I]: ... def deep_mapping( - key_validator: _ValidatorType[_K], - value_validator: _ValidatorType[_V], - mapping_validator: Optional[_ValidatorType[_M]] = ..., + key_validator: _ValidatorType[_K], value_validator: _ValidatorType[_V], mapping_validator: Optional[_ValidatorType[_M]] = ... ) -> _ValidatorType[_M]: ... def is_callable() -> _ValidatorType[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/abc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/abc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/abc.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/abc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,7 @@ +from abc import ABCMeta +from typing import MutableMapping, TypeVar + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class DefaultMapping(MutableMapping[_KT, _VT], metaclass=ABCMeta): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/cache.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/cache.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/cache.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/cache.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Callable, Generic, Iterator, Optional, TypeVar + +from .abc import DefaultMapping as DefaultMapping + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class Cache(DefaultMapping[_KT, _VT], Generic[_KT, _VT]): + def __init__(self, maxsize: int, getsizeof: Optional[Callable[[_VT], int]] = ...) -> None: ... + def __getitem__(self, key: _KT) -> _VT: ... + def __setitem__(self, key: _KT, value: _VT) -> None: ... + def __delitem__(self, key: _KT) -> None: ... + def __iter__(self) -> Iterator[_KT]: ... + def __len__(self) -> int: ... + @property + def maxsize(self) -> int: ... + @property + def currsize(self) -> int: ... + @staticmethod + def getsizeof(value: _VT) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/decorators.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/decorators.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/decorators.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/decorators.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,16 @@ +from typing import Any, Callable, ContextManager, MutableMapping, Optional, TypeVar + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") +_T = TypeVar("_T", bound=Callable[..., Any]) +_T_co = TypeVar("_T_co", covariant=True) +_T_self = TypeVar("_T_self") + +def cached( + cache: Optional[MutableMapping[_KT, _VT]], key: Callable[..., _KT] = ..., lock: Optional[ContextManager[_T_co]] = ... +) -> Callable[[_T], _T]: ... +def cachedmethod( + cache: Callable[[_T_self], Optional[MutableMapping[_KT, _VT]]], + key: Callable[..., _KT] = ..., + lock: Optional[ContextManager[_T_co]] = ..., +) -> Callable[[_T], _T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/func.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/func.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/func.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/func.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,11 @@ +from typing import Any, Callable, Optional, Sequence, TypeVar + +_T = TypeVar("_T") + +_F = TypeVar("_F", bound=Callable[..., Any]) +_RET = Callable[[_F], _F] + +def lfu_cache(maxsize: int = ..., typed: bool = ...) -> _RET: ... +def lru_cache(maxsize: int = ..., typed: bool = ...) -> _RET: ... +def rr_cache(maxsize: int = ..., choice: Optional[Callable[[Sequence[_T]], _T]] = ..., typed: bool = ...) -> _RET: ... +def ttl_cache(maxsize: int = ..., ttl: float = ..., timer: float = ..., typed: bool = ...) -> _RET: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,6 @@ +from .cache import Cache as Cache +from .decorators import cached as cached, cachedmethod as cachedmethod +from .lfu import LFUCache as LFUCache +from .lru import LRUCache as LRUCache +from .rr import RRCache as RRCache +from .ttl import TTLCache as TTLCache diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lfu.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lfu.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lfu.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lfu.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,14 @@ +from typing import Callable, Iterator, Optional, TypeVar + +from .cache import Cache + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class LFUCache(Cache[_KT, _VT]): + def __init__(self, maxsize: int, getsizeof: Optional[Callable[[_VT], int]] = ...) -> None: ... + def __getitem__(self, key: _KT, cache_getitem: Callable[[_KT], _VT] = ...) -> _VT: ... + def __setitem__(self, key: _KT, value: _VT, cache_setitem: Callable[[_KT, _VT], None] = ...) -> None: ... + def __delitem__(self, key: _KT, cache_delitem: Callable[[_KT], None] = ...) -> None: ... + def __iter__(self) -> Iterator[_KT]: ... + def __len__(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lru.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lru.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lru.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/lru.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,13 @@ +from typing import Callable, Iterator, Optional, TypeVar + +from .cache import Cache as Cache + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class LRUCache(Cache[_KT, _VT]): + def __init__(self, maxsize: int, getsizeof: Optional[Callable[[_VT], int]] = ...) -> None: ... + def __getitem__(self, key: _KT, cache_getitem: Callable[[_KT], _VT] = ...) -> _VT: ... + def __setitem__(self, key: _KT, value: _VT, cache_setitem: Callable[[_KT, _VT], None] = ...) -> None: ... + def __delitem__(self, key: _KT, cache_delitem: Callable[[_KT], None] = ...) -> None: ... + def __iter__(self) -> Iterator[_KT]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/rr.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/rr.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/rr.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/rr.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import Callable, Iterator, Optional, Sequence, TypeVar + +from .cache import Cache as Cache + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class RRCache(Cache[_KT, _VT]): + def __init__( + self, + maxsize: int, + choice: Optional[Callable[[Sequence[_KT]], _KT]] = ..., + getsizeof: Optional[Callable[[_VT], int]] = ..., + ) -> None: ... + def __getitem__(self, key: _KT) -> _VT: ... + def __setitem__(self, key: _KT, value: _VT) -> None: ... + def __delitem__(self, key: _KT) -> None: ... + def __iter__(self) -> Iterator[_KT]: ... + def __len__(self) -> int: ... + @property + def choice(self) -> Callable[[Sequence[_KT]], _KT]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/ttl.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/ttl.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/ttl.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cachetools/ttl.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,23 @@ +from typing import Callable, Iterator, Optional, TypeVar + +from .cache import Cache + +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class TTLCache(Cache[_KT, _VT]): + def __init__( + self, maxsize: int, ttl: float, timer: Callable[[], float] = ..., getsizeof: Optional[Callable[[_VT], int]] = ... + ) -> None: ... + def __getitem__(self, key: _KT, cache_getitem: Callable[[_KT], _VT] = ...) -> _VT: ... + def __setitem__(self, key: _KT, value: _VT, cache_setitem: Callable[[_KT, _VT], None] = ...) -> None: ... + def __delitem__(self, key: _KT, cache_delitem: Callable[[_KT], None] = ...) -> None: ... + def __iter__(self) -> Iterator[_KT]: ... + def __len__(self) -> int: ... + @property + def currsize(self) -> int: ... + @property + def timer(self) -> Callable[[], float]: ... + @property + def ttl(self) -> float: ... + def expire(self, time: Optional[Callable[[], float]] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/enums.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/enums.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/enums.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/enums.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -28,7 +28,6 @@ UNLIKELY: int LIKELY: int POSITIVE: int - @classmethod def get_num_categories(cls) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langbulgarianmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langbulgarianmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langbulgarianmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langbulgarianmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType Latin5_BulgarianCharToOrderMap: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langcyrillicmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langcyrillicmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langcyrillicmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langcyrillicmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType KOI8R_char_to_order_map: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langgreekmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langgreekmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langgreekmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langgreekmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType Latin7_char_to_order_map: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhebrewmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhebrewmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhebrewmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhebrewmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType WIN1255_CHAR_TO_ORDER_MAP: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhungarianmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhungarianmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhungarianmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langhungarianmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType Latin2_HungarianCharToOrderMap: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langthaimodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langthaimodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langthaimodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langthaimodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType TIS620CharToOrderMap: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langturkishmodel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langturkishmodel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langturkishmodel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/langturkishmodel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Tuple + from . import _LangModelType Latin5_TurkishCharToOrderMap: Tuple[int, ...] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/universaldetector.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/universaldetector.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/universaldetector.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/chardet/universaldetector.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,6 @@ -import sys -from typing import Dict, Pattern, Optional -from typing_extensions import TypedDict from logging import Logger +from typing import Dict, Optional, Pattern +from typing_extensions import TypedDict class _FinalResultType(TypedDict): encoding: str @@ -24,7 +23,6 @@ done: bool lang_filter: int logger: Logger - def __init__(self, lang_filter: int = ...) -> None: ... def reset(self) -> None: ... def feed(self, byte_str: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/AES.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/AES.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/AES.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/AES.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Union, Text -from .blockalgo import BlockAlgo - -__revision__: str - -class AESCipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> AESCipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC2.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC2.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Union, Text -from .blockalgo import BlockAlgo - -__revision__: str - -class RC2Cipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> RC2Cipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC4.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC4.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC4.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/ARC4.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -from typing import Any, Union, Text - -__revision__: str - -class ARC4Cipher: - block_size: int - key_size: int - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - def encrypt(self, plaintext): ... - def decrypt(self, ciphertext): ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> ARC4Cipher: ... - -block_size: int -key_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/blockalgo.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/blockalgo.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/blockalgo.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/blockalgo.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -from typing import Any, Union, Text - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int - -class BlockAlgo: - mode: int - block_size: int - IV: Any - def __init__(self, factory: Any, key: Union[bytes, Text], *args, **kwargs) -> None: ... - def encrypt(self, plaintext: Union[bytes, Text]) -> bytes: ... - def decrypt(self, ciphertext: bytes) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/Blowfish.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/Blowfish.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/Blowfish.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/Blowfish.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Union, Text -from .blockalgo import BlockAlgo - -__revision__: str - -class BlowfishCipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> BlowfishCipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/CAST.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/CAST.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/CAST.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/CAST.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Union, Text -from .blockalgo import BlockAlgo - -__revision__: str - -class CAST128Cipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> CAST128Cipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES3.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES3.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES3.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES3.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -from typing import Any, Union, Text - -from .blockalgo import BlockAlgo - -__revision__: str - -class DES3Cipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> DES3Cipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/DES.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Union, Text -from .blockalgo import BlockAlgo - -__revision__: str - -class DESCipher(BlockAlgo): - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - -def new(key: Union[bytes, Text], *args, **kwargs) -> DESCipher: ... - -MODE_ECB: int -MODE_CBC: int -MODE_CFB: int -MODE_PGP: int -MODE_OFB: int -MODE_CTR: int -MODE_OPENPGP: int -block_size: int -key_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/__init__.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# Names in __all__ with no definition: -# AES -# ARC2 -# ARC4 -# Blowfish -# CAST -# DES -# DES3 -# PKCS1_OAEP -# PKCS1_v1_5 -# XOR diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_OAEP.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_OAEP.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_OAEP.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_OAEP.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional, Union, Text - -from Crypto.PublicKey.RSA import _RSAobj - -class PKCS1OAEP_Cipher: - def __init__(self, key: _RSAobj, hashAlgo: Any, mgfunc: Any, label: Any) -> None: ... - def can_encrypt(self): ... - def can_decrypt(self): ... - def encrypt(self, message: Union[bytes, Text]) -> bytes: ... - def decrypt(self, ct: bytes) -> bytes: ... - - -def new(key: _RSAobj, hashAlgo: Optional[Any] = ..., mgfunc: Optional[Any] = ..., label: Any = ...) -> PKCS1OAEP_Cipher: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_v1_5.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_v1_5.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_v1_5.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/PKCS1_v1_5.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Union, Text - -from Crypto.PublicKey.RSA import _RSAobj - -class PKCS115_Cipher: - def __init__(self, key: _RSAobj) -> None: ... - def can_encrypt(self) -> bool: ... - def can_decrypt(self) -> bool: ... - rf: Any - def encrypt(self, message: Union[bytes, Text]) -> bytes: ... - def decrypt(self, ct: bytes, sentinel: Any) -> bytes: ... - -def new(key: _RSAobj) -> PKCS115_Cipher: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/XOR.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/XOR.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/XOR.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Cipher/XOR.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -from typing import Any, Union, Text - -__revision__: str - -class XORCipher: - block_size: int - key_size: int - def __init__(self, key: Union[bytes, Text], *args, **kwargs) -> None: ... - def encrypt(self, plaintext: Union[bytes, Text]) -> bytes: ... - def decrypt(self, ciphertext: bytes) -> bytes: ... - - -def new(key: Union[bytes, Text], *args, **kwargs) -> XORCipher: ... - -block_size: int -key_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/hashalgo.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/hashalgo.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/hashalgo.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/hashalgo.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -from typing import Any, Optional - -class HashAlgo: - digest_size: Any - block_size: Any - def __init__(self, hashFactory, data: Optional[Any] = ...) -> None: ... - def update(self, data): ... - def digest(self): ... - def hexdigest(self): ... - def copy(self): ... - def new(self, data: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/HMAC.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/HMAC.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/HMAC.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/HMAC.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -from typing import Any, Optional - -digest_size: Any - -class HMAC: - digest_size: Any - digestmod: Any - outer: Any - inner: Any - def __init__(self, key, msg: Optional[Any] = ..., digestmod: Optional[Any] = ...) -> None: ... - def update(self, msg): ... - def copy(self): ... - def digest(self): ... - def hexdigest(self): ... - -def new(key, msg: Optional[Any] = ..., digestmod: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# Names in __all__ with no definition: -# HMAC -# MD2 -# MD4 -# MD5 -# RIPEMD -# SHA -# SHA224 -# SHA256 -# SHA384 -# SHA512 diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD2.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD2.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class MD2Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD4.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD4.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD4.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD4.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class MD4Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD5.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD5.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD5.pyi 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/MD5.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class MD5Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/RIPEMD.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/RIPEMD.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/RIPEMD.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/RIPEMD.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class RIPEMD160Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA224.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA224.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA224.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA224.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class SHA224Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA256.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA256.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA256.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA256.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class SHA256Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA384.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA384.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA384.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA384.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class SHA384Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA512.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA512.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA512.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA512.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class SHA512Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Hash/SHA.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash.hashalgo import HashAlgo - -class SHA1Hash(HashAlgo): - oid: Any - digest_size: int - block_size: int - def __init__(self, data: Optional[Any] = ...) -> None: ... - def new(self, data: Optional[Any] = ...): ... - -def new(data: Optional[Any] = ...): ... - -digest_size: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Names in __all__ with no definition: -# Cipher -# Hash -# Protocol -# PublicKey -# Signature -# Util diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/pct_warnings.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/pct_warnings.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/pct_warnings.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/pct_warnings.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -class CryptoWarning(Warning): ... -class CryptoDeprecationWarning(DeprecationWarning, CryptoWarning): ... -class CryptoRuntimeWarning(RuntimeWarning, CryptoWarning): ... -class RandomPool_DeprecationWarning(CryptoDeprecationWarning): ... -class ClockRewindWarning(CryptoRuntimeWarning): ... -class GetRandomNumber_DeprecationWarning(CryptoDeprecationWarning): ... -class PowmInsecureWarning(CryptoRuntimeWarning): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/AllOrNothing.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/AllOrNothing.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/AllOrNothing.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/AllOrNothing.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -from typing import Any, Optional - -__revision__: str - -def isInt(x): ... - -class AllOrNothing: - def __init__(self, ciphermodule, mode: Optional[Any] = ..., IV: Optional[Any] = ...) -> None: ... - def digest(self, text): ... - def undigest(self, blocks): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/Chaffing.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/Chaffing.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/Chaffing.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/Chaffing.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -__revision__: str - -class Chaff: - def __init__(self, factor: float = ..., blocksper: int = ...) -> None: ... - def chaff(self, blocks): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Names in __all__ with no definition: -# AllOrNothing -# Chaffing -# KDF diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/KDF.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/KDF.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/KDF.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Protocol/KDF.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -from typing import Any, Optional -from Crypto.Hash import SHA as SHA1 - -__revision__: str - -def PBKDF1(password, salt, dkLen, count: int = ..., hashAlgo: Optional[Any] = ...): ... -def PBKDF2(password, salt, dkLen: int = ..., count: int = ..., prf: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/DSA.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/DSA.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/DSA.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/DSA.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -from typing import Any, Optional -from .pubkey import pubkey - -class _DSAobj(pubkey): - keydata: Any - implementation: Any - key: Any - def __init__(self, implementation, key) -> None: ... - def __getattr__(self, attrname): ... - def sign(self, M, K): ... - def verify(self, M, signature): ... - def has_private(self): ... - def size(self): ... - def can_blind(self): ... - def can_encrypt(self): ... - def can_sign(self): ... - def publickey(self): ... - -class DSAImplementation: - error: Any - def __init__(self, **kwargs) -> None: ... - def generate(self, bits, randfunc: Optional[Any] = ..., progress_func: Optional[Any] = ...): ... - def construct(self, tup): ... - -generate: Any -construct: Any -error: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/ElGamal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/ElGamal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/ElGamal.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/ElGamal.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, Optional - -from Crypto.PublicKey.pubkey import pubkey -from Crypto.PublicKey.pubkey import * # noqa: F403 - -class error(Exception): ... - -def generate(bits, randfunc, progress_func: Optional[Any] = ...): ... -def construct(tup): ... - -class ElGamalobj(pubkey): - keydata: Any - def encrypt(self, plaintext, K): ... - def decrypt(self, ciphertext): ... - def sign(self, M, K): ... - def verify(self, M, signature): ... - def size(self): ... - def has_private(self): ... - def publickey(self): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Names in __all__ with no definition: -# DSA -# ElGamal -# RSA diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/pubkey.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/pubkey.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/pubkey.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/pubkey.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -from Crypto.Util.number import * # noqa: F403 - -__revision__: str - -class pubkey: - def __init__(self) -> None: ... - def encrypt(self, plaintext, K): ... - def decrypt(self, ciphertext): ... - def sign(self, M, K): ... - def verify(self, M, signature): ... - def validate(self, M, signature): ... - def blind(self, M, B): ... - def unblind(self, M, B): ... - def can_sign(self): ... - def can_encrypt(self): ... - def can_blind(self): ... - def size(self): ... - def has_private(self): ... - def publickey(self): ... - def __eq__(self, other): ... - def __ne__(self, other): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/RSA.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/RSA.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/RSA.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/PublicKey/RSA.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -from typing import Any, Optional, Union, Text -from .pubkey import pubkey - -class _RSAobj(pubkey): - keydata: Any - implementation: Any - key: Any - def __init__(self, implementation, key, randfunc: Optional[Any] = ...) -> None: ... - def __getattr__(self, attrname): ... - def encrypt(self, plaintext, K): ... - def decrypt(self, ciphertext): ... - def sign(self, M, K): ... - def verify(self, M, signature): ... - def has_private(self): ... - def size(self): ... - def can_blind(self): ... - def can_encrypt(self): ... - def can_sign(self): ... - def publickey(self): ... - def exportKey(self, format: str = ..., passphrase: Optional[Any] = ..., pkcs: int = ...): ... - -class RSAImplementation: - error: Any - def __init__(self, **kwargs) -> None: ... - def generate(self, bits, randfunc: Optional[Any] = ..., progress_func: Optional[Any] = ..., e: int = ...): ... - def construct(self, tup): ... - def importKey(self, externKey: Any, passphrase: Union[None, bytes, Text] = ...) -> _RSAobj: ... - -generate: Any -construct: Any -importKey: Any -error: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaAccumulator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaAccumulator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaAccumulator.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaAccumulator.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -from typing import Any - -__revision__: str - -class FortunaPool: - digest_size: Any - def __init__(self) -> None: ... - def append(self, data): ... - def digest(self): ... - def hexdigest(self): ... - length: int - def reset(self): ... - -def which_pools(r): ... - -class FortunaAccumulator: - min_pool_size: int - reseed_interval: float - reseed_count: int - generator: Any - last_reseed: Any - pools: Any - def __init__(self) -> None: ... - def random_data(self, bytes): ... - def add_random_event(self, source_number, pool_number, data): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaGenerator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaGenerator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaGenerator.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/FortunaGenerator.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -from typing import Any - -__revision__: str - -class AESGenerator: - block_size: Any - key_size: int - max_blocks_per_request: Any - counter: Any - key: Any - block_size_shift: Any - blocks_per_key: Any - max_bytes_per_request: Any - def __init__(self) -> None: ... - def reseed(self, seed): ... - def pseudo_random_data(self, bytes): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/SHAd256.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/SHAd256.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/SHAd256.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/Fortuna/SHAd256.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -from typing import Any, Optional - -class _SHAd256: - digest_size: Any - def __init__(self, internal_api_check, sha256_hash_obj) -> None: ... - def copy(self): ... - def digest(self): ... - def hexdigest(self): ... - def update(self, data): ... - -digest_size: Any - -def new(data: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -from typing import Any - -def new(*args: Any, **kwargs: Any): ... -def atfork() -> None: ... -def get_random_bytes(n: int) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/fallback.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/fallback.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/fallback.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/fallback.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -from .rng_base import BaseRNG - -class PythonOSURandomRNG(BaseRNG): - name: str - def __init__(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -__revision__: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/posix.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/posix.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/posix.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/posix.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -from typing import Any, Optional -from .rng_base import BaseRNG - -class DevURandomRNG(BaseRNG): - name: str - def __init__(self, devname: Optional[Any] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/rng_base.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/rng_base.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/rng_base.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/OSRNG/rng_base.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -__revision__: str - -class BaseRNG: - closed: bool - def __init__(self) -> None: ... - def __del__(self): ... - def __enter__(self): ... - def __exit__(self): ... - def close(self): ... - def flush(self): ... - def read(self, N: int = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/random.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/random.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/random.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Random/random.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -from typing import Any, List, Optional, Sequence, TypeVar - -_T = TypeVar('_T') - -class StrongRandom: - def __init__(self, rng: Optional[Any] = ..., randfunc: Optional[Any] = ...) -> None: ... - def getrandbits(self, k: int) -> int: ... - def randrange(self, start: int, stop: int = ..., step: int = ...) -> int: ... - def randint(self, a: int, b: int) -> int: ... - def choice(self, seq: Sequence[_T]) -> _T: ... - def shuffle(self, x: Sequence[Any]): ... - def sample(self, population: Sequence[_T], k: int) -> List[_T]: ... - -def getrandbits(k: int) -> int: ... -def randrange(start: int, stop: int = ..., step: int = ...) -> int: ... -def randint(a: int, b: int) -> int: ... -def choice(seq: Sequence[_T]) -> _T: ... -def shuffle(x: Sequence[Any]): ... -def sample(population: Sequence[_T], k: int) -> List[_T]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Names in __all__ with no definition: -# PKCS1_PSS -# PKCS1_v1_5 diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_PSS.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_PSS.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_PSS.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_PSS.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -from typing import Any, Optional - -class PSS_SigScheme: - def __init__(self, key, mgfunc, saltLen) -> None: ... - def can_sign(self): ... - def sign(self, mhash): ... - def verify(self, mhash, S): ... - -def new(key, mgfunc: Optional[Any] = ..., saltLen: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_v1_5.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_v1_5.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_v1_5.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Signature/PKCS1_v1_5.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -class PKCS115_SigScheme: - def __init__(self, key) -> None: ... - def can_sign(self): ... - def sign(self, mhash): ... - def verify(self, mhash, S): ... - -def new(key): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/asn1.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/asn1.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/asn1.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/asn1.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -from typing import Any, Optional - -class DerObject: - typeTags: Any - typeTag: Any - payload: Any - def __init__(self, ASN1Type: Optional[Any] = ..., payload: Any = ...) -> None: ... - def isType(self, ASN1Type): ... - def encode(self): ... - def decode(self, derEle, noLeftOvers: int = ...): ... - -class DerInteger(DerObject): - value: Any - def __init__(self, value: int = ...) -> None: ... - payload: Any - def encode(self): ... - def decode(self, derEle, noLeftOvers: int = ...): ... - -class DerSequence(DerObject): - def __init__(self, startSeq: Optional[Any] = ...) -> None: ... - def __delitem__(self, n): ... - def __getitem__(self, n): ... - def __setitem__(self, key, value): ... - def __setslice__(self, i, j, sequence): ... - def __delslice__(self, i, j): ... - def __getslice__(self, i, j): ... - def __len__(self): ... - def append(self, item): ... - def hasInts(self): ... - def hasOnlyInts(self): ... - payload: Any - def encode(self): ... - def decode(self, derEle, noLeftOvers: int = ...): ... - -class DerOctetString(DerObject): - payload: Any - def __init__(self, value: Any = ...) -> None: ... - def decode(self, derEle, noLeftOvers: int = ...): ... - -class DerNull(DerObject): - def __init__(self) -> None: ... - -class DerObjectId(DerObject): - def __init__(self) -> None: ... - def decode(self, derEle, noLeftOvers: int = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/Counter.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/Counter.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/Counter.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/Counter.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -from typing import Any - -def new(nbits, prefix: Any = ..., suffix: Any = ..., initial_value: int = ..., overflow: int = ..., little_endian: bool = ..., allow_wraparound: bool = ..., disable_shortcut: bool = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Names in __all__ with no definition: -# RFC1751 -# asn1 -# number -# randpool -# strxor diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/number.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/number.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/number.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/number.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -from typing import Any, Optional -from warnings import warn as _warn - -__revision__: str -bignum: Any - -def size(N): ... -def getRandomNumber(N, randfunc: Optional[Any] = ...): ... -def getRandomInteger(N, randfunc: Optional[Any] = ...): ... -def getRandomRange(a, b, randfunc: Optional[Any] = ...): ... -def getRandomNBitInteger(N, randfunc: Optional[Any] = ...): ... -def GCD(x, y): ... -def inverse(u, v): ... -def getPrime(N, randfunc: Optional[Any] = ...): ... -def getStrongPrime(N, e: int = ..., false_positive_prob: float = ..., randfunc: Optional[Any] = ...): ... -def isPrime(N, false_positive_prob: float = ..., randfunc: Optional[Any] = ...): ... -def long_to_bytes(n, blocksize: int = ...): ... -def bytes_to_long(s): ... -def long2str(n, blocksize: int = ...): ... -def str2long(s): ... - -sieve_base: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/randpool.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/randpool.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/randpool.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/randpool.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -from typing import Any, Optional - -__revision__: str - -class RandomPool: - bytes: Any - bits: Any - entropy: Any - def __init__(self, numbytes: int = ..., cipher: Optional[Any] = ..., hash: Optional[Any] = ..., file: Optional[Any] = ...) -> None: ... - def get_bytes(self, N): ... - def randomize(self, N: int = ...): ... - def stir(self, s: str = ...): ... - def stir_n(self, N: int = ...): ... - def add_event(self, s: str = ...): ... - def getBytes(self, N): ... - def addEvent(self, event, s: str = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/RFC1751.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/RFC1751.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/RFC1751.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/RFC1751.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -from typing import Any - -__revision__: str -binary: Any - -def key_to_english(key): ... -def english_to_key(s): ... - -wordlist: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/strxor.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/strxor.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/strxor.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/Crypto/Util/strxor.pyi 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -def strxor(*args, **kwargs): ... -def strxor_c(*args, **kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/fernet.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/fernet.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/fernet.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/fernet.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,16 @@ -from typing import List, Optional, Union, Text +from typing import List, Optional, Text, Union class InvalidToken(Exception): ... class Fernet(object): def __init__(self, key: Union[bytes, Text]) -> None: ... def decrypt(self, token: bytes, ttl: Optional[int] = ...) -> bytes: ... + # decrypt_at_time accepts None ttl at runtime but it's an implementtion detail and it doesn't really + # make sense for the client code to use it like that, so the parameter is typed as int as opposed to + # Optional[int]. + def decrypt_at_time(self, token: bytes, ttl: int, current_time: int) -> bytes: ... def encrypt(self, data: bytes) -> bytes: ... + def encrypt_at_time(self, data: bytes, current_time: int) -> bytes: ... def extract_timestamp(self, token: bytes) -> int: ... @classmethod def generate_key(cls) -> bytes: ... @@ -13,5 +18,8 @@ class MultiFernet(object): def __init__(self, fernets: List[Fernet]) -> None: ... def decrypt(self, token: bytes, ttl: Optional[int] = ...) -> bytes: ... + # See a note above on the typing of the ttl parameter. + def decrypt_at_time(self, token: bytes, ttl: int, current_time: int) -> bytes: ... def encrypt(self, data: bytes) -> bytes: ... + def encrypt_at_time(self, data: bytes, current_time: int) -> bytes: ... def rotate(self, msg: bytes) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dh.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dh.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dh.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dh.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -28,7 +28,7 @@ @property def q(self) -> int: ... def __init__(self, p: int, g: int, q: Optional[int]) -> None: ... - def parameters(self, backend: DHBackend) -> DHParameters: ... + def parameters(self, backend: Optional[DHBackend] = ...) -> DHParameters: ... class DHPrivateKey(metaclass=ABCMeta): key_size: int @@ -53,7 +53,7 @@ @property def x(self) -> int: ... def __init__(self, x: int, public_numbers: DHPublicNumbers) -> None: ... - def private_key(self, backend: DHBackend) -> DHPrivateKey: ... + def private_key(self, backend: Optional[DHBackend] = ...) -> DHPrivateKey: ... class DHPublicKey(metaclass=ABCMeta): @property @@ -74,4 +74,6 @@ @property def y(self) -> int: ... def __init__(self, y: int, parameter_numbers: DHParameterNumbers) -> None: ... - def public_key(self, backend: DHBackend) -> DHPublicKey: ... + def public_key(self, backend: Optional[DHBackend] = ...) -> DHPublicKey: ... + +def generate_parameters(generator: int, key_size: int, backend: Optional[DHBackend] = ...) -> DHParameters: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dsa.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dsa.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dsa.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/dsa.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,5 @@ from abc import ABCMeta, abstractmethod - -from typing import Union +from typing import Optional, Union from cryptography.hazmat.backends.interfaces import DSABackend from cryptography.hazmat.primitives.asymmetric import AsymmetricVerificationContext @@ -24,7 +23,7 @@ @property def g(self) -> int: ... def __init__(self, p: int, q: int, g: int) -> None: ... - def parameters(self, backend: DSABackend) -> DSAParameters: ... + def parameters(self, backend: Optional[DSABackend] = ...) -> DSAParameters: ... class DSAPrivateKey(metaclass=ABCMeta): @property @@ -61,8 +60,9 @@ @abstractmethod def public_numbers(self) -> DSAPublicNumbers: ... @abstractmethod - def verifier(self, signature: bytes, - signature_algorithm: Union[HashAlgorithm, Prehashed]) -> AsymmetricVerificationContext: ... + def verifier( + self, signature: bytes, signature_algorithm: Union[HashAlgorithm, Prehashed] + ) -> AsymmetricVerificationContext: ... @abstractmethod def verify(self, signature: bytes, data: bytes, algorithm: Union[HashAlgorithm, Prehashed]) -> None: ... @@ -75,5 +75,5 @@ def parameter_numbers(self) -> DSAParameterNumbers: ... def __init__(self, y: int, parameter_numbers: DSAParameterNumbers) -> None: ... -def generate_parameters(key_size: int, backend: DSABackend) -> DSAParameters: ... -def generate_private_key(key_size: int, backend: DSABackend) -> DSAPrivateKey: ... +def generate_parameters(key_size: int, backend: Optional[DSABackend] = ...) -> DSAParameters: ... +def generate_private_key(key_size: int, backend: Optional[DSABackend] = ...) -> DSAPrivateKey: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/ec.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/ec.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/ec.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/ec.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,9 @@ from abc import ABCMeta, abstractmethod -from typing import ClassVar, Union +from typing import ClassVar, Optional, Union from cryptography.hazmat.backends.interfaces import EllipticCurveBackend -from cryptography.hazmat.primitives.asymmetric.utils import Prehashed from cryptography.hazmat.primitives.asymmetric import AsymmetricVerificationContext +from cryptography.hazmat.primitives.asymmetric.utils import Prehashed from cryptography.hazmat.primitives.hashes import HashAlgorithm from cryptography.hazmat.primitives.serialization import Encoding, KeySerializationEncryption, PrivateFormat, PublicFormat from cryptography.x509 import ObjectIdentifier @@ -141,7 +141,7 @@ @property def public_numbers(self) -> EllipticCurvePublicNumbers: ... def __init__(self, private_value: int, public_numbers: EllipticCurvePublicNumbers) -> None: ... - def private_key(self, backend: EllipticCurveBackend) -> EllipticCurvePrivateKey: ... + def private_key(self, backend: Optional[EllipticCurveBackend] = ...) -> EllipticCurvePrivateKey: ... class EllipticCurvePublicKey(metaclass=ABCMeta): @property @@ -157,7 +157,9 @@ @abstractmethod def public_numbers(self) -> EllipticCurvePublicNumbers: ... @abstractmethod - def verifier(self, signature: bytes, signature_algorithm: EllipticCurveSignatureAlgorithm) -> AsymmetricVerificationContext: ... + def verifier( + self, signature: bytes, signature_algorithm: EllipticCurveSignatureAlgorithm + ) -> AsymmetricVerificationContext: ... @abstractmethod def verify(self, signature: bytes, data: bytes, signature_algorithm: EllipticCurveSignatureAlgorithm) -> None: ... @@ -173,7 +175,7 @@ def __init__(self, x: int, y: int, curve: EllipticCurve) -> None: ... @classmethod def from_encoded_point(cls, curve: EllipticCurve, data: bytes) -> EllipticCurvePublicNumbers: ... - def public_key(self, backend: EllipticCurveBackend) -> EllipticCurvePublicKey: ... + def public_key(self, backend: Optional[EllipticCurveBackend] = ...) -> EllipticCurvePublicKey: ... class EllipticCurveSignatureAlgorithm(metaclass=ABCMeta): @property @@ -187,6 +189,8 @@ @property def algorithm(self) -> Union[HashAlgorithm, Prehashed]: ... -def derive_private_key(private_value: int, curve: EllipticCurve, backend: EllipticCurveBackend) -> EllipticCurvePrivateKey: ... -def generate_private_key(curve: EllipticCurve, backend: EllipticCurveBackend) -> EllipticCurvePrivateKey: ... +def derive_private_key( + private_value: int, curve: EllipticCurve, backend: Optional[EllipticCurveBackend] = ... +) -> EllipticCurvePrivateKey: ... +def generate_private_key(curve: EllipticCurve, backend: Optional[EllipticCurveBackend] = ...) -> EllipticCurvePrivateKey: ... def get_curve_for_oid(oid: ObjectIdentifier) -> EllipticCurve: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/rsa.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/rsa.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/rsa.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/rsa.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ from abc import ABCMeta, abstractmethod -from typing import Tuple, Union +from typing import Optional, Tuple, Union from cryptography.hazmat.backends.interfaces import RSABackend from cryptography.hazmat.primitives.asymmetric import AsymmetricVerificationContext @@ -38,15 +38,19 @@ @abstractmethod def public_numbers(self) -> RSAPublicNumbers: ... @abstractmethod - def verifier(self, signature: bytes, padding: AsymmetricPadding, - algorithm: Union[HashAlgorithm, Prehashed]) -> AsymmetricVerificationContext: ... - @abstractmethod - def verify(self, signature: bytes, data: bytes, padding: AsymmetricPadding, - algorithm: Union[HashAlgorithm, Prehashed]) -> None: ... + def verifier( + self, signature: bytes, padding: AsymmetricPadding, algorithm: Union[HashAlgorithm, Prehashed] + ) -> AsymmetricVerificationContext: ... + @abstractmethod + def verify( + self, signature: bytes, data: bytes, padding: AsymmetricPadding, algorithm: Union[HashAlgorithm, Prehashed] + ) -> None: ... RSAPublicKeyWithSerialization = RSAPublicKey -def generate_private_key(public_exponent: int, key_size: int, backend: RSABackend) -> RSAPrivateKeyWithSerialization: ... +def generate_private_key( + public_exponent: int, key_size: int, backend: Optional[RSABackend] = ... +) -> RSAPrivateKeyWithSerialization: ... def rsa_crt_iqmp(p: int, q: int) -> int: ... def rsa_crt_dmp1(private_exponent: int, p: int) -> int: ... def rsa_crt_dmq1(private_exponent: int, q: int) -> int: ... @@ -68,7 +72,7 @@ def iqmp(self) -> int: ... @property def public_numbers(self) -> RSAPublicNumbers: ... - def private_key(self, backend) -> RSAPrivateKey: ... + def private_key(self, backend: Optional[RSABackend] = ...) -> RSAPrivateKey: ... class RSAPublicNumbers(object): def __init__(self, e: int, n: int) -> None: ... @@ -76,4 +80,4 @@ def e(self) -> int: ... @property def n(self) -> int: ... - def public_key(self, backend) -> RSAPublicKey: ... + def public_key(self, backend: Optional[RSABackend] = ...) -> RSAPublicKey: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/utils.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/asymmetric/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,12 @@ -from typing import Optional, Tuple -from cryptography.hazmat.primitives.hashes import HashAlgorithm +from typing import Tuple +from cryptography.hazmat.primitives.hashes import HashAlgorithm def decode_dss_signature(signature: bytes) -> Tuple[int, int]: ... - - def encode_dss_signature(r: int, s: int) -> bytes: ... - class Prehashed(object): - _algorithm: HashAlgorithm # undocumented - _digest_size: int # undocumented + _algorithm: HashAlgorithm # undocumented + _digest_size: int # undocumented def __init__(self, algorithm: HashAlgorithm) -> None: ... - digest_size: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/algorithms.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/algorithms.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/algorithms.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/algorithms.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,8 @@ +from typing import FrozenSet + from cryptography.hazmat.primitives.ciphers import BlockCipherAlgorithm, CipherAlgorithm from cryptography.hazmat.primitives.ciphers.modes import ModeWithNonce -from typing import FrozenSet - class AES(BlockCipherAlgorithm, CipherAlgorithm): def __init__(self, key: bytes) -> None: ... block_size: int = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/ciphers/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -23,7 +23,7 @@ def block_size(self) -> int: ... class Cipher(object): - def __init__(self, algorithm: CipherAlgorithm, mode: Optional[Mode], backend: CipherBackend) -> None: ... + def __init__(self, algorithm: CipherAlgorithm, mode: Optional[Mode], backend: Optional[CipherBackend] = ...) -> None: ... def decryptor(self) -> CipherContext: ... def encryptor(self) -> CipherContext: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/cmac.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/cmac.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/cmac.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/cmac.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,10 @@ +from typing import Optional + from cryptography.hazmat.backends.interfaces import CMACBackend from cryptography.hazmat.primitives.ciphers import BlockCipherAlgorithm class CMAC(object): - def __init__(self, algorithm: BlockCipherAlgorithm, backend: CMACBackend) -> None: ... + def __init__(self, algorithm: BlockCipherAlgorithm, backend: Optional[CMACBackend] = ...) -> None: ... def copy(self) -> CMAC: ... def finalize(self) -> bytes: ... def update(self, data: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hashes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hashes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hashes.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hashes.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from abc import ABCMeta, abstractmethod +from typing import Optional from cryptography.hazmat.backends.interfaces import HashBackend @@ -37,7 +38,7 @@ def __init__(self, digest_size: int) -> None: ... class Hash(HashContext): - def __init__(self, algorithm: HashAlgorithm, backend: HashBackend): ... + def __init__(self, algorithm: HashAlgorithm, backend: Optional[HashBackend] = ...): ... def copy(self) -> Hash: ... def finalize(self) -> bytes: ... def update(self, data: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hmac.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hmac.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hmac.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/hmac.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,10 @@ +from typing import Optional + from cryptography.hazmat.backends.interfaces import HMACBackend from cryptography.hazmat.primitives.hashes import HashAlgorithm class HMAC(object): - def __init__(self, key: bytes, algorithm: HashAlgorithm, backend: HMACBackend) -> None: ... + def __init__(self, key: bytes, algorithm: HashAlgorithm, backend: Optional[HMACBackend] = ...) -> None: ... def copy(self) -> HMAC: ... def finalize(self) -> bytes: ... def update(self, msg: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/concatkdf.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/concatkdf.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/concatkdf.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/concatkdf.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -5,13 +5,20 @@ from cryptography.hazmat.primitives.kdf import KeyDerivationFunction class ConcatKDFHash(KeyDerivationFunction): - def __init__(self, algorithm: HashAlgorithm, length: int, otherinfo: Optional[bytes], backend: HashBackend): ... + def __init__( + self, algorithm: HashAlgorithm, length: int, otherinfo: Optional[bytes], backend: Optional[HashBackend] = ... + ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... class ConcatKDFHMAC(KeyDerivationFunction): def __init__( - self, algorithm: HashAlgorithm, length: int, salt: Optional[bytes], otherinfo: Optional[bytes], backend: HMACBackend + self, + algorithm: HashAlgorithm, + length: int, + salt: Optional[bytes], + otherinfo: Optional[bytes], + backend: Optional[HMACBackend] = ..., ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/hkdf.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/hkdf.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/hkdf.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/hkdf.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -6,12 +6,17 @@ class HKDF(KeyDerivationFunction): def __init__( - self, algorithm: HashAlgorithm, length: int, salt: Optional[bytes], info: Optional[bytes], backend: HMACBackend + self, + algorithm: HashAlgorithm, + length: int, + salt: Optional[bytes], + info: Optional[bytes], + backend: Optional[HMACBackend] = ..., ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... class HKDFExpand(KeyDerivationFunction): - def __init__(self, algorithm: HashAlgorithm, length: int, info: Optional[bytes], backend: HMACBackend): ... + def __init__(self, algorithm: HashAlgorithm, length: int, info: Optional[bytes], backend: Optional[HMACBackend] = ...): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/kbkdf.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/kbkdf.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/kbkdf.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/kbkdf.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -24,7 +24,7 @@ label: Optional[bytes], context: Optional[bytes], fixed: Optional[bytes], - backend: HMACBackend, + backend: Optional[HMACBackend] = ..., ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/pbkdf2.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/pbkdf2.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/pbkdf2.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/pbkdf2.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,12 @@ +from typing import Optional + from cryptography.hazmat.backends.interfaces import PBKDF2HMACBackend from cryptography.hazmat.primitives.hashes import HashAlgorithm from cryptography.hazmat.primitives.kdf import KeyDerivationFunction class PBKDF2HMAC(KeyDerivationFunction): - def __init__(self, algorithm: HashAlgorithm, length: int, salt: bytes, iterations: int, backend: PBKDF2HMACBackend): ... + def __init__( + self, algorithm: HashAlgorithm, length: int, salt: bytes, iterations: int, backend: Optional[PBKDF2HMACBackend] = ... + ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/scrypt.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/scrypt.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/scrypt.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/scrypt.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,9 @@ +from typing import Optional + from cryptography.hazmat.backends.interfaces import ScryptBackend from cryptography.hazmat.primitives.kdf import KeyDerivationFunction class Scrypt(KeyDerivationFunction): - def __init__(self, salt: bytes, length: int, n: int, r: int, p: int, backend: ScryptBackend): ... + def __init__(self, salt: bytes, length: int, n: int, r: int, p: int, backend: Optional[ScryptBackend] = ...): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/x963kdf.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/x963kdf.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/x963kdf.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/kdf/x963kdf.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -5,6 +5,8 @@ from cryptography.hazmat.primitives.kdf import KeyDerivationFunction class X963KDF(KeyDerivationFunction): - def __init__(self, algorithm: HashAlgorithm, length: int, sharedinfo: Optional[bytes], backend: HashBackend): ... + def __init__( + self, algorithm: HashAlgorithm, length: int, sharedinfo: Optional[bytes], backend: Optional[HashBackend] = ... + ): ... def derive(self, key_material: bytes) -> bytes: ... def verify(self, key_material: bytes, expected_key: bytes) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/keywrap.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/keywrap.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/keywrap.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/keywrap.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,10 @@ +from typing import Optional + from cryptography.hazmat.backends.interfaces import CipherBackend -def aes_key_wrap(wrapping_key: bytes, key_to_wrap: bytes, backend: CipherBackend) -> bytes: ... -def aes_key_wrap_with_padding(wrapping_key: bytes, key_to_wrap: bytes, backend: CipherBackend) -> bytes: ... -def aes_key_unwrap(wrapping_key: bytes, wrapped_key: bytes, backend: CipherBackend) -> bytes: ... -def aes_key_unwrap_with_padding(wrapping_key: bytes, wrapped_key: bytes, backend: CipherBackend) -> bytes: ... +def aes_key_wrap(wrapping_key: bytes, key_to_wrap: bytes, backend: Optional[CipherBackend] = ...) -> bytes: ... +def aes_key_wrap_with_padding(wrapping_key: bytes, key_to_wrap: bytes, backend: Optional[CipherBackend] = ...) -> bytes: ... +def aes_key_unwrap(wrapping_key: bytes, wrapped_key: bytes, backend: Optional[CipherBackend] = ...) -> bytes: ... +def aes_key_unwrap_with_padding(wrapping_key: bytes, wrapped_key: bytes, backend: Optional[CipherBackend] = ...) -> bytes: ... class InvalidUnwrap(Exception): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/poly1305.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/poly1305.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/poly1305.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/poly1305.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -from cryptography.hazmat.backends.interfaces import HMACBackend -from cryptography.hazmat.primitives.hashes import HashAlgorithm - class Poly1305(object): def __init__(self, key: bytes) -> None: ... def finalize(self) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,10 +2,12 @@ from enum import Enum from typing import Optional -def load_pem_private_key(data: bytes, password: Optional[bytes], backend): ... -def load_pem_public_key(data: bytes, backend): ... -def load_der_private_key(data: bytes, password: Optional[bytes], backend): ... -def load_der_public_key(data: bytes, backend): ... +from cryptography.hazmat.backends.interfaces import DERSerializationBackend, PEMSerializationBackend + +def load_pem_private_key(data: bytes, password: Optional[bytes], backend: Optional[PEMSerializationBackend] = ...): ... +def load_pem_public_key(data: bytes, backend: Optional[PEMSerializationBackend] = ...): ... +def load_der_private_key(data: bytes, password: Optional[bytes], backend: Optional[DERSerializationBackend] = ...): ... +def load_der_public_key(data: bytes, backend: Optional[DERSerializationBackend] = ...): ... def load_ssh_public_key(data: bytes, backend): ... class Encoding(Enum): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,3 +1,3 @@ -from typing import Optional +from typing import Any, Optional -def load_key_and_certificates(data: bytes, password: Optional[bytes], backend): ... +def load_key_and_certificates(data: bytes, password: Optional[bytes], backend: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/x509.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/x509.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/x509.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/cryptography/x509.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod from enum import Enum from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network -from typing import Any, ClassVar, Generator, List, Optional, Union, Text, Iterable, Sequence, Type +from typing import Any, ClassVar, Generator, Generic, Iterable, List, Optional, Sequence, Text, Type, TypeVar, Union from cryptography.hazmat.backends.interfaces import X509Backend from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKey, DSAPublicKey @@ -14,8 +14,8 @@ from cryptography.hazmat.primitives.serialization import Encoding class ObjectIdentifier(object): + dotted_string: str def __init__(self, dotted_string: str) -> None: ... - def dotted_string(self) -> str: ... class CRLEntryExtensionOID(object): CERTIFICATE_ISSUER: ClassVar[ObjectIdentifier] @@ -114,7 +114,7 @@ def __iter__(self) -> Generator[NameAttribute, None, None]: ... def __len__(self) -> int: ... def get_attributes_for_oid(self, oid: ObjectIdentifier) -> List[NameAttribute]: ... - def public_bytes(self, backend: X509Backend) -> bytes: ... + def public_bytes(self, backend: Optional[X509Backend] = ...) -> bytes: ... def rfc4514_string(self) -> str: ... class Version(Enum): @@ -141,12 +141,16 @@ def public_key(self) -> Union[DSAPublicKey, Ed25519PublicKey, Ed448PublicKey, EllipticCurvePublicKey, RSAPublicKey]: ... class CertificateBuilder(object): - def __init__(self, issuer_name: Optional[Name] = ..., subject_name: Optional[Name] = ..., - public_key: Union[DSAPublicKey, Ed25519PublicKey, Ed448PublicKey, EllipticCurvePublicKey, RSAPublicKey, None] = ..., - serial_number: Optional[int] = ..., - not_valid_before: Optional[datetime.datetime] = ..., - not_valid_after: Optional[datetime.datetime] = ..., - extensions: Optional[Iterable[ExtensionType]] = ...) -> None: ... + def __init__( + self, + issuer_name: Optional[Name] = ..., + subject_name: Optional[Name] = ..., + public_key: Union[DSAPublicKey, Ed25519PublicKey, Ed448PublicKey, EllipticCurvePublicKey, RSAPublicKey, None] = ..., + serial_number: Optional[int] = ..., + not_valid_before: Optional[datetime.datetime] = ..., + not_valid_after: Optional[datetime.datetime] = ..., + extensions: Optional[Iterable[ExtensionType]] = ..., + ) -> None: ... def add_extension(self, extension: ExtensionType, critical: bool) -> CertificateBuilder: ... def issuer_name(self, name: Name) -> CertificateBuilder: ... def not_valid_after(self, time: datetime.datetime) -> CertificateBuilder: ... @@ -159,7 +163,7 @@ self, private_key: Union[DSAPrivateKey, Ed25519PrivateKey, Ed448PrivateKey, EllipticCurvePrivateKey, RSAPrivateKey], algorithm: Optional[HashAlgorithm], - backend: X509Backend, + backend: Optional[X509Backend] = ..., ) -> Certificate: ... def subject_name(self, name: Name) -> CertificateBuilder: ... @@ -193,7 +197,7 @@ self, private_key: Union[DSAPrivateKey, Ed25519PrivateKey, Ed448PrivateKey, EllipticCurvePrivateKey, RSAPrivateKey], algorithm: Optional[HashAlgorithm], - backend: X509Backend, + backend: Optional[X509Backend] = ..., ) -> CertificateRevocationList: ... class CertificateSigningRequest(metaclass=ABCMeta): @@ -216,7 +220,7 @@ self, private_key: Union[DSAPrivateKey, Ed25519PrivateKey, Ed448PrivateKey, EllipticCurvePrivateKey, RSAPrivateKey], algorithm: Optional[HashAlgorithm], - backend: X509Backend, + backend: Optional[X509Backend] = ..., ) -> CertificateSigningRequest: ... class RevokedCertificate(metaclass=ABCMeta): @@ -226,7 +230,7 @@ class RevokedCertificateBuilder(object): def add_extension(self, extension: ExtensionType, critical: bool) -> RevokedCertificateBuilder: ... - def build(self, backend: X509Backend) -> RevokedCertificate: ... + def build(self, backend: Optional[X509Backend] = ...) -> RevokedCertificate: ... def revocation_date(self, time: datetime.datetime) -> RevokedCertificateBuilder: ... def serial_number(self, serial_number: int) -> RevokedCertificateBuilder: ... @@ -266,19 +270,21 @@ # X.509 Extensions -class Extension(object): - critical: bool +class ExtensionType(metaclass=ABCMeta): oid: ExtensionOID - value: ExtensionType -class ExtensionType(metaclass=ABCMeta): +_T = TypeVar("_T", bound="ExtensionType") + +class Extension(Generic[_T]): + critical: bool oid: ExtensionOID + value: _T class Extensions(object): def __init__(self, general_names: List[Extension]) -> None: ... def __iter__(self) -> Generator[Extension, None, None]: ... def get_extension_for_oid(self, oid: ObjectIdentifier) -> Extension: ... - def get_extension_for_class(self, extclass: Type[ExtensionType]) -> Extension: ... + def get_extension_for_class(self, extclass: Type[_T]) -> Extension[_T]: ... class IssuerAlternativeName(ExtensionType): def __init__(self, general_names: List[GeneralName]) -> None: ... @@ -290,10 +296,10 @@ def __iter__(self) -> Generator[GeneralName, None, None]: ... def get_values_for_type(self, type: Type[GeneralName]) -> List[Any]: ... -def load_der_x509_certificate(data: bytes, backend: X509Backend) -> Certificate: ... -def load_pem_x509_certificate(data: bytes, backend: X509Backend) -> Certificate: ... -def load_der_x509_crl(data: bytes, backend: X509Backend) -> CertificateRevocationList: ... -def load_pem_x509_crl(data: bytes, backend: X509Backend) -> CertificateRevocationList: ... -def load_der_x509_csr(data: bytes, backend: X509Backend) -> CertificateSigningRequest: ... -def load_pem_x509_csr(data: bytes, backend: X509Backend) -> CertificateSigningRequest: ... +def load_der_x509_certificate(data: bytes, backend: Optional[X509Backend] = ...) -> Certificate: ... +def load_pem_x509_certificate(data: bytes, backend: Optional[X509Backend] = ...) -> Certificate: ... +def load_der_x509_crl(data: bytes, backend: Optional[X509Backend] = ...) -> CertificateRevocationList: ... +def load_pem_x509_crl(data: bytes, backend: Optional[X509Backend] = ...) -> CertificateRevocationList: ... +def load_der_x509_csr(data: bytes, backend: Optional[X509Backend] = ...) -> CertificateSigningRequest: ... +def load_pem_x509_csr(data: bytes, backend: Optional[X509Backend] = ...) -> CertificateSigningRequest: ... def __getattr__(name: str) -> Any: ... # incomplete diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/_common.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/_common.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/_common.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/_common.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -4,14 +4,9 @@ class weekday(object): def __init__(self, weekday: int, n: Optional[int] = ...) -> None: ... - def __call__(self: _T, n: int) -> _T: ... - def __eq__(self, other) -> bool: ... - def __repr__(self) -> str: ... - def __hash__(self) -> int: ... - weekday: int n: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/parser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/parser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/parser.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/parser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,8 @@ -from typing import List, Tuple, Optional, Callable, Union, IO, Any, Dict, Mapping, Text from datetime import datetime, tzinfo +from typing import IO, Any, Dict, List, Mapping, Optional, Text, Tuple, Union _FileOrStr = Union[bytes, Text, IO[str], IO[Any]] - class parserinfo(object): JUMP: List[str] WEEKDAYS: List[Tuple[str, str]] @@ -13,7 +12,6 @@ UTCZONE: List[str] PERTAIN: List[str] TZOFFSET: Dict[str, int] - def __init__(self, dayfirst: bool = ..., yearfirst: bool = ...) -> None: ... def jump(self, name: Text) -> bool: ... def weekday(self, name: Text) -> Optional[int]: ... @@ -28,15 +26,21 @@ class parser(object): def __init__(self, info: Optional[parserinfo] = ...) -> None: ... - def parse(self, timestr: _FileOrStr, - default: Optional[datetime] = ..., - ignoretz: bool = ..., tzinfos: Optional[Mapping[Text, tzinfo]] = ..., - **kwargs: Any) -> datetime: ... + def parse( + self, + timestr: _FileOrStr, + default: Optional[datetime] = ..., + ignoretz: bool = ..., + tzinfos: Optional[Mapping[Text, tzinfo]] = ..., + **kwargs: Any, + ) -> datetime: ... def isoparse(dt_str: Union[str, bytes, IO[str], IO[bytes]]) -> datetime: ... DEFAULTPARSER: parser + def parse(timestr: _FileOrStr, parserinfo: Optional[parserinfo] = ..., **kwargs: Any) -> datetime: ... + class _tzparser: ... DEFAULTTZPARSER: _tzparser @@ -44,3 +48,4 @@ class InvalidDatetimeError(ValueError): ... class InvalidDateError(InvalidDatetimeError): ... class InvalidTimeError(InvalidDatetimeError): ... +class ParserError(ValueError): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/relativedelta.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/relativedelta.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/relativedelta.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/relativedelta.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,10 @@ -from typing import overload, Any, List, Optional, SupportsFloat, TypeVar, Union from datetime import date, datetime, timedelta +from typing import Optional, SupportsFloat, TypeVar, Union, overload from ._common import weekday - -_SelfT = TypeVar('_SelfT', bound=relativedelta) -_DateT = TypeVar('_DateT', date, datetime) +_SelfT = TypeVar("_SelfT", bound=relativedelta) +_DateT = TypeVar("_DateT", date, datetime) # Work around attribute and type having the same name. _weekday = weekday @@ -17,7 +16,6 @@ SA: weekday SU: weekday - class relativedelta(object): years: int months: int @@ -35,22 +33,30 @@ minute: Optional[int] second: Optional[int] microsecond: Optional[int] - def __init__(self, - dt1: Optional[date] = ..., - dt2: Optional[date] = ..., - years: Optional[int] = ..., months: Optional[int] = ..., - days: Optional[int] = ..., leapdays: Optional[int] = ..., - weeks: Optional[int] = ..., - hours: Optional[int] = ..., minutes: Optional[int] = ..., - seconds: Optional[int] = ..., microseconds: Optional[int] = ..., - year: Optional[int] = ..., month: Optional[int] = ..., - day: Optional[int] = ..., - weekday: Optional[Union[int, _weekday]] = ..., - yearday: Optional[int] = ..., - nlyearday: Optional[int] = ..., - hour: Optional[int] = ..., minute: Optional[int] = ..., - second: Optional[int] = ..., - microsecond: Optional[int] = ...) -> None: ... + def __init__( + self, + dt1: Optional[date] = ..., + dt2: Optional[date] = ..., + years: Optional[int] = ..., + months: Optional[int] = ..., + days: Optional[int] = ..., + leapdays: Optional[int] = ..., + weeks: Optional[int] = ..., + hours: Optional[int] = ..., + minutes: Optional[int] = ..., + seconds: Optional[int] = ..., + microseconds: Optional[int] = ..., + year: Optional[int] = ..., + month: Optional[int] = ..., + day: Optional[int] = ..., + weekday: Optional[Union[int, _weekday]] = ..., + yearday: Optional[int] = ..., + nlyearday: Optional[int] = ..., + hour: Optional[int] = ..., + minute: Optional[int] = ..., + second: Optional[int] = ..., + microsecond: Optional[int] = ..., + ) -> None: ... @property def weeks(self) -> int: ... @weeks.setter diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/rrule.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/rrule.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/rrule.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/rrule.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,7 @@ -from ._common import weekday as weekdaybase -from typing import Any, Iterable, Optional, Union import datetime +from typing import Any, Iterable, Optional, Union + +from ._common import weekday as weekdaybase YEARLY: int MONTHLY: int @@ -10,8 +11,7 @@ MINUTELY: int SECONDLY: int -class weekday(weekdaybase): - ... +class weekday(weekdaybase): ... MO: weekday TU: weekday @@ -33,24 +33,26 @@ def between(self, after, before, inc: bool = ..., count: int = ...): ... class rrule(rrulebase): - def __init__(self, - freq, - dtstart: Optional[datetime.date] = ..., - interval: int = ..., - wkst: Optional[Union[weekday, int]] = ..., - count: Optional[int] = ..., - until: Optional[Union[datetime.date, int]] = ..., - bysetpos: Optional[Union[int, Iterable[int]]] = ..., - bymonth: Optional[Union[int, Iterable[int]]] = ..., - bymonthday: Optional[Union[int, Iterable[int]]] = ..., - byyearday: Optional[Union[int, Iterable[int]]] = ..., - byeaster: Optional[Union[int, Iterable[int]]] = ..., - byweekno: Optional[Union[int, Iterable[int]]] = ..., - byweekday: Optional[Union[int, weekday, Iterable[int], Iterable[weekday]]] = ..., - byhour: Optional[Union[int, Iterable[int]]] = ..., - byminute: Optional[Union[int, Iterable[int]]] = ..., - bysecond: Optional[Union[int, Iterable[int]]] = ..., - cache: bool = ...) -> None: ... + def __init__( + self, + freq, + dtstart: Optional[datetime.date] = ..., + interval: int = ..., + wkst: Optional[Union[weekday, int]] = ..., + count: Optional[int] = ..., + until: Optional[Union[datetime.date, int]] = ..., + bysetpos: Optional[Union[int, Iterable[int]]] = ..., + bymonth: Optional[Union[int, Iterable[int]]] = ..., + bymonthday: Optional[Union[int, Iterable[int]]] = ..., + byyearday: Optional[Union[int, Iterable[int]]] = ..., + byeaster: Optional[Union[int, Iterable[int]]] = ..., + byweekno: Optional[Union[int, Iterable[int]]] = ..., + byweekday: Optional[Union[int, weekday, Iterable[int], Iterable[weekday]]] = ..., + byhour: Optional[Union[int, Iterable[int]]] = ..., + byminute: Optional[Union[int, Iterable[int]]] = ..., + bysecond: Optional[Union[int, Iterable[int]]] = ..., + cache: bool = ..., + ) -> None: ... def replace(self, **kwargs): ... class _iterinfo: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/_common.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/_common.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/_common.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/_common.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ +from datetime import datetime, timedelta, tzinfo from typing import Any, Optional -from datetime import datetime, tzinfo, timedelta def tzname_in_python2(namefunc): ... def enfold(dt: datetime, fold: int = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,15 @@ from .tz import ( - tzutc as tzutc, - tzoffset as tzoffset, - tzlocal as tzlocal, + datetime_ambiguous as datetime_ambiguous, + datetime_exists as datetime_exists, + gettz as gettz, + resolve_imaginary as resolve_imaginary, tzfile as tzfile, + tzical as tzical, + tzlocal as tzlocal, + tzoffset as tzoffset, tzrange as tzrange, tzstr as tzstr, - tzical as tzical, - gettz as gettz, - datetime_exists as datetime_exists, - datetime_ambiguous as datetime_ambiguous, - resolve_imaginary as resolve_imaginary, + tzutc as tzutc, ) UTC: tzutc diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/tz.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/tz.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/tz.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/tz/tz.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,8 @@ -from typing import Any, Optional, Union, IO, Text, Tuple, List import datetime -from ._common import tzname_in_python2 as tzname_in_python2, _tzinfo as _tzinfo -from ._common import tzrangebase as tzrangebase, enfold as enfold +from typing import IO, Any, List, Optional, Text, Tuple, Union + from ..relativedelta import relativedelta +from ._common import _tzinfo as _tzinfo, enfold as enfold, tzname_in_python2 as tzname_in_python2, tzrangebase as tzrangebase _FileObj = Union[str, Text, IO[str], IO[Text]] @@ -30,7 +30,6 @@ __hash__: Any def __ne__(self, other): ... __reduce__: Any - @classmethod def instance(cls, name, offset) -> tzoffset: ... @@ -65,14 +64,21 @@ class tzrange(tzrangebase): hasdst: bool - def __init__(self, stdabbr: Text, stdoffset: Union[int, datetime.timedelta, None] = ..., dstabbr: Optional[Text] = ..., dstoffset: Union[int, datetime.timedelta, None] = ..., start: Optional[relativedelta] = ..., end: Optional[relativedelta] = ...) -> None: ... + def __init__( + self, + stdabbr: Text, + stdoffset: Union[int, datetime.timedelta, None] = ..., + dstabbr: Optional[Text] = ..., + dstoffset: Union[int, datetime.timedelta, None] = ..., + start: Optional[relativedelta] = ..., + end: Optional[relativedelta] = ..., + ) -> None: ... def transitions(self, year: int) -> Tuple[datetime.datetime, datetime.datetime]: ... def __eq__(self, other): ... class tzstr(tzrange): hasdst: bool def __init__(self, s: Union[bytes, _FileObj], posix_offset: bool = ...) -> None: ... - @classmethod def instance(cls, name, offset) -> tzoffset: ... @@ -88,7 +94,6 @@ def datetime_ambiguous(dt: datetime.datetime, tz: Optional[datetime.tzinfo] = ...) -> bool: ... def resolve_imaginary(dt: datetime.datetime) -> datetime.datetime: ... - class _GetTZ: def __call__(self, name: Optional[Text] = ...) -> Optional[datetime.tzinfo]: ... def nocache(self, name: Optional[Text]) -> Optional[datetime.tzinfo]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/utils.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/dateutil/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,5 @@ +from datetime import datetime, timedelta, tzinfo from typing import Optional -from datetime import datetime, tzinfo, timedelta - def default_tzinfo(dt: datetime, tzinfo: tzinfo) -> datetime: ... def today(tzinfo: Optional[tzinfo] = ...) -> datetime: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/classic.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/classic.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/classic.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/classic.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,21 @@ +from typing import Any, Callable, Optional, Type, TypeVar, overload + +_F = TypeVar("_F", bound=Callable[..., Any]) + +class ClassicAdapter: + reason: str + version: str + action: Optional[str] + category: Type[DeprecationWarning] + def __init__( + self, reason: str = ..., version: str = ..., action: Optional[str] = ..., category: Type[DeprecationWarning] = ... + ) -> None: ... + def get_deprecated_msg(self, wrapped: Callable[..., Any], instance: object) -> str: ... + def __call__(self, wrapped: _F) -> Callable[[_F], _F]: ... + +@overload +def deprecated(__wrapped: _F) -> _F: ... +@overload +def deprecated( + reason: str = ..., *, version: str = ..., action: Optional[str] = ..., category: Optional[Type[DeprecationWarning]] = ... +) -> Callable[[_F], _F]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .classic import deprecated as deprecated diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/sphinx.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/sphinx.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/sphinx.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/deprecated/sphinx.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,31 @@ +from typing import Any, Callable, Optional, Type, TypeVar, overload +from typing_extensions import Literal + +from .classic import ClassicAdapter + +_F = TypeVar("_F", bound=Callable[..., Any]) + +class SphinxAdapter(ClassicAdapter): + directive: Literal["versionadded", "versionchanged", "deprecated"] + reason: str + version: str + action: Optional[str] + category: Type[DeprecationWarning] + def __init__( + self, + directive: Literal["versionadded", "versionchanged", "deprecated"], + reason: str = ..., + version: str = ..., + action: Optional[str] = ..., + category: Type[DeprecationWarning] = ..., + ) -> None: ... + def __call__(self, wrapped: _F) -> Callable[[_F], _F]: ... + +def versionadded(reason: str = ..., version: str = ...) -> Callable[[_F], _F]: ... +def versionchanged(reason: str = ..., version: str = ...) -> Callable[[_F], _F]: ... +@overload +def deprecated(__wrapped: _F) -> _F: ... +@overload +def deprecated( + reason: str = ..., *, version: str = ..., action: Optional[str] = ..., category: Optional[Type[DeprecationWarning]] = ... +) -> Callable[[_F], _F]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/gflags.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/gflags.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/gflags.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/gflags.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,19 @@ -from typing import Any, Callable, Dict, Iterable, IO, List, Optional, Sequence, Text, Union from types import ModuleType +from typing import IO, Any, Callable, Dict, Iterable, List, Optional, Sequence, Text, Union class Error(Exception): ... + FlagsError = Error class DuplicateFlag(FlagsError): ... - class CantOpenFlagFileError(FlagsError): ... - class DuplicateFlagCannotPropagateNoneToSwig(DuplicateFlag): ... class DuplicateFlagError(DuplicateFlag): def __init__(self, flagname: str, flag_values: FlagValues, other_flag_values: FlagValues = ...) -> None: ... class IllegalFlagValueError(FlagsError): ... + IllegalFlagValue = IllegalFlagValueError class UnrecognizedFlag(FlagsError): ... @@ -22,11 +22,15 @@ def __init__(self, flagname: str, flagvalue: str = ...) -> None: ... def get_help_width() -> int: ... + GetHelpWidth = get_help_width -def CutCommonSpacePrefix(text) -> str: ... + def text_wrap(text: str, length: int = ..., indent: str = ..., firstline_indent: str = ..., tabs: str = ...) -> str: ... + TextWrap = text_wrap + def doc_to_help(doc: str) -> str: ... + DocToHelp = doc_to_help class FlagValues: @@ -53,7 +57,7 @@ def __setitem__(self, name: str, flag: Flag) -> None: ... def __getitem__(self, name: str) -> Flag: ... def __getattr__(self, name: str) -> Any: ... - def __setattr__(self, name: str, value: Any): ... + def __setattr__(self, name: str, value: Any) -> None: ... def __delattr__(self, flag_name: str) -> None: ... def set_default(self, name: str, value: Any) -> None: ... SetDefault = set_default @@ -102,10 +106,17 @@ parser: ArgumentParser serializer: ArgumentSerializer allow_override = False - - def __init__(self, parser: ArgumentParser, serializer: ArgumentSerializer, name: str, - default: Optional[str], help_string: str, short_name: str = ..., boolean: bool = ..., - allow_override: bool = ...) -> None: ... + def __init__( + self, + parser: ArgumentParser, + serializer: ArgumentSerializer, + name: str, + default: Optional[str], + help_string: str, + short_name: str = ..., + boolean: bool = ..., + allow_override: bool = ..., + ) -> None: ... def Parse(self, argument: Any) -> Any: ... def Unparse(self) -> None: ... def Serialize(self) -> str: ... @@ -129,34 +140,50 @@ def __init__(self, list_sep: str) -> None: ... def Serialize(self, value: List[Any]) -> str: ... -def register_validator(flag_name: str, - checker: Callable[[Any], bool], - message: str = ..., - flag_values: FlagValues = ...) -> None: ... +def register_validator( + flag_name: str, checker: Callable[[Any], bool], message: str = ..., flag_values: FlagValues = ... +) -> None: ... + RegisterValidator = register_validator + def mark_flag_as_required(flag_name: str, flag_values: FlagValues = ...) -> None: ... + MarkFlagAsRequired = mark_flag_as_required + def mark_flags_as_required(flag_names: Iterable[str], flag_values: FlagValues = ...) -> None: ... + MarkFlagsAsRequired = mark_flags_as_required -def mark_flags_as_mutual_exclusive(flag_names: Iterable[str], required: bool = ..., - flag_values: FlagValues = ...) -> None: ... + +def mark_flags_as_mutual_exclusive(flag_names: Iterable[str], required: bool = ..., flag_values: FlagValues = ...) -> None: ... + MarkFlagsAsMutualExclusive = mark_flags_as_mutual_exclusive -def DEFINE(parser: ArgumentParser, name: str, default: Any, help: str, - flag_values: FlagValues = ..., serializer: ArgumentSerializer = ..., **args: Any) -> None: ... +def DEFINE( + parser: ArgumentParser, + name: str, + default: Any, + help: str, + flag_values: FlagValues = ..., + serializer: ArgumentSerializer = ..., + **args: Any, +) -> None: ... def DEFINE_flag(flag: Flag, flag_values: FlagValues = ...) -> None: ... def declare_key_flag(flag_name: str, flag_values: FlagValues = ...) -> None: ... + DECLARE_key_flag = declare_key_flag + def adopt_module_key_flags(module: ModuleType, flag_values: FlagValues = ...) -> None: ... + ADOPT_module_key_flags = adopt_module_key_flags -def DEFINE_string(name: str, default: Optional[str], help: str, flag_values: FlagValues = ..., **args: Any): ... + +def DEFINE_string(name: str, default: Optional[str], help: str, flag_values: FlagValues = ..., **args: Any) -> None: ... class BooleanParser(ArgumentParser): def Convert(self, argument: Any) -> bool: ... def Parse(self, argument: Any) -> bool: ... class BooleanFlag(Flag): - def __init__(self, name: str, default: Optional[bool], help: str, short_name=..., **args: Any) -> None: ... + def __init__(self, name: str, default: Optional[bool], help: str, short_name: str = ..., **args: Any) -> None: ... def DEFINE_boolean(name: str, default: Optional[bool], help: str, flag_values: FlagValues = ..., **args: Any) -> None: ... @@ -187,8 +214,15 @@ def __init__(self, lower_bound: float = ..., upper_bound: float = ...) -> None: ... def Convert(self, argument: Any) -> float: ... -def DEFINE_float(name: str, default: Optional[float], help: str, lower_bound: float = ..., - upper_bound: float = ..., flag_values: FlagValues = ..., **args: Any) -> None: ... +def DEFINE_float( + name: str, + default: Optional[float], + help: str, + lower_bound: float = ..., + upper_bound: float = ..., + flag_values: FlagValues = ..., + **args: Any, +) -> None: ... class IntegerParser(NumericParser): number_article: str @@ -197,19 +231,28 @@ def __init__(self, lower_bound: int = ..., upper_bound: int = ...) -> None: ... def Convert(self, argument: Any) -> int: ... -def DEFINE_integer(name: str, default: Optional[int], help: str, lower_bound: int = ..., - upper_bound: int = ..., flag_values: FlagValues = ..., **args: Any) -> None: ... +def DEFINE_integer( + name: str, + default: Optional[int], + help: str, + lower_bound: int = ..., + upper_bound: int = ..., + flag_values: FlagValues = ..., + **args: Any, +) -> None: ... class EnumParser(ArgumentParser): def __init__(self, enum_values: List[str]) -> None: ... def Parse(self, argument: Any) -> Any: ... class EnumFlag(Flag): - def __init__(self, name: str, default: Optional[str], help: str, enum_values: List[str], - short_name: str, **args: Any) -> None: ... - -def DEFINE_enum(name: str, default: Optional[str], enum_values: Iterable[str], help: str, - flag_values: FlagValues = ..., **args: Any) -> None: ... + def __init__( + self, name: str, default: Optional[str], help: str, enum_values: List[str], short_name: str, **args: Any + ) -> None: ... + +def DEFINE_enum( + name: str, default: Optional[str], enum_values: Iterable[str], help: str, flag_values: FlagValues = ..., **args: Any +) -> None: ... class BaseListParser(ArgumentParser): def __init__(self, token: str = ..., name: str = ...) -> None: ... @@ -217,33 +260,53 @@ class ListParser(BaseListParser): def __init__(self) -> None: ... - def WriteCustomInfoInXMLFormat(self, outfile: IO[str], indent: str): ... class WhitespaceSeparatedListParser(BaseListParser): def __init__(self) -> None: ... - def WriteCustomInfoInXMLFormat(self, outfile: IO[str], indent: str): ... def DEFINE_list(name: str, default: Optional[List[str]], help: str, flag_values: FlagValues = ..., **args: Any) -> None: ... -def DEFINE_spaceseplist(name: str, default: Optional[List[str]], help: str, flag_values: FlagValues = ..., - **args: Any) -> None: ... +def DEFINE_spaceseplist( + name: str, default: Optional[List[str]], help: str, flag_values: FlagValues = ..., **args: Any +) -> None: ... class MultiFlag(Flag): def __init__(self, *args: Any, **kwargs: Any) -> None: ... def Parse(self, arguments: Any) -> None: ... def Serialize(self) -> str: ... -def DEFINE_multi_string(name: str, default: Optional[Union[str, List[str]]], help: str, - flag_values: FlagValues = ..., **args: Any) -> None: ... +def DEFINE_multi_string( + name: str, default: Optional[Union[str, List[str]]], help: str, flag_values: FlagValues = ..., **args: Any +) -> None: ... + DEFINE_multistring = DEFINE_multi_string -def DEFINE_multi_integer(name: str, default: Optional[Union[int, List[int]]], help: str, lower_bound: int = ..., - upper_bound: int = ..., flag_values: FlagValues = ..., **args: Any) -> None: ... +def DEFINE_multi_integer( + name: str, + default: Optional[Union[int, List[int]]], + help: str, + lower_bound: int = ..., + upper_bound: int = ..., + flag_values: FlagValues = ..., + **args: Any, +) -> None: ... + DEFINE_multi_int = DEFINE_multi_integer -def DEFINE_multi_float(name: str, default: Optional[Union[float, List[float]]], help: str, - lower_bound: float = ..., upper_bound: float = ..., - flag_values: FlagValues = ..., **args: Any) -> None: ... - -def DEFINE_multi_enum(name: str, default: Optional[Union[Sequence[str], str]], - enum_values: Sequence[str], help: str, - flag_values: FlagValues = ..., case_sensitive: bool = ..., **args: Any): ... +def DEFINE_multi_float( + name: str, + default: Optional[Union[float, List[float]]], + help: str, + lower_bound: float = ..., + upper_bound: float = ..., + flag_values: FlagValues = ..., + **args: Any, +) -> None: ... +def DEFINE_multi_enum( + name: str, + default: Optional[Union[Sequence[str], str]], + enum_values: Sequence[str], + help: str, + flag_values: FlagValues = ..., + case_sensitive: bool = ..., + **args: Any, +) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockparser.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockparser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,18 @@ +from typing import Any + +class State(list): + def set(self, state) -> None: ... + def reset(self) -> None: ... + def isstate(self, state): ... + +class BlockParser: + blockprocessors: Any + state: Any + md: Any + def __init__(self, md) -> None: ... + @property + def markdown(self): ... + root: Any + def parseDocument(self, lines): ... + def parseChunk(self, parent, text) -> None: ... + def parseBlocks(self, parent, blocks) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockprocessors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockprocessors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockprocessors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/blockprocessors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,78 @@ +from typing import Any, Pattern + +logger: Any + +def build_block_parser(md, **kwargs): ... + +class BlockProcessor: + parser: Any + tab_length: Any + def __init__(self, parser) -> None: ... + def lastChild(self, parent): ... + def detab(self, text): ... + def looseDetab(self, text, level: int = ...): ... + def test(self, parent, block) -> None: ... + def run(self, parent, blocks) -> None: ... + +class ListIndentProcessor(BlockProcessor): + ITEM_TYPES: Any + LIST_TYPES: Any + INDENT_RE: Pattern + def __init__(self, *args) -> None: ... + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + def create_item(self, parent, block) -> None: ... + def get_level(self, parent, block): ... + +class CodeBlockProcessor(BlockProcessor): + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class BlockQuoteProcessor(BlockProcessor): + RE: Pattern + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + def clean(self, line): ... + +class OListProcessor(BlockProcessor): + TAG: str = ... + STARTSWITH: str = ... + LAZY_OL: bool = ... + SIBLING_TAGS: Any + RE: Pattern + CHILD_RE: Pattern + INDENT_RE: Pattern + def __init__(self, parser) -> None: ... + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + def get_items(self, block): ... + +class UListProcessor(OListProcessor): + TAG: str = ... + RE: Pattern + def __init__(self, parser) -> None: ... + +class HashHeaderProcessor(BlockProcessor): + RE: Pattern + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class SetextHeaderProcessor(BlockProcessor): + RE: Pattern + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class HRProcessor(BlockProcessor): + RE: str = ... + SEARCH_RE: Pattern + match: Any + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class EmptyBlockProcessor(BlockProcessor): + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class ParagraphProcessor(BlockProcessor): + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/core.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/core.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/core.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/core.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,54 @@ +from typing import Any, BinaryIO, Mapping, Optional, Sequence, Text, TextIO, Union +from typing_extensions import Literal + +from .extensions import Extension +from .util import Registry + +class Markdown: + preprocessors: Registry + inlinePatterns: Registry + treeprocessors: Registry + postprocessors: Registry + def __init__( + self, + *, + extensions: Optional[Sequence[Union[str, Extension]]] = ..., + extension_configs: Optional[Mapping[str, Mapping[str, Any]]] = ..., + output_format: Optional[Literal["xhtml", "html"]] = ..., + tab_length: Optional[int] = ..., + ) -> None: ... + def build_parser(self) -> Markdown: ... + def registerExtensions( + self, extensions: Sequence[Union[Extension, str]], configs: Mapping[str, Mapping[str, Any]] + ) -> Markdown: ... + def build_extension(self, ext_name: Text, configs: Mapping[str, str]) -> Extension: ... + def registerExtension(self, extension: Extension) -> Markdown: ... + def reset(self: Markdown) -> Markdown: ... + def set_output_format(self, format: Literal["xhtml", "html"]) -> Markdown: ... + def is_block_level(self, tag: str) -> bool: ... + def convert(self, source: Text) -> Text: ... + def convertFile( + self, + input: Optional[Union[str, TextIO, BinaryIO]] = ..., + output: Optional[Union[str, TextIO, BinaryIO]] = ..., + encoding: Optional[str] = ..., + ) -> Markdown: ... + +def markdown( + text: Text, + *, + extensions: Optional[Sequence[Union[str, Extension]]] = ..., + extension_configs: Optional[Mapping[str, Mapping[str, Any]]] = ..., + output_format: Optional[Literal["xhtml", "html"]] = ..., + tab_length: Optional[int] = ..., +) -> Text: ... +def markdownFromFile( + *, + input: Optional[Union[str, TextIO, BinaryIO]] = ..., + output: Optional[Union[str, TextIO, BinaryIO]] = ..., + encoding: Optional[str] = ..., + extensions: Optional[Sequence[Union[str, Extension]]] = ..., + extension_configs: Optional[Mapping[str, Mapping[str, Any]]] = ..., + output_format: Optional[Literal["xhtml", "html"]] = ..., + tab_length: Optional[int] = ..., +) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/abbr.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/abbr.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/abbr.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/abbr.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.inlinepatterns import InlineProcessor +from markdown.preprocessors import Preprocessor + +ABBR_REF_RE: Pattern + +class AbbrExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +class AbbrPreprocessor(Preprocessor): + def run(self, lines): ... + +class AbbrInlineProcessor(InlineProcessor): + title: Any + def __init__(self, pattern, title) -> None: ... + def handleMatch(self, m, data): ... # type: ignore + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/admonition.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/admonition.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/admonition.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/admonition.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,18 @@ +from typing import Any, Pattern + +from markdown.blockprocessors import BlockProcessor +from markdown.extensions import Extension + +class AdmonitionExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +class AdmonitionProcessor(BlockProcessor): + CLASSNAME: str = ... + CLASSNAME_TITLE: str = ... + RE: Pattern + RE_SPACES: Any + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + def get_class_and_title(self, match): ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/attr_list.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/attr_list.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/attr_list.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/attr_list.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,22 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.treeprocessors import Treeprocessor + +def get_attrs(str): ... +def isheader(elem): ... + +class AttrListTreeprocessor(Treeprocessor): + BASE_RE: str = ... + HEADER_RE: Pattern + BLOCK_RE: Pattern + INLINE_RE: Pattern + NAME_RE: Pattern + def run(self, doc) -> None: ... + def assign_attrs(self, elem, attrs) -> None: ... + def sanitize_name(self, name): ... + +class AttrListExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/codehilite.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/codehilite.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/codehilite.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/codehilite.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,45 @@ +from typing import Any, Optional + +from markdown.extensions import Extension +from markdown.treeprocessors import Treeprocessor + +pygments: bool + +def parse_hl_lines(expr): ... + +class CodeHilite: + src: Any + lang: Any + linenums: Any + guess_lang: Any + css_class: Any + style: Any + noclasses: Any + tab_length: Any + hl_lines: Any + use_pygments: Any + def __init__( + self, + src: Optional[Any] = ..., + linenums: Optional[Any] = ..., + guess_lang: bool = ..., + css_class: str = ..., + lang: Optional[Any] = ..., + style: str = ..., + noclasses: bool = ..., + tab_length: int = ..., + hl_lines: Optional[Any] = ..., + use_pygments: bool = ..., + ) -> None: ... + def hilite(self): ... + +class HiliteTreeprocessor(Treeprocessor): + def code_unescape(self, text): ... + def run(self, root) -> None: ... + +class CodeHiliteExtension(Extension): + config: Any + def __init__(self, **kwargs) -> None: ... + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/def_list.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/def_list.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/def_list.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/def_list.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Any, Pattern + +from markdown.blockprocessors import BlockProcessor, ListIndentProcessor +from markdown.extensions import Extension + +class DefListProcessor(BlockProcessor): + RE: Pattern + NO_INDENT_RE: Pattern + def test(self, parent, block): ... + def run(self, parent, blocks): ... + +class DefListIndentProcessor(ListIndentProcessor): + ITEM_TYPES: Any + LIST_TYPES: Any + def create_item(self, parent, block) -> None: ... + +class DefListExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/extra.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/extra.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/extra.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/extra.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,12 @@ +from typing import Any + +from markdown.extensions import Extension + +extensions: Any + +class ExtraExtension(Extension): + config: Any + def __init__(self, **kwargs) -> None: ... + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/fenced_code.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/fenced_code.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/fenced_code.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/fenced_code.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,18 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.preprocessors import Preprocessor + +class FencedCodeExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +class FencedBlockPreprocessor(Preprocessor): + FENCED_BLOCK_RE: Pattern + CODE_WRAP: str = ... + LANG_TAG: str = ... + checked_for_codehilite: bool = ... + codehilite_conf: Any + def __init__(self, md) -> None: ... + def run(self, lines): ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/footnotes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/footnotes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/footnotes.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/footnotes.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,64 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.inlinepatterns import InlineProcessor +from markdown.postprocessors import Postprocessor +from markdown.preprocessors import Preprocessor +from markdown.treeprocessors import Treeprocessor + +FN_BACKLINK_TEXT: Any +NBSP_PLACEHOLDER: Any +DEF_RE: Pattern +TABBED_RE: Pattern +RE_REF_ID: Any + +class FootnoteExtension(Extension): + config: Any + unique_prefix: int = ... + found_refs: Any + used_refs: Any + def __init__(self, **kwargs) -> None: ... + parser: Any + md: Any + def extendMarkdown(self, md) -> None: ... + footnotes: Any + def reset(self) -> None: ... + def unique_ref(self, reference, found: bool = ...): ... + def findFootnotesPlaceholder(self, root): ... + def setFootnote(self, id, text) -> None: ... + def get_separator(self): ... + def makeFootnoteId(self, id): ... + def makeFootnoteRefId(self, id, found: bool = ...): ... + def makeFootnotesDiv(self, root): ... + +class FootnotePreprocessor(Preprocessor): + footnotes: Any + def __init__(self, footnotes) -> None: ... + def run(self, lines): ... + def detectTabbed(self, lines): ... + +class FootnoteInlineProcessor(InlineProcessor): + footnotes: Any + def __init__(self, pattern, footnotes) -> None: ... + def handleMatch(self, m, data): ... # type: ignore + +class FootnotePostTreeprocessor(Treeprocessor): + footnotes: Any + def __init__(self, footnotes) -> None: ... + def add_duplicates(self, li, duplicates) -> None: ... + def get_num_duplicates(self, li): ... + def handle_duplicates(self, parent) -> None: ... + offset: int = ... + def run(self, root) -> None: ... + +class FootnoteTreeprocessor(Treeprocessor): + footnotes: Any + def __init__(self, footnotes) -> None: ... + def run(self, root) -> None: ... + +class FootnotePostprocessor(Postprocessor): + footnotes: Any + def __init__(self, footnotes) -> None: ... + def run(self, text): ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,13 @@ +from typing import Mapping, Sequence + +from markdown.core import Markdown + +class Extension: + config: Mapping[str, str] = ... + def __init__(self, **kwargs: Mapping[str, str]) -> None: ... + def getConfig(self, key: str, default: str = ...) -> str: ... + def getConfigs(self) -> Mapping[str, str]: ... + def getConfigInfo(self) -> Sequence[Mapping[str, str]]: ... + def setConfig(self, key: str, value: str) -> None: ... + def setConfigs(self, items: Mapping[str, str]) -> None: ... + def extendMarkdown(self, md: Markdown) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_attrs.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_attrs.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_attrs.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_attrs.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,15 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.treeprocessors import Treeprocessor + +ATTR_RE: Pattern + +class LegacyAttrs(Treeprocessor): + def run(self, doc) -> None: ... + def handleAttributes(self, el, txt): ... + +class LegacyAttrExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_em.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_em.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_em.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/legacy_em.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,16 @@ +from typing import Any + +from markdown.extensions import Extension +from markdown.inlinepatterns import UnderscoreProcessor + +EMPHASIS_RE: str +STRONG_RE: str +STRONG_EM_RE: str + +class LegacyUnderscoreProcessor(UnderscoreProcessor): + PATTERNS: Any + +class LegacyEmExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/md_in_html.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/md_in_html.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/md_in_html.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/md_in_html.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,13 @@ +from typing import Any, Optional + +from markdown.blockprocessors import BlockProcessor +from markdown.extensions import Extension + +class MarkdownInHtmlProcessor(BlockProcessor): + def test(self, parent, block): ... + def run(self, parent, blocks, tail: Optional[Any] = ..., nest: bool = ...) -> None: ... + +class MarkdownInHtmlExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/meta.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/meta.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/meta.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/meta.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.preprocessors import Preprocessor + +log: Any +META_RE: Pattern +META_MORE_RE: Pattern +BEGIN_RE: Pattern +END_RE: Pattern + +class MetaExtension(Extension): + md: Any + def extendMarkdown(self, md) -> None: ... + def reset(self) -> None: ... + +class MetaPreprocessor(Preprocessor): + def run(self, lines): ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/nl2br.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/nl2br.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/nl2br.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/nl2br.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,10 @@ +from typing import Any + +from markdown.extensions import Extension + +BR_RE: str + +class Nl2BrExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/sane_lists.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/sane_lists.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/sane_lists.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/sane_lists.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Any, Pattern + +from markdown.blockprocessors import OListProcessor, UListProcessor +from markdown.extensions import Extension + +class SaneOListProcessor(OListProcessor): + SIBLING_TAGS: Any + LAZY_OL: bool = ... + CHILD_RE: Pattern + def __init__(self, parser) -> None: ... + +class SaneUListProcessor(UListProcessor): + SIBLING_TAGS: Any + CHILD_RE: Pattern + def __init__(self, parser) -> None: ... + +class SaneListExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/smarty.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/smarty.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/smarty.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/smarty.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,45 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.inlinepatterns import HtmlInlineProcessor + +punctClass: str +endOfWordClass: str +closeClass: str +openingQuotesBase: str +substitutions: Any +singleQuoteStartRe: Any +doubleQuoteStartRe: Any +doubleQuoteSetsRe: str +singleQuoteSetsRe: str +decadeAbbrRe: str +openingDoubleQuotesRegex: Any +closingDoubleQuotesRegex: str +closingDoubleQuotesRegex2: Any +openingSingleQuotesRegex: Any +closingSingleQuotesRegex: Any +closingSingleQuotesRegex2: Any +remainingSingleQuotesRegex: str +remainingDoubleQuotesRegex: str +HTML_STRICT_RE: str + +class SubstituteTextPattern(HtmlInlineProcessor): + replace: Any + md: Any + def __init__(self, pattern, replace, md) -> None: ... + @property + def markdown(self): ... + def handleMatch(self, m, data): ... # type: ignore + +class SmartyExtension(Extension): + config: Any + substitutions: Any + def __init__(self, **kwargs) -> None: ... + def educateDashes(self, md) -> None: ... + def educateEllipses(self, md) -> None: ... + def educateAngledQuotes(self, md) -> None: ... + def educateQuotes(self, md) -> None: ... + inlinePatterns: Any + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/tables.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/tables.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/tables.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/tables.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,22 @@ +from typing import Any + +from markdown.blockprocessors import BlockProcessor +from markdown.extensions import Extension + +PIPE_NONE: int +PIPE_LEFT: int +PIPE_RIGHT: int + +class TableProcessor(BlockProcessor): + RE_CODE_PIPES: Any + RE_END_BORDER: Any + border: bool = ... + separator: str = ... + def __init__(self, parser) -> None: ... + def test(self, parent, block): ... + def run(self, parent, blocks) -> None: ... + +class TableExtension(Extension): + def extendMarkdown(self, md) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/toc.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/toc.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/toc.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/toc.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,47 @@ +from typing import Any, Pattern + +from markdown.extensions import Extension +from markdown.treeprocessors import Treeprocessor + +def slugify(value, separator): ... + +IDCOUNT_RE: Pattern + +def unique(id, ids): ... +def get_name(el): ... +def stashedHTML2text(text, md, strip_entities: bool = ...): ... +def unescape(text): ... +def nest_toc_tokens(toc_list): ... + +class TocTreeprocessor(Treeprocessor): + marker: Any + title: Any + base_level: Any + slugify: Any + sep: Any + use_anchors: Any + anchorlink_class: Any + use_permalinks: Any + permalink_class: Any + permalink_title: Any + header_rgx: Any + toc_top: int = ... + toc_bottom: Any + def __init__(self, md, config) -> None: ... + def iterparent(self, node) -> None: ... + def replace_marker(self, root, elem) -> None: ... + def set_level(self, elem) -> None: ... + def add_anchor(self, c, elem_id) -> None: ... + def add_permalink(self, c, elem_id) -> None: ... + def build_toc_div(self, toc_list): ... + def run(self, doc) -> None: ... + +class TocExtension(Extension): + TreeProcessorClass: Any + config: Any + def __init__(self, **kwargs) -> None: ... + md: Any + def extendMarkdown(self, md) -> None: ... + def reset(self) -> None: ... + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/wikilinks.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/wikilinks.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/wikilinks.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/extensions/wikilinks.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,19 @@ +from typing import Any + +from markdown.extensions import Extension +from markdown.inlinepatterns import InlineProcessor + +def build_url(label, base, end): ... + +class WikiLinkExtension(Extension): + config: Any + def __init__(self, **kwargs) -> None: ... + md: Any + def extendMarkdown(self, md) -> None: ... + +class WikiLinksInlineProcessor(InlineProcessor): + config: Any + def __init__(self, pattern, config) -> None: ... + def handleMatch(self, m, data): ... # type: ignore + +def makeExtension(**kwargs): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .core import Markdown as Markdown, markdown as markdown, markdownFromFile as markdownFromFile diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/inlinepatterns.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/inlinepatterns.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/inlinepatterns.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/inlinepatterns.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,134 @@ +from typing import Any, Optional + +def build_inlinepatterns(md, **kwargs): ... + +NOIMG: str +BACKTICK_RE: str +ESCAPE_RE: str +EMPHASIS_RE: str +STRONG_RE: str +SMART_STRONG_RE: str +SMART_EMPHASIS_RE: str +SMART_STRONG_EM_RE: str +EM_STRONG_RE: str +EM_STRONG2_RE: str +STRONG_EM_RE: str +STRONG_EM2_RE: str +STRONG_EM3_RE: str +LINK_RE: str +IMAGE_LINK_RE: str +REFERENCE_RE: str +IMAGE_REFERENCE_RE: str +NOT_STRONG_RE: str +AUTOLINK_RE: str +AUTOMAIL_RE: str +HTML_RE: str +ENTITY_RE: str +LINE_BREAK_RE: str + +def dequote(string): ... + +class EmStrongItem: ... + +class Pattern: + ANCESTOR_EXCLUDES: Any + pattern: Any + compiled_re: Any + md: Any + def __init__(self, pattern, md: Optional[Any] = ...) -> None: ... + @property + def markdown(self): ... + def getCompiledRegExp(self): ... + def handleMatch(self, m) -> None: ... + def type(self): ... + def unescape(self, text): ... + +class InlineProcessor(Pattern): + pattern: Any + compiled_re: Any + safe_mode: bool = ... + md: Any + def __init__(self, pattern, md: Optional[Any] = ...) -> None: ... + def handleMatch(self, m, data) -> None: ... # type: ignore + +class SimpleTextPattern(Pattern): + def handleMatch(self, m): ... + +class SimpleTextInlineProcessor(InlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class EscapeInlineProcessor(InlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class SimpleTagPattern(Pattern): + tag: Any + def __init__(self, pattern, tag) -> None: ... + def handleMatch(self, m): ... + +class SimpleTagInlineProcessor(InlineProcessor): + tag: Any + def __init__(self, pattern, tag) -> None: ... + def handleMatch(self, m, data): ... # type: ignore + +class SubstituteTagPattern(SimpleTagPattern): + def handleMatch(self, m): ... + +class SubstituteTagInlineProcessor(SimpleTagInlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class BacktickInlineProcessor(InlineProcessor): + ESCAPED_BSLASH: Any + tag: str = ... + def __init__(self, pattern) -> None: ... + def handleMatch(self, m, data): ... # type: ignore + +class DoubleTagPattern(SimpleTagPattern): + def handleMatch(self, m): ... + +class DoubleTagInlineProcessor(SimpleTagInlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class HtmlInlineProcessor(InlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + def unescape(self, text): ... + +class AsteriskProcessor(InlineProcessor): + PATTERNS: Any + def build_single(self, m, tag, idx): ... + def build_double(self, m, tags, idx): ... + def build_double2(self, m, tags, idx): ... + def parse_sub_patterns(self, data, parent, last, idx) -> None: ... + def build_element(self, m, builder, tags, index): ... + def handleMatch(self, m, data): ... # type: ignore + +class UnderscoreProcessor(AsteriskProcessor): + PATTERNS: Any + +class LinkInlineProcessor(InlineProcessor): + RE_LINK: Any + RE_TITLE_CLEAN: Any + def handleMatch(self, m, data): ... # type: ignore + def getLink(self, data, index): ... + def getText(self, data, index): ... + +class ImageInlineProcessor(LinkInlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class ReferenceInlineProcessor(LinkInlineProcessor): + NEWLINE_CLEANUP_RE: Pattern + RE_LINK: Any + def handleMatch(self, m, data): ... # type: ignore + def evalId(self, data, index, text): ... + def makeTag(self, href, title, text): ... + +class ShortReferenceInlineProcessor(ReferenceInlineProcessor): + def evalId(self, data, index, text): ... + +class ImageReferenceInlineProcessor(ReferenceInlineProcessor): + def makeTag(self, href, title, text): ... + +class AutolinkInlineProcessor(InlineProcessor): + def handleMatch(self, m, data): ... # type: ignore + +class AutomailInlineProcessor(InlineProcessor): + def handleMatch(self, m, data): ... # type: ignore diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__meta__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__meta__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__meta__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/__meta__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from typing import Any + +__version_info__: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/pep562.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/pep562.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/pep562.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/pep562.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,9 @@ +from typing import Any + +class Version: + def __new__(cls, major, minor, micro, release: str = ..., pre: int = ..., post: int = ..., dev: int = ...): ... + +class Pep562: + def __init__(self, name) -> None: ... + def __dir__(self): ... + def __getattr__(self, name): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/postprocessors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/postprocessors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/postprocessors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/postprocessors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,20 @@ +from typing import Any, Pattern + +from . import util + +def build_postprocessors(md, **kwargs): ... + +class Postprocessor(util.Processor): + def run(self, text) -> None: ... + +class RawHtmlPostprocessor(Postprocessor): + def run(self, text): ... + def isblocklevel(self, html): ... + +class AndSubstitutePostprocessor(Postprocessor): + def run(self, text): ... + +class UnescapePostprocessor(Postprocessor): + RE: Pattern + def unescape(self, m): ... + def run(self, text): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/preprocessors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/preprocessors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/preprocessors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/preprocessors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,26 @@ +from typing import Any, Iterable, List, Pattern + +from . import util + +def build_preprocessors(md, **kwargs): ... + +class Preprocessor(util.Processor): + def run(self, lines: List[str]) -> List[str]: ... + +class NormalizeWhitespace(Preprocessor): + def run(self, lines: Iterable[str]) -> List[str]: ... + +class HtmlBlockPreprocessor(Preprocessor): + right_tag_patterns: Any + attrs_pattern: str = ... + left_tag_pattern: Any + attrs_re: Any + left_tag_re: Any + markdown_in_raw: bool = ... + def run(self, lines: Iterable[str]) -> List[str]: ... + +class ReferencePreprocessor(Preprocessor): + TITLE: str = ... + RE: Pattern + TITLE_RE: Pattern + def run(self, lines: List[str]) -> List[str]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/serializers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/serializers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/serializers.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/serializers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,4 @@ +from typing import Any + +def to_html_string(element): ... +def to_xhtml_string(element): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/treeprocessors.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/treeprocessors.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/treeprocessors.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/treeprocessors.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,23 @@ +from typing import Any, Optional + +from . import util + +def build_treeprocessors(md, **kwargs): ... +def isString(s): ... + +class Treeprocessor(util.Processor): + def run(self, root) -> None: ... + +class InlineProcessor(Treeprocessor): + md: Any + inlinePatterns: Any + ancestors: Any + def __init__(self, md) -> None: ... + @property + def markdown(self): ... + stashed_nodes: Any + parent_map: Any + def run(self, tree, ancestors: Optional[Any] = ...): ... + +class PrettifyTreeprocessor(Treeprocessor): + def run(self, root) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/util.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/util.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/util.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/markdown/util.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,56 @@ +from collections import namedtuple +from typing import Any, Optional, Pattern + +PY37: Any +__deprecated__: Any +BLOCK_LEVEL_ELEMENTS: Any +STX: str +ETX: str +INLINE_PLACEHOLDER_PREFIX: Any +INLINE_PLACEHOLDER: Any +INLINE_PLACEHOLDER_RE: Pattern +AMP_SUBSTITUTE: Any +HTML_PLACEHOLDER: Any +HTML_PLACEHOLDER_RE: Pattern +TAG_PLACEHOLDER: Any +INSTALLED_EXTENSIONS: Any +RTL_BIDI_RANGES: Any + +def deprecated(message, stacklevel: int = ...): ... +def isBlockLevel(tag): ... +def parseBoolValue(value, fail_on_errors: bool = ..., preserve_none: bool = ...): ... +def code_escape(text): ... + +class AtomicString(str): ... + +class Processor: + md: Any + def __init__(self, md: Optional[Any] = ...) -> None: ... + @property + def markdown(self): ... + +class HtmlStash: + html_counter: int = ... + rawHtmlBlocks: Any + tag_counter: int = ... + tag_data: Any + def __init__(self) -> None: ... + def store(self, html): ... + def reset(self) -> None: ... + def get_placeholder(self, key): ... + def store_tag(self, tag, attrs, left_index, right_index): ... + +class Registry: + def __init__(self) -> None: ... + def __contains__(self, item): ... + def __iter__(self) -> Any: ... + def __getitem__(self, key): ... + def __len__(self): ... + def get_index_for_name(self, name): ... + def register(self, item, name, priority) -> None: ... + def deregister(self, name, strict: bool = ...) -> None: ... + def __setitem__(self, key, value) -> None: ... + def __delitem__(self, key) -> None: ... + def add(self, key, value, location) -> None: ... + +def __getattr__(name): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/mock.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/mock.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/mock.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/mock.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,26 +1,27 @@ -# Stubs for mock - import sys -from typing import Any, List, Optional, Sequence, Text, Tuple, Type, TypeVar +from typing import Any, Callable, Generic, List, Mapping, Optional, Sequence, Text, Tuple, Type, TypeVar, Union, overload +_F = TypeVar("_F", bound=Callable[..., Any]) _T = TypeVar("_T") +_TT = TypeVar("_TT", bound=Type[Any]) +_R = TypeVar("_R") __all__ = [ - 'Mock', - 'MagicMock', - 'patch', - 'sentinel', - 'DEFAULT', - 'ANY', - 'call', - 'create_autospec', - 'AsyncMock', - 'FILTER_DIR', - 'NonCallableMock', - 'NonCallableMagicMock', - 'mock_open', - 'PropertyMock', - 'seal', + "Mock", + "MagicMock", + "patch", + "sentinel", + "DEFAULT", + "ANY", + "call", + "create_autospec", + "AsyncMock", + "FILTER_DIR", + "NonCallableMock", + "NonCallableMagicMock", + "mock_open", + "PropertyMock", + "seal", ] __version__: str @@ -40,21 +41,24 @@ DEFAULT: Any class _Call(Tuple[Any, ...]): - def __new__(cls, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ...) -> Any: ... + def __new__( + cls, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ... + ) -> Any: ... name: Any parent: Any from_kall: Any - def __init__(self, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ...) -> None: ... + def __init__( + self, value: Any = ..., name: Optional[Any] = ..., parent: Optional[Any] = ..., two: bool = ..., from_kall: bool = ... + ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + def __call__(self, *args: Any, **kwargs: Any) -> _Call: ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ... def call_list(self) -> Any: ... -call: Any - +call: _Call class _CallList(List[_Call]): def __contains__(self, value: Any) -> bool: ... @@ -68,42 +72,52 @@ class Base: def __init__(self, *args: Any, **kwargs: Any) -> None: ... - class NonCallableMock(Base, Any): # type: ignore + def __new__(__cls, *args: Any, **kw: Any) -> NonCallableMock: ... + def __init__( + self, + spec: Union[List[str], object, Type[object], None] = ..., + wraps: Optional[Any] = ..., + name: Optional[str] = ..., + spec_set: Union[List[str], object, Type[object], None] = ..., + parent: Optional[NonCallableMock] = ..., + _spec_state: Optional[Any] = ..., + _new_name: str = ..., + _new_parent: Optional[NonCallableMock] = ..., + _spec_as_instance: bool = ..., + _eat_self: Optional[bool] = ..., + unsafe: bool = ..., + **kwargs: Any, + ) -> None: ... def __getattr__(self, name: str) -> Any: ... if sys.version_info >= (3, 8): def _calls_repr(self, prefix: str = ...) -> str: ... - def assert_called_with(self, *args: Any, **kwargs: Any) -> None: ... def assert_not_called(self) -> None: ... def assert_called_once_with(self, *args: Any, **kwargs: Any) -> None: ... - def _format_mock_failure_message(self, args: Any, kwargs: Any, action: str = ...) -> str: ... elif sys.version_info >= (3, 5): def assert_called_with(_mock_self, *args: Any, **kwargs: Any) -> None: ... def assert_not_called(_mock_self) -> None: ... def assert_called_once_with(_mock_self, *args: Any, **kwargs: Any) -> None: ... - def _format_mock_failure_message(self, args: Any, kwargs: Any) -> str: ... - if sys.version_info >= (3, 8): + def assert_called(self) -> None: ... def assert_called_once(self) -> None: ... elif sys.version_info >= (3, 6): + def assert_called(_mock_self) -> None: ... def assert_called_once(_mock_self) -> None: ... - if sys.version_info >= (3, 6): def reset_mock(self, visited: Any = ..., *, return_value: bool = ..., side_effect: bool = ...) -> None: ... elif sys.version_info >= (3, 5): def reset_mock(self, visited: Any = ...) -> None: ... - if sys.version_info >= (3, 7): def _extract_mock_name(self) -> str: ... def _get_call_signature_from_name(self, name: str) -> Any: ... - def assert_any_call(self, *args: Any, **kwargs: Any) -> None: ... def assert_has_calls(self, calls: Sequence[_Call], any_order: bool = ...) -> None: ... def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ... - def _mock_add_spec(self, spec: Any, spec_set, _spec_as_instance: bool = ..., _eat_self: bool = ...) -> None: ... + def _mock_add_spec(self, spec: Any, spec_set: bool, _spec_as_instance: bool = ..., _eat_self: bool = ...) -> None: ... def attach_mock(self, mock: NonCallableMock, attribute: str) -> None: ... def configure_mock(self, **kwargs: Any) -> None: ... return_value: Any @@ -117,40 +131,80 @@ def _call_matcher(self, _call: Tuple[_Call, ...]) -> _Call: ... def _get_child_mock(self, **kw: Any) -> NonCallableMock: ... - class CallableMixin(Base): side_effect: Any - def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ... + def __init__( + self, + spec: Optional[Any] = ..., + side_effect: Optional[Any] = ..., + return_value: Any = ..., + wraps: Optional[Any] = ..., + name: Optional[Any] = ..., + spec_set: Optional[Any] = ..., + parent: Optional[Any] = ..., + _spec_state: Optional[Any] = ..., + _new_name: Any = ..., + _new_parent: Optional[Any] = ..., + **kwargs: Any, + ) -> None: ... def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ... class Mock(CallableMixin, NonCallableMock): ... -class _patch: +class _patch(Generic[_T]): attribute_name: Any - getter: Any - attribute: Any - new: Any + getter: Callable[[], Any] + attribute: str + new: _T new_callable: Any spec: Any create: bool has_local: Any spec_set: Any autospec: Any - kwargs: Any + kwargs: Mapping[str, Any] additional_patchers: Any - def __init__(self, getter: Any, attribute: Any, new: Any, spec: Any, create: Any, spec_set: Any, autospec: Any, new_callable: Any, kwargs: Any) -> None: ... - def copy(self) -> Any: ... - def __call__(self, func: Any) -> Any: ... - def decorate_class(self, klass: Any) -> Any: ... - def decorate_callable(self, func: Any) -> Any: ... - def get_original(self) -> Any: ... + @overload + def __init__( + self: _patch[MagicMock], + getter: Callable[[], Any], + attribute: str, + *, + spec: Optional[Any], + create: bool, + spec_set: Optional[Any], + autospec: Optional[Any], + new_callable: Optional[Any], + kwargs: Mapping[str, Any], + ) -> None: ... + # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any]. + # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock], + # but that's impossible with the current type system. + @overload + def __init__( + self: _patch[_T], + getter: Callable[[], Any], + attribute: str, + new: _T, + spec: Optional[Any], + create: bool, + spec_set: Optional[Any], + autospec: Optional[Any], + new_callable: Optional[Any], + kwargs: Mapping[str, Any], + ) -> None: ... + def copy(self) -> _patch[_T]: ... + def __call__(self, func: Callable[..., _R]) -> Callable[..., _R]: ... + def decorate_class(self, klass: _TT) -> _TT: ... + def decorate_callable(self, func: _F) -> _F: ... + def get_original(self) -> Tuple[Any, bool]: ... target: Any temp_original: Any - is_local: Any - def __enter__(self) -> Any: ... - def __exit__(self, *exc_info: Any) -> Any: ... - def start(self) -> Any: ... - def stop(self) -> Any: ... + is_local: bool + def __enter__(self) -> _T: ... + def __exit__(self, *exc_info: Any) -> None: ... + def start(self) -> _T: ... + def stop(self) -> None: ... class _patch_dict: in_dict: Any @@ -167,9 +221,69 @@ class _patcher: TEST_PREFIX: str dict: Type[_patch_dict] - def __call__(self, target: Any, new: Optional[Any] = ..., spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... - def object(self, target: Any, attribute: Text, new: Optional[Any] = ..., spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... - def multiple(self, target: Any, spec: Optional[Any] = ..., create: bool = ..., spec_set: Optional[Any] = ..., autospec: Optional[Any] = ..., new_callable: Optional[Any] = ..., **kwargs: Any) -> _patch: ... + @overload + def __call__( # type: ignore + self, + target: Any, + *, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[MagicMock]: ... + # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any]. + # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock], + # but that's impossible with the current type system. + @overload + def __call__( + self, + target: Any, + new: _T, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[_T]: ... + @overload + def object( # type: ignore + self, + target: Any, + attribute: Text, + *, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[MagicMock]: ... + @overload + def object( + self, + target: Any, + attribute: Text, + new: _T = ..., + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: Any, + ) -> _patch[_T]: ... + def multiple( + self, + target: Any, + spec: Optional[Any] = ..., + create: bool = ..., + spec_set: Optional[Any] = ..., + autospec: Optional[Any] = ..., + new_callable: Optional[Any] = ..., + **kwargs: _T, + ) -> _patch[_T]: ... def stopall(self) -> None: ... patch: _patcher @@ -200,7 +314,9 @@ ANY: Any -def create_autospec(spec: Any, spec_set: Any = ..., instance: Any = ..., _parent: Optional[Any] = ..., _name: Optional[Any] = ..., **kwargs: Any) -> Any: ... +def create_autospec( + spec: Any, spec_set: Any = ..., instance: Any = ..., _parent: Optional[Any] = ..., _name: Optional[Any] = ..., **kwargs: Any +) -> Any: ... class _SpecState: spec: Any @@ -209,7 +325,15 @@ parent: Any instance: Any name: Any - def __init__(self, spec: Any, spec_set: Any = ..., parent: Optional[Any] = ..., name: Optional[Any] = ..., ids: Optional[Any] = ..., instance: Any = ...) -> None: ... + def __init__( + self, + spec: Any, + spec_set: Any = ..., + parent: Optional[Any] = ..., + name: Optional[Any] = ..., + ids: Optional[Any] = ..., + instance: Any = ..., + ) -> None: ... def mock_open(mock: Optional[Any] = ..., read_data: Any = ...) -> Any: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .nmap import * diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/nmap.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/nmap.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/nmap.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/nmap/nmap.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,122 @@ +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Text, Tuple, TypeVar +from typing_extensions import TypedDict + +_T = TypeVar("_T") +_Callback = Callable[[str, _Result], Any] + +class _Result(TypedDict): + nmap: _ResultNmap + scan: Dict[str, PortScannerHostDict] + +class _ResultNmap(TypedDict): + command_line: str + scaninfo: _ResultNmapInfo + scanstats: _ResultNampStats + +class _ResultNmapInfo(TypedDict, total=False): + error: str + warning: str + protocol: _ResultNampInfoProtocol + +class _ResultNampInfoProtocol(TypedDict): + method: str + services: str + +class _ResultNampStats(TypedDict): + timestr: str + elapsed: str + uphosts: str + downhosts: str + totalhosts: str + +class _ResulHostUptime(TypedDict): + seconds: str + lastboot: str + +class _ResultHostNames(TypedDict): + type: str + name: str + +class _ResultHostPort(TypedDict): + conf: str + cpe: str + extrainfo: str + name: str + product: str + reason: str + state: str + version: str + +__last_modification__: str + +class PortScanner(object): + def __init__(self, nmap_search_path: Iterable[str] = ...) -> None: ... + def get_nmap_last_output(self) -> Text: ... + def nmap_version(self) -> Tuple[int, int]: ... + def listscan(self, hosts: str = ...) -> List[str]: ... + def scan(self, hosts: Text = ..., ports: Optional[Text] = ..., arguments: Text = ..., sudo: bool = ...) -> _Result: ... + def analyse_nmap_xml_scan( + self, + nmap_xml_output: Optional[str] = ..., + nmap_err: str = ..., + nmap_err_keep_trace: str = ..., + nmap_warn_keep_trace: str = ..., + ) -> _Result: ... + def __getitem__(self, host: Text) -> PortScannerHostDict: ... + def all_hosts(self) -> List[str]: ... + def command_line(self) -> str: ... + def scaninfo(self) -> _ResultNmapInfo: ... + def scanstats(self) -> _ResultNampStats: ... + def has_host(self, host: str) -> bool: ... + def csv(self) -> str: ... + +def __scan_progressive__(self, hosts: Text, ports: Text, arguments: Text, callback: Optional[_Callback], sudo: bool) -> None: ... + +class PortScannerAsync(object): + def __init__(self) -> None: ... + def __del__(self) -> None: ... + def scan( + self, + hosts: Text = ..., + ports: Optional[Text] = ..., + arguments: Text = ..., + callback: Optional[_Callback] = ..., + sudo: bool = ..., + ) -> None: ... + def stop(self) -> None: ... + def wait(self, timeout: Optional[int] = ...) -> None: ... + def still_scanning(self) -> bool: ... + +class PortScannerYield(PortScannerAsync): + def __init__(self) -> None: ... + def scan( # type: ignore + self, hosts: str = ..., ports: Optional[str] = ..., arguments: str = ..., sudo: bool = ... + ) -> Iterator[Tuple[str, _Result]]: ... + def stop(self) -> None: ... + def wait(self, timeout: Optional[int] = ...) -> None: ... + def still_scanning(self) -> None: ... # type: ignore + +class PortScannerHostDict(Dict[str, Any]): + def hostnames(self) -> List[_ResultHostNames]: ... + def hostname(self) -> str: ... + def state(self) -> str: ... + def uptime(self) -> _ResulHostUptime: ... + def all_protocols(self) -> List[str]: ... + def all_tcp(self) -> List[int]: ... + def has_tcp(self, port: int) -> bool: ... + def tcp(self, port: int) -> _ResultHostPort: ... + def all_udp(self) -> List[int]: ... + def has_udp(self, port: int) -> bool: ... + def udp(self, port: int) -> _ResultHostPort: ... + def all_ip(self) -> List[int]: ... + def has_ip(self, port: int) -> bool: ... + def ip(self, port: int) -> _ResultHostPort: ... + def all_sctp(self) -> List[int]: ... + def has_sctp(self, port: int) -> bool: ... + def sctp(self, port: int) -> _ResultHostPort: ... + +class PortScannerError(Exception): + value: str + def __init__(self, value: str) -> None: ... + +def convert_nmap_output_to_encoding(value: _T, code: str = ...) -> _T: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/adapters.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/adapters.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/adapters.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/adapters.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,17 +1,8 @@ -# Stubs for requests.adapters (Python 3) +from typing import Any, Container, Mapping, Optional, Text, Tuple, Union -from typing import Any, Container, Union, Text, Tuple, Optional, Mapping -from . import models -from .packages.urllib3 import poolmanager -from .packages.urllib3 import response +from . import cookies, exceptions, models, structures, utils +from .packages.urllib3 import exceptions as urllib3_exceptions, poolmanager, response from .packages.urllib3.util import retry -from . import compat -from . import utils -from . import structures -from .packages.urllib3 import exceptions as urllib3_exceptions -from . import cookies -from . import exceptions -from . import auth PreparedRequest = models.PreparedRequest Response = models.Response @@ -44,13 +35,15 @@ class BaseAdapter: def __init__(self) -> None: ... - def send(self, - request: PreparedRequest, - stream: bool = ..., - timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., - verify: Union[bool, str] = ..., - cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., - proxies: Optional[Mapping[str, str]] = ...) -> Response: ... + def send( + self, + request: PreparedRequest, + stream: bool = ..., + timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., + verify: Union[bool, str] = ..., + cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., + proxies: Optional[Mapping[str, str]] = ..., + ) -> Response: ... def close(self) -> None: ... class HTTPAdapter(BaseAdapter): @@ -58,8 +51,7 @@ max_retries: Any config: Any proxy_manager: Any - def __init__(self, pool_connections=..., pool_maxsize=..., max_retries=..., - pool_block=...) -> None: ... + def __init__(self, pool_connections=..., pool_maxsize=..., max_retries=..., pool_block=...) -> None: ... poolmanager: Any def init_poolmanager(self, connections, maxsize, block=..., **pool_kwargs): ... def proxy_manager_for(self, proxy, **proxy_kwargs): ... @@ -70,10 +62,12 @@ def request_url(self, request, proxies): ... def add_headers(self, request, **kwargs): ... def proxy_headers(self, proxy): ... - def send(self, - request: PreparedRequest, - stream: bool = ..., - timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., - verify: Union[bool, str] = ..., - cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., - proxies: Optional[Mapping[str, str]] = ...) -> Response: ... + def send( + self, + request: PreparedRequest, + stream: bool = ..., + timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., + verify: Union[bool, str] = ..., + cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., + proxies: Optional[Mapping[str, str]] = ..., + ) -> Response: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/api.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/api.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/api.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/api.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,25 +1,21 @@ -# Stubs for requests.api (Python 3) - -import sys -from typing import Optional, Union, Any, Iterable, Mapping, MutableMapping, Tuple, IO, Text +from _typeshed import SupportsItems +from typing import Iterable, Optional, Text, Tuple, Union from .models import Response from .sessions import _Data -_ParamsMappingValueType = Union[Text, bytes, int, float, Iterable[Union[Text, bytes, int, float]]] +_ParamsMappingKeyType = Union[Text, bytes, int, float] +_ParamsMappingValueType = Union[Text, bytes, int, float, Iterable[Union[Text, bytes, int, float]], None] def request(method: str, url: str, **kwargs) -> Response: ... def get( url: Union[Text, bytes], params: Optional[ Union[ - Mapping[Union[Text, bytes, int, float], _ParamsMappingValueType], + SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType], + Tuple[_ParamsMappingKeyType, _ParamsMappingValueType], + Iterable[Tuple[_ParamsMappingKeyType, _ParamsMappingValueType]], Union[Text, bytes], - Tuple[Union[Text, bytes, int, float], _ParamsMappingValueType], - Mapping[Text, _ParamsMappingValueType], - Mapping[bytes, _ParamsMappingValueType], - Mapping[int, _ParamsMappingValueType], - Mapping[float, _ParamsMappingValueType], ] ] = ..., **kwargs, diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/auth.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/auth.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/auth.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/auth.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,16 +1,10 @@ -# Stubs for requests.auth (Python 3) - from typing import Any, Text, Union -from . import compat -from . import cookies -from . import models -from . import utils -from . import status_codes + +from . import cookies, models, status_codes, utils extract_cookies_to_jar = cookies.extract_cookies_to_jar parse_dict_header = utils.parse_dict_header to_native_string = utils.to_native_string -codes = status_codes.codes CONTENT_TYPE_FORM_URLENCODED: Any CONTENT_TYPE_MULTI_PART: Any @@ -42,3 +36,4 @@ def handle_redirect(self, r, **kwargs): ... def handle_401(self, r, **kwargs): ... def __call__(self, r): ... + def init_per_thread_state(self) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/compat.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/compat.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/compat.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/compat.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,3 @@ -# Stubs for requests.compat (Python 3.4) - -from typing import Any import collections OrderedDict = collections.OrderedDict diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/cookies.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/cookies.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/cookies.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/cookies.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,5 @@ -# Stubs for requests.cookies (Python 3) - import sys from typing import Any, MutableMapping -import collections -from . import compat if sys.version_info < (3, 0): from cookielib import CookieJar @@ -60,6 +56,7 @@ def set_cookie(self, cookie, *args, **kwargs): ... def update(self, other): ... def copy(self): ... + def get_policy(self): ... def create_cookie(name, value, **kwargs): ... def morsel_to_cookie(morsel): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/exceptions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/exceptions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/exceptions.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/exceptions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,5 @@ -# Stubs for requests.exceptions (Python 3) - from typing import Any + from .packages.urllib3.exceptions import HTTPError as BaseHTTPError class RequestException(IOError): @@ -20,7 +19,13 @@ class MissingSchema(RequestException, ValueError): ... class InvalidSchema(RequestException, ValueError): ... class InvalidURL(RequestException, ValueError): ... +class InvalidHeader(RequestException, ValueError): ... +class InvalidProxyURL(InvalidURL): ... class ChunkedEncodingError(RequestException): ... class ContentDecodingError(RequestException, BaseHTTPError): ... class StreamConsumedError(RequestException, TypeError): ... class RetryError(RequestException): ... +class UnrewindableBodyError(RequestException): ... +class RequestsWarning(Warning): ... +class FileModeWarning(RequestsWarning, DeprecationWarning): ... +class RequestsDependencyWarning(RequestsWarning): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/hooks.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/hooks.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/hooks.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/hooks.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,3 @@ -# Stubs for requests.hooks (Python 3) - from typing import Any HOOKS: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,39 +1,29 @@ -# Stubs for requests (based on version 2.6.0, Python 3) - -from typing import Any -from . import models -from . import api -from . import sessions -from . import status_codes -from . import exceptions -from . import packages import logging +from typing import Any, Text -from .models import Request as Request -from .models import Response as Response -from .models import PreparedRequest as PreparedRequest - -from .api import request as request -from .api import get as get -from .api import head as head -from .api import post as post -from .api import patch as patch -from .api import put as put -from .api import delete as delete -from .api import options as options - -from .sessions import session as session -from .sessions import Session as Session - +from .api import ( + delete as delete, + get as get, + head as head, + options as options, + patch as patch, + post as post, + put as put, + request as request, +) +from .exceptions import ( + ConnectionError as ConnectionError, + HTTPError as HTTPError, + ReadTimeout as ReadTimeout, + RequestException as RequestException, + Timeout as Timeout, + TooManyRedirects as TooManyRedirects, + URLRequired as URLRequired, +) +from .models import PreparedRequest as PreparedRequest, Request as Request, Response as Response +from .sessions import Session as Session, session as session from .status_codes import codes as codes -from .exceptions import RequestException as RequestException -from .exceptions import Timeout as Timeout -from .exceptions import URLRequired as URLRequired -from .exceptions import TooManyRedirects as TooManyRedirects -from .exceptions import HTTPError as HTTPError -from .exceptions import ConnectionError as ConnectionError - __title__: Any __build__: Any __license__: Any @@ -42,3 +32,5 @@ class NullHandler(logging.Handler): def emit(self, record): ... + +def check_compatibility(urllib3_version: Text, chardet_version: Text) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/models.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/models.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/models.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/models.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,24 +1,9 @@ -# Stubs for requests.models (Python 3) - -from typing import (Any, Dict, Iterator, List, MutableMapping, Optional, Text, - Union) import datetime -import types +from typing import Any, Dict, Iterator, List, Optional, Text, Union -from . import hooks -from . import structures -from . import auth -from . import cookies +from . import auth, cookies, exceptions, hooks, status_codes, structures, utils from .cookies import RequestsCookieJar -from .packages.urllib3 import fields -from .packages.urllib3 import filepost -from .packages.urllib3 import util -from .packages.urllib3 import exceptions as urllib3_exceptions -from . import exceptions -from . import utils -from . import compat -from . import status_codes - +from .packages.urllib3 import exceptions as urllib3_exceptions, fields, filepost, util default_hooks = hooks.default_hooks CaseInsensitiveDict = structures.CaseInsensitiveDict @@ -55,7 +40,6 @@ DEFAULT_REDIRECT_LIMIT: Any CONTENT_CHUNK_SIZE: Any ITER_CHUNK_SIZE: Any -json_dumps: Any class RequestEncodingMixin: @property @@ -76,8 +60,9 @@ params: Any auth: Any cookies: Any - def __init__(self, method=..., url=..., headers=..., files=..., data=..., params=..., - auth=..., cookies=..., hooks=..., json=...) -> None: ... + def __init__( + self, method=..., url=..., headers=..., files=..., data=..., params=..., auth=..., cookies=..., hooks=..., json=... + ) -> None: ... def prepare(self) -> PreparedRequest: ... class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): @@ -87,8 +72,9 @@ body: Optional[Union[bytes, Text]] hooks: Any def __init__(self) -> None: ... - def prepare(self, method=..., url=..., headers=..., files=..., data=..., params=..., - auth=..., cookies=..., hooks=..., json=...) -> None: ... + def prepare( + self, method=..., url=..., headers=..., files=..., data=..., params=..., auth=..., cookies=..., hooks=..., json=... + ) -> None: ... def copy(self) -> PreparedRequest: ... def prepare_method(self, method) -> None: ... def prepare_url(self, url, params) -> None: ... @@ -101,6 +87,7 @@ class Response: __attrs__: Any + _content: Optional[bytes] # undocumented status_code: int headers: CaseInsensitiveDict[str] raw: Any @@ -127,12 +114,10 @@ def is_permanent_redirect(self) -> bool: ... @property def apparent_encoding(self) -> str: ... - def iter_content(self, chunk_size: Optional[int] = ..., - decode_unicode: bool = ...) -> Iterator[Any]: ... - def iter_lines(self, - chunk_size: Optional[int] = ..., - decode_unicode: bool = ..., - delimiter: Union[Text, bytes] = ...) -> Iterator[Any]: ... + def iter_content(self, chunk_size: Optional[int] = ..., decode_unicode: bool = ...) -> Iterator[Any]: ... + def iter_lines( + self, chunk_size: Optional[int] = ..., decode_unicode: bool = ..., delimiter: Optional[Union[Text, bytes]] = ... + ) -> Iterator[Any]: ... @property def content(self) -> bytes: ... @property diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/_collections.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/_collections.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/_collections.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/_collections.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, NoReturn, TypeVar from collections import MutableMapping +from typing import Any, NoReturn, TypeVar _KT = TypeVar("_KT") _VT = TypeVar("_VT") diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connectionpool.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connectionpool.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connectionpool.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connectionpool.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,19 +1,9 @@ from typing import Any -from . import exceptions + +from . import connection, exceptions, request, response +from .connection import BaseSSLError as BaseSSLError, ConnectionError as ConnectionError, HTTPException as HTTPException from .packages import ssl_match_hostname -from . import packages -from .connection import ( - HTTPException as HTTPException, - BaseSSLError as BaseSSLError, - ConnectionError as ConnectionError, -) -from . import request -from . import response -from . import connection -from .util import connection as _connection -from .util import retry -from .util import timeout -from .util import url +from .util import connection as _connection, retry, timeout, url ClosedPoolError = exceptions.ClosedPoolError ProtocolError = exceptions.ProtocolError @@ -65,10 +55,36 @@ num_connections: Any num_requests: Any conn_kw: Any - def __init__(self, host, port=..., strict=..., timeout=..., maxsize=..., block=..., headers=..., retries=..., _proxy=..., _proxy_headers=..., **conn_kw) -> None: ... + def __init__( + self, + host, + port=..., + strict=..., + timeout=..., + maxsize=..., + block=..., + headers=..., + retries=..., + _proxy=..., + _proxy_headers=..., + **conn_kw, + ) -> None: ... def close(self): ... def is_same_host(self, url): ... - def urlopen(self, method, url, body=..., headers=..., retries=..., redirect=..., assert_same_host=..., timeout=..., pool_timeout=..., release_conn=..., **response_kw): ... + def urlopen( + self, + method, + url, + body=..., + headers=..., + retries=..., + redirect=..., + assert_same_host=..., + timeout=..., + pool_timeout=..., + release_conn=..., + **response_kw, + ): ... class HTTPSConnectionPool(HTTPConnectionPool): scheme: Any @@ -80,6 +96,26 @@ ssl_version: Any assert_hostname: Any assert_fingerprint: Any - def __init__(self, host, port=..., strict=..., timeout=..., maxsize=..., block=..., headers=..., retries=..., _proxy=..., _proxy_headers=..., key_file=..., cert_file=..., cert_reqs=..., ca_certs=..., ssl_version=..., assert_hostname=..., assert_fingerprint=..., **conn_kw) -> None: ... + def __init__( + self, + host, + port=..., + strict=..., + timeout=..., + maxsize=..., + block=..., + headers=..., + retries=..., + _proxy=..., + _proxy_headers=..., + key_file=..., + cert_file=..., + cert_reqs=..., + ca_certs=..., + ssl_version=..., + assert_hostname=..., + assert_fingerprint=..., + **conn_kw, + ) -> None: ... def connection_from_url(url, **kw): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connection.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connection.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connection.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/connection.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,24 +1,18 @@ -# Stubs for requests.packages.urllib3.connection (Python 3.4) - +import ssl import sys from typing import Any -from . import packages -import ssl -from . import exceptions + +from . import exceptions, util from .packages import ssl_match_hostname from .util import ssl_ -from . import util if sys.version_info < (3, 0): - from httplib import HTTPConnection as _HTTPConnection - from httplib import HTTPException as HTTPException - + from httplib import HTTPConnection as _HTTPConnection, HTTPException as HTTPException class ConnectionError(Exception): ... + else: - from http.client import HTTPConnection as _HTTPConnection - from http.client import HTTPException as HTTPException from builtins import ConnectionError as ConnectionError - + from http.client import HTTPConnection as _HTTPConnection, HTTPException as HTTPException class DummyConnection: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/fields.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/fields.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/fields.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/fields.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,4 @@ -# Stubs for requests.packages.urllib3.fields (Python 3.4) - from typing import Any -from . import packages def guess_content_type(filename, default=...): ... def format_header_param(name, value): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/filepost.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/filepost.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/filepost.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/filepost.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,7 @@ from typing import Any -from . import packages -# from .packages import six + from . import fields -# six = packages.six -# b = six.b RequestField = fields.RequestField writer: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,13 +1,8 @@ -from typing import Any -from . import connectionpool -from . import filepost -from . import poolmanager -from . import response -from .util import request as _request -from .util import url -from .util import timeout -from .util import retry import logging +from typing import Any + +from . import connectionpool, filepost, poolmanager, response +from .util import request as _request, retry, timeout, url __license__: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/poolmanager.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/poolmanager.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/poolmanager.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/poolmanager.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any + from .request import RequestMethods class PoolManager(RequestMethods): diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/request.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/request.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/request.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/request.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -6,4 +6,6 @@ def urlopen(self, method, url, body=..., headers=..., encode_multipart=..., multipart_boundary=..., **kw): ... def request(self, method, url, fields=..., headers=..., **urlopen_kw): ... def request_encode_url(self, method, url, fields=..., **urlopen_kw): ... - def request_encode_body(self, method, url, fields=..., headers=..., encode_multipart=..., multipart_boundary=..., **urlopen_kw): ... + def request_encode_body( + self, method, url, fields=..., headers=..., encode_multipart=..., multipart_boundary=..., **urlopen_kw + ): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/response.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/response.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/response.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/response.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,8 @@ -from typing import Any import io -from . import _collections -from . import exceptions -from .connection import HTTPException as HTTPException, BaseSSLError as BaseSSLError +from typing import Any + +from . import _collections, exceptions +from .connection import BaseSSLError as BaseSSLError, HTTPException as HTTPException from .util import response HTTPHeaderDict = _collections.HTTPHeaderDict @@ -32,7 +32,20 @@ reason: Any strict: Any decode_content: Any - def __init__(self, body=..., headers=..., status=..., version=..., reason=..., strict=..., preload_content=..., decode_content=..., original_response=..., pool=..., connection=...) -> None: ... + def __init__( + self, + body=..., + headers=..., + status=..., + version=..., + reason=..., + strict=..., + preload_content=..., + decode_content=..., + original_response=..., + pool=..., + connection=..., + ) -> None: ... def get_redirect_location(self): ... def release_conn(self): ... @property diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,7 @@ -from . import connection -from . import request -from . import response -from . import ssl_ -from . import timeout -from . import retry -from . import url import ssl +from . import connection, request, response, retry, ssl_, timeout, url + is_connection_dropped = connection.is_connection_dropped make_headers = request.make_headers is_fp_closed = response.is_fp_closed diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/request.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/request.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/request.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/request.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,8 +1,11 @@ from typing import Any + # from ..packages import six # b = six.b ACCEPT_ENCODING: Any -def make_headers(keep_alive=..., accept_encoding=..., user_agent=..., basic_auth=..., proxy_basic_auth=..., disable_cache=...): ... +def make_headers( + keep_alive=..., accept_encoding=..., user_agent=..., basic_auth=..., proxy_basic_auth=..., disable_cache=... +): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/retry.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/retry.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/retry.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/retry.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ from typing import Any + from .. import exceptions -from .. import packages ConnectTimeoutError = exceptions.ConnectTimeoutError MaxRetryError = exceptions.MaxRetryError @@ -21,7 +21,18 @@ method_whitelist: Any backoff_factor: Any raise_on_redirect: Any - def __init__(self, total=..., connect=..., read=..., redirect=..., method_whitelist=..., status_forcelist=..., backoff_factor=..., raise_on_redirect=..., _observed_errors=...) -> None: ... + def __init__( + self, + total=..., + connect=..., + read=..., + redirect=..., + method_whitelist=..., + status_forcelist=..., + backoff_factor=..., + raise_on_redirect=..., + _observed_errors=..., + ) -> None: ... def new(self, **kw): ... @classmethod def from_int(cls, retries, redirect=..., default=...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/ssl_.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/ssl_.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/ssl_.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/ssl_.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,7 @@ +import ssl from typing import Any + from .. import exceptions -import ssl SSLError = exceptions.SSLError InsecurePlatformWarning = exceptions.InsecurePlatformWarning @@ -16,5 +17,14 @@ def resolve_cert_reqs(candidate): ... def resolve_ssl_version(candidate): ... def create_urllib3_context(ssl_version=..., cert_reqs=..., options=..., ciphers=...): ... -def ssl_wrap_socket(sock, keyfile=..., certfile=..., cert_reqs=..., ca_certs=..., - server_hostname=..., ssl_version=..., ciphers=..., ssl_context=...): ... +def ssl_wrap_socket( + sock, + keyfile=..., + certfile=..., + cert_reqs=..., + ca_certs=..., + server_hostname=..., + ssl_version=..., + ciphers=..., + ssl_context=..., +): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/timeout.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/timeout.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/timeout.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/timeout.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any + from .. import exceptions TimeoutStateError = exceptions.TimeoutStateError diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/url.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/url.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/url.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/packages/urllib3/util/url.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any + from .. import exceptions LocationParseError = exceptions.LocationParseError diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/sessions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/sessions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/sessions.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/sessions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,8 @@ -# Stubs for requests.sessions (Python 3) +from typing import IO, Any, Callable, Iterable, List, Mapping, MutableMapping, Optional, Text, Tuple, Union -from typing import Any, Union, List, MutableMapping, Text, Optional, IO, Tuple, Callable, Iterable -from . import adapters -from . import auth as _auth -from . import compat -from . import cookies -from . import models +from . import adapters, auth as _auth, compat, cookies, exceptions, hooks, models, status_codes, structures, utils from .models import Response -from . import hooks -from . import utils -from . import exceptions from .packages.urllib3 import _collections -from . import structures -from . import status_codes BaseAdapter = adapters.BaseAdapter OrderedDict = compat.OrderedDict @@ -43,18 +33,15 @@ codes = status_codes.codes REDIRECT_STATI = models.REDIRECT_STATI -REDIRECT_CACHE_SIZE: Any - def merge_setting(request_setting, session_setting, dict_class=...): ... def merge_hooks(request_hooks, session_hooks, dict_class=...): ... class SessionRedirectMixin: - def resolve_redirects(self, resp, req, stream=..., timeout=..., verify=..., cert=..., - proxies=...): ... + def resolve_redirects(self, resp, req, stream=..., timeout=..., verify=..., cert=..., proxies=...): ... def rebuild_auth(self, prepared_request, response): ... def rebuild_proxies(self, prepared_request, proxies): ... -_Data = Union[None, Text, bytes, MutableMapping[str, Any], MutableMapping[Text, Any], Iterable[Tuple[Text, Optional[Text]]], IO] +_Data = Union[None, Text, bytes, Mapping[str, Any], Mapping[Text, Any], Iterable[Tuple[Text, Optional[Text]]], IO] _Hook = Callable[[Response], Any] _Hooks = MutableMapping[Text, List[_Hook]] @@ -79,22 +66,25 @@ def __enter__(self) -> Session: ... def __exit__(self, *args) -> None: ... def prepare_request(self, request): ... - def request(self, method: str, url: Union[str, bytes, Text], - params: Union[None, bytes, MutableMapping[Text, Text]] = ..., - data: _Data = ..., - headers: Optional[MutableMapping[Text, Text]] = ..., - cookies: Union[None, RequestsCookieJar, MutableMapping[Text, Text]] = ..., - files: Optional[MutableMapping[Text, IO[Any]]] = ..., - auth: Union[None, Tuple[Text, Text], _auth.AuthBase, Callable[[Request], Request]] = ..., - timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., - allow_redirects: Optional[bool] = ..., - proxies: Optional[MutableMapping[Text, Text]] = ..., - hooks: Optional[_HooksInput] = ..., - stream: Optional[bool] = ..., - verify: Union[None, bool, Text] = ..., - cert: Union[Text, Tuple[Text, Text], None] = ..., - json: Optional[Any] = ..., - ) -> Response: ... + def request( + self, + method: str, + url: Union[str, bytes, Text], + params: Union[None, bytes, MutableMapping[Text, Text]] = ..., + data: _Data = ..., + headers: Optional[MutableMapping[Text, Text]] = ..., + cookies: Union[None, RequestsCookieJar, MutableMapping[Text, Text]] = ..., + files: Optional[MutableMapping[Text, IO[Any]]] = ..., + auth: Union[None, Tuple[Text, Text], _auth.AuthBase, Callable[[Request], Request]] = ..., + timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ..., + allow_redirects: Optional[bool] = ..., + proxies: Optional[MutableMapping[Text, Text]] = ..., + hooks: Optional[_HooksInput] = ..., + stream: Optional[bool] = ..., + verify: Union[None, bool, Text] = ..., + cert: Union[Text, Tuple[Text, Text], None] = ..., + json: Optional[Any] = ..., + ) -> Response: ... def get(self, url: Union[Text, bytes], **kwargs) -> Response: ... def options(self, url: Union[Text, bytes], **kwargs) -> Response: ... def head(self, url: Union[Text, bytes], **kwargs) -> Response: ... @@ -102,12 +92,10 @@ def put(self, url: Union[Text, bytes], data: _Data = ..., **kwargs) -> Response: ... def patch(self, url: Union[Text, bytes], data: _Data = ..., **kwargs) -> Response: ... def delete(self, url: Union[Text, bytes], **kwargs) -> Response: ... - def send(self, request, **kwargs): ... + def send(self, request: PreparedRequest, **kwargs) -> Response: ... def merge_environment_settings(self, url, proxies, stream, verify, cert): ... def get_adapter(self, url): ... def close(self) -> None: ... - def mount(self, prefix: - Union[Text, bytes], - adapter: BaseAdapter) -> None: ... + def mount(self, prefix: Union[Text, bytes], adapter: BaseAdapter) -> None: ... def session() -> Session: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/status_codes.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/status_codes.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/status_codes.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/status_codes.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ from typing import Any -from .structures import LookupDict codes: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/structures.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/structures.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/structures.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/structures.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ -from typing import Any, Dict, Iterable, Iterator, Mapping, MutableMapping, Optional, Tuple, TypeVar, Union, Generic +from typing import Any, Dict, Generic, Iterable, Iterator, Mapping, MutableMapping, Optional, Tuple, TypeVar, Union -_VT = TypeVar('_VT') +_VT = TypeVar("_VT") class CaseInsensitiveDict(MutableMapping[str, _VT], Generic[_VT]): def __init__(self, data: Optional[Union[Mapping[str, _VT], Iterable[Tuple[str, _VT]]]] = ..., **kwargs: _VT) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/utils.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/requests/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,6 @@ -# Stubs for requests.utils (Python 3) +from typing import Any, AnyStr, Dict, Iterable, Mapping, Optional, Text, Tuple -from typing import Any -from . import compat -from . import cookies -from . import structures -from . import exceptions +from . import compat, cookies, exceptions, structures OrderedDict = compat.OrderedDict RequestsCookieJar = cookies.RequestsCookieJar @@ -18,7 +14,7 @@ def dict_to_sequence(d): ... def super_len(o): ... -def get_netrc_auth(url): ... +def get_netrc_auth(url, raise_errors: bool = ...): ... def guess_filename(obj): ... def extract_zipped_paths(path): ... def from_key_val_list(value): ... @@ -43,9 +39,9 @@ def is_ipv4_address(string_ip): ... def is_valid_cidr(string_network): ... def set_environ(env_name, value): ... -def should_bypass_proxies(url): ... -def get_environ_proxies(url): ... -def select_proxy(url, proxies): ... +def should_bypass_proxies(url, no_proxy: Optional[Iterable[AnyStr]]) -> bool: ... +def get_environ_proxies(url, no_proxy: Optional[Iterable[AnyStr]] = ...) -> Dict[Any, Any]: ... +def select_proxy(url: Text, proxies: Optional[Mapping[Any, Any]]): ... def default_user_agent(name=...): ... def default_headers(): ... def parse_header_links(value): ... @@ -55,3 +51,4 @@ def to_native_string(string, encoding=...): ... def urldefragauth(url): ... def rewind_body(prepared_request): ... +def check_header_validity(header: Tuple[AnyStr, AnyStr]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/api.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/api.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/api.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/api.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,28 @@ +from logging import Logger +from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Type, TypeVar, Union + +_T = TypeVar("_T", bound=Callable[..., Any]) +_Decorator = Callable[[_T], _T] +_R = TypeVar("_R") + +def retry_call( + f: Callable[..., _R], + fargs: Optional[Sequence[Any]] = ..., + fkwargs: Optional[Dict[str, Any]] = ..., + exceptions: Union[Type[Exception], Tuple[Type[Exception], ...]] = ..., + tries: int = ..., + delay: float = ..., + max_delay: Optional[float] = ..., + backoff: float = ..., + jitter: Union[Tuple[float, float], float] = ..., + logger: Optional[Logger] = ..., +) -> _R: ... +def retry( + exceptions: Union[Type[Exception], Tuple[Type[Exception], ...]] = ..., + tries: int = ..., + delay: float = ..., + max_delay: Optional[float] = ..., + backoff: float = ..., + jitter: Union[Tuple[float, float], float] = ..., + logger: Optional[Logger] = ..., +) -> _Decorator: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/retry/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .api import retry as retry diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,2 @@ +from .slugify import * +from .special import * diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/slugify.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/slugify.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/slugify.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/slugify.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,19 @@ +from typing import Iterable, Optional + +def smart_truncate( + string: str, max_length: int = ..., word_boundary: bool = ..., separator: str = ..., save_order: bool = ... +) -> str: ... +def slugify( + text: str, + entities: bool = ..., + decimal: bool = ..., + hexadecimal: bool = ..., + max_length: int = ..., + word_boundary: bool = ..., + separator: str = ..., + save_order: bool = ..., + stopwords: Iterable[str] = ..., + regex_pattern: Optional[str] = ..., + lowercase: bool = ..., + replacements: Iterable[str] = ..., +) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/special.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/special.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/special.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/slugify/special.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,8 @@ +from typing import Sequence, Tuple + +def add_uppercase_char(char_list: Sequence[Tuple[str, str]]) -> Sequence[Tuple[str, str]]: ... + +CYRILLIC: Sequence[Tuple[str, str]] +GERMAN: Sequence[Tuple[str, str]] +GREEK: Sequence[Tuple[str, str]] +PRE_TRANSLATIONS: Sequence[Tuple[str, str]] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/typing_extensions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/typing_extensions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/typing_extensions.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/typing_extensions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,31 +1,47 @@ import abc import sys -from typing import Callable -from typing import ClassVar as ClassVar -from typing import ContextManager as ContextManager -from typing import Counter as Counter -from typing import DefaultDict as DefaultDict -from typing import Deque as Deque -from typing import NewType as NewType -from typing import NoReturn as NoReturn -from typing import overload as overload -from typing import Text as Text -from typing import Type as Type -from typing import TYPE_CHECKING as TYPE_CHECKING -from typing import TypeVar, Any, Mapping, ItemsView, KeysView, Optional, ValuesView, Dict - -_T = TypeVar('_T') -_F = TypeVar('_F', bound=Callable[..., Any]) -_TC = TypeVar('_TC', bound=Type[object]) +from typing import ( + TYPE_CHECKING as TYPE_CHECKING, + Any, + Callable, + ClassVar as ClassVar, + ContextManager as ContextManager, + Counter as Counter, + DefaultDict as DefaultDict, + Deque as Deque, + Dict, + ItemsView, + KeysView, + Mapping, + NewType as NewType, + NoReturn as NoReturn, + Optional, + Text as Text, + Tuple, + Type as Type, + TypeVar, + ValuesView, + overload as overload, +) + +_T = TypeVar("_T") +_F = TypeVar("_F", bound=Callable[..., Any]) +_TC = TypeVar("_TC", bound=Type[object]) + class _SpecialForm: def __getitem__(self, typeargs: Any) -> Any: ... + def runtime_checkable(cls: _TC) -> _TC: ... + # This alias for above is kept here for backwards compatibility. runtime = runtime_checkable Protocol: _SpecialForm = ... Final: _SpecialForm = ... + def final(f: _F) -> _F: ... + Literal: _SpecialForm = ... + def IntVar(__name: str) -> Any: ... # returns a new TypeVar # Internal mypy fallback type for all typed dicts (does not exist at runtime) @@ -55,19 +71,35 @@ from typing import ChainMap as ChainMap if sys.version_info >= (3, 5): - from typing import AsyncIterable as AsyncIterable - from typing import AsyncIterator as AsyncIterator - from typing import AsyncContextManager as AsyncContextManager - from typing import Awaitable as Awaitable - from typing import Coroutine as Coroutine + from typing import ( + AsyncContextManager as AsyncContextManager, + AsyncIterable as AsyncIterable, + AsyncIterator as AsyncIterator, + Awaitable as Awaitable, + Coroutine as Coroutine, + ) if sys.version_info >= (3, 6): from typing import AsyncGenerator as AsyncGenerator def get_type_hints( - obj: Callable[..., Any], globalns: Optional[Dict[str, Any]] = ..., localns: Optional[Dict[str, Any]] = ..., - include_extras: bool = ... + obj: Callable[..., Any], + globalns: Optional[Dict[str, Any]] = ..., + localns: Optional[Dict[str, Any]] = ..., + include_extras: bool = ..., ) -> Dict[str, Any]: ... +if sys.version_info >= (3, 7): + def get_args(tp: Any) -> Tuple[Any, ...]: ... + def get_origin(tp: Any) -> Optional[Any]: ... + Annotated: _SpecialForm = ... _AnnotatedAlias: Any = ... # undocumented + +# TypeAlias is a (non-subscriptable) special form. +class TypeAlias: ... + +@runtime_checkable +class SupportsIndex(Protocol, metaclass=abc.ABCMeta): + @abc.abstractmethod + def __index__(self) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/tzlocal/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/tzlocal/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/tzlocal/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/tzlocal/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,4 @@ from pytz import BaseTzInfo def reload_localzone() -> None: ... - def get_localzone() -> BaseTzInfo: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_compat.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_compat.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_compat.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_compat.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,16 @@ import sys from typing import Any, Optional, Text -if sys.version_info < (3,): - import StringIO as BytesIO +if sys.version_info >= (3,): + from io import BytesIO as BytesIO, StringIO as StringIO + + NativeStringIO = StringIO else: - from io import StringIO as BytesIO + import cStringIO + from StringIO import StringIO as StringIO + + BytesIO = cStringIO.StringIO + NativeStringIO = BytesIO PY2: Any WIN: Any @@ -27,7 +33,6 @@ def implements_bool(cls): ... range_type: Any -NativeStringIO: Any def make_literal_wrapper(reference): ... def normalize_string_tuple(tup): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/cache.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/cache.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/cache.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/cache.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -48,8 +48,16 @@ class RedisCache(BaseCache): key_prefix: Any - def __init__(self, host: str = ..., port: int = ..., password: Optional[Any] = ..., db: int = ..., - default_timeout: float = ..., key_prefix: Optional[Any] = ..., **kwargs): ... + def __init__( + self, + host: str = ..., + port: int = ..., + password: Optional[Any] = ..., + db: int = ..., + default_timeout: float = ..., + key_prefix: Optional[Any] = ..., + **kwargs, + ): ... def dump_object(self, value): ... def load_object(self, value): ... def get(self, key): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/fixers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/fixers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/fixers.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/fixers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Iterable, List, Mapping, Optional, Sequence, Set, Text -from _typeshed.wsgi import WSGIApplication, WSGIEnvironment, StartResponse +from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import Any, Iterable, List, Mapping, Optional, Set, Text from ..middleware.proxy_fix import ProxyFix as ProxyFix @@ -21,7 +21,7 @@ remove_headers: Set[Text] add_headers: List[Text] def __init__( - self, app: WSGIApplication, remove_headers: Optional[Iterable[Text]] = ..., add_headers: Optional[Iterable[Text]] = ..., + self, app: WSGIApplication, remove_headers: Optional[Iterable[Text]] = ..., add_headers: Optional[Iterable[Text]] = ... ) -> None: ... def __call__(self, environ: WSGIEnvironment, start_response: StartResponse) -> Iterable[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/profiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/profiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/profiler.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/profiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import AnyStr, Generic, Tuple from _typeshed import SupportsWrite +from typing import AnyStr, Generic, Tuple from ..middleware.profiler import * diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/securecookie.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/securecookie.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/securecookie.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/securecookie.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,7 @@ -from typing import Any, Optional -from hmac import new as hmac from hashlib import sha1 as _default_hash +from hmac import new as hmac +from typing import Any, Optional + from werkzeug.contrib.sessions import ModificationTrackingDict class UnquoteError(Exception): ... @@ -23,6 +24,16 @@ def unserialize(cls, string, secret_key): ... @classmethod def load_cookie(cls, request, key: str = ..., secret_key: Optional[Any] = ...): ... - def save_cookie(self, response, key: str = ..., expires: Optional[Any] = ..., session_expires: Optional[Any] = ..., - max_age: Optional[Any] = ..., path: str = ..., domain: Optional[Any] = ..., secure: Optional[Any] = ..., - httponly: bool = ..., force: bool = ...): ... + def save_cookie( + self, + response, + key: str = ..., + expires: Optional[Any] = ..., + session_expires: Optional[Any] = ..., + max_age: Optional[Any] = ..., + path: str = ..., + domain: Optional[Any] = ..., + secure: Optional[Any] = ..., + httponly: bool = ..., + force: bool = ..., + ): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/sessions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/sessions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/sessions.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/sessions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any, Optional, Text, TypeVar + from werkzeug.datastructures import CallbackDict _K = TypeVar("_K") @@ -35,8 +36,14 @@ filename_template: str renew_missing: Any mode: Any - def __init__(self, path: Optional[Any] = ..., filename_template: Text = ..., session_class: Optional[Any] = ..., - renew_missing: bool = ..., mode: int = ...): ... + def __init__( + self, + path: Optional[Any] = ..., + filename_template: Text = ..., + session_class: Optional[Any] = ..., + renew_missing: bool = ..., + mode: int = ..., + ): ... def get_session_filename(self, sid): ... def save(self, session): ... def delete(self, session): ... @@ -54,7 +61,17 @@ cookie_secure: Any cookie_httponly: Any environ_key: Any - def __init__(self, app, store, cookie_name: str = ..., cookie_age: Optional[Any] = ..., cookie_expires: Optional[Any] = ..., - cookie_path: str = ..., cookie_domain: Optional[Any] = ..., cookie_secure: Optional[Any] = ..., - cookie_httponly: bool = ..., environ_key: str = ...): ... + def __init__( + self, + app, + store, + cookie_name: str = ..., + cookie_age: Optional[Any] = ..., + cookie_expires: Optional[Any] = ..., + cookie_path: str = ..., + cookie_domain: Optional[Any] = ..., + cookie_secure: Optional[Any] = ..., + cookie_httponly: bool = ..., + environ_key: str = ..., + ): ... def __call__(self, environ, start_response): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/testtools.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/testtools.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/testtools.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/contrib/testtools.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,3 @@ -from typing import Any from werkzeug.wrappers import Response class ContentAccessors: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/datastructures.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/datastructures.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/datastructures.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/datastructures.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,11 +1,11 @@ -import collections +from _typeshed import SupportsWrite from typing import ( + IO, Any, Callable, Container, Dict, Generic, - IO, Iterable, Iterator, List, @@ -20,7 +20,6 @@ Union, overload, ) -from _typeshed import SupportsWrite _K = TypeVar("_K") _V = TypeVar("_V") @@ -31,7 +30,7 @@ def iter_multi_items(mapping): ... def native_itermethods(names): ... -class ImmutableListMixin(object, Generic[_V]): +class ImmutableListMixin(Generic[_V]): def __hash__(self) -> int: ... def __reduce_ex__(self: _D, protocol) -> Tuple[Type[_D], List[_V]]: ... def __delitem__(self, key: _V) -> NoReturn: ... @@ -414,8 +413,9 @@ on_update: Any def __init__(self, auth_type: Optional[Any] = ..., values: Optional[Any] = ..., on_update: Optional[Any] = ...): ... def set_basic(self, realm: str = ...): ... - def set_digest(self, realm, nonce, qop=..., opaque: Optional[Any] = ..., algorithm: Optional[Any] = ..., - stale: bool = ...): ... + def set_digest( + self, realm, nonce, qop=..., opaque: Optional[Any] = ..., algorithm: Optional[Any] = ..., stale: bool = ... + ): ... def to_header(self): ... @staticmethod def auth_property(name, doc: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/console.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/console.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/console.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/console.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Optional import code +from typing import Any, Optional class HTMLStringO: def __init__(self): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/debug/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any, Optional + from werkzeug.wrappers import BaseRequest as Request, BaseResponse as Response PIN_TIME: Any @@ -25,9 +26,18 @@ secret: Any pin_logging: Any pin: Any - def __init__(self, app, evalex: bool = ..., request_key: str = ..., console_path: str = ..., - console_init_func: Optional[Any] = ..., show_hidden_frames: bool = ..., lodgeit_url: Optional[Any] = ..., - pin_security: bool = ..., pin_logging: bool = ...): ... + def __init__( + self, + app, + evalex: bool = ..., + request_key: str = ..., + console_path: str = ..., + console_init_func: Optional[Any] = ..., + show_hidden_frames: bool = ..., + lodgeit_url: Optional[Any] = ..., + pin_security: bool = ..., + pin_logging: bool = ..., + ): ... @property def pin_cookie_name(self): ... def debug_application(self, environ, start_response): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/exceptions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/exceptions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/exceptions.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/exceptions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ import datetime -from typing import Any, Dict, Tuple, List, Text, NoReturn, Optional, Protocol, Type, Union, Iterable +from _typeshed.wsgi import StartResponse, WSGIEnvironment +from typing import Any, Dict, Iterable, List, NoReturn, Optional, Protocol, Text, Tuple, Type, Union -from _typeshed.wsgi import WSGIEnvironment, StartResponse from werkzeug.wrappers import Response class _EnvironContainer(Protocol): @@ -148,10 +148,7 @@ class InternalServerError(HTTPException): def __init__( - self, - description: Optional[Text] = ..., - response: Optional[Response] = ..., - original_exception: Optional[Exception] = ..., + self, description: Optional[Text] = ..., response: Optional[Response] = ..., original_exception: Optional[Exception] = ... ) -> None: ... code: int description: Text diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/formparser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/formparser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/formparser.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/formparser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,20 @@ -from typing import Any, Optional, Text, Tuple, Callable, Iterable, TypeVar, NoReturn, Protocol, IO, Generator, Dict, Mapping, Union from _typeshed.wsgi import WSGIEnvironment +from typing import ( + IO, + Any, + Callable, + Dict, + Generator, + Iterable, + Mapping, + NoReturn, + Optional, + Protocol, + Text, + Tuple, + TypeVar, + Union, +) from .datastructures import Headers @@ -10,11 +25,11 @@ class _StreamFactory(Protocol): def __call__( - self, total_content_length: Optional[int], filename: str, content_type: str, content_length: Optional[int] = ..., + self, total_content_length: Optional[int], filename: str, content_type: str, content_length: Optional[int] = ... ) -> IO[bytes]: ... def default_stream_factory( - total_content_length: Optional[int], filename: str, content_type: str, content_length: Optional[int] = ..., + total_content_length: Optional[int], filename: str, content_type: str, content_length: Optional[int] = ... ) -> IO[bytes]: ... def parse_form_data( environ: WSGIEnvironment, @@ -49,7 +64,7 @@ def get_parse_func(self, mimetype: str, options: Any) -> Optional[_ParseFunc]: ... def parse_from_environ(self, environ: WSGIEnvironment) -> Tuple[IO[bytes], _Dict, _Dict]: ... def parse( - self, stream: IO[bytes], mimetype: Text, content_length: Optional[int], options: Optional[Mapping[str, str]] = ..., + self, stream: IO[bytes], mimetype: Text, content_length: Optional[int], options: Optional[Mapping[str, str]] = ... ) -> Tuple[IO[bytes], _Dict, _Dict]: ... parse_functions: Dict[Text, _ParseFunc] @@ -76,12 +91,12 @@ def get_part_encoding(self, headers: Mapping[str, str]) -> Optional[str]: ... def get_part_charset(self, headers: Mapping[str, str]) -> Text: ... def start_file_streaming( - self, filename: Union[Text, bytes], headers: Mapping[str, str], total_content_length: Optional[int], + self, filename: Union[Text, bytes], headers: Mapping[str, str], total_content_length: Optional[int] ) -> Tuple[Text, IO[bytes]]: ... def in_memory_threshold_reached(self, bytes: Any) -> NoReturn: ... def validate_boundary(self, boundary: Optional[str]) -> None: ... def parse_lines( - self, file: Any, boundary: bytes, content_length: int, cap_at_buffer: bool = ..., + self, file: Any, boundary: bytes, content_length: int, cap_at_buffer: bool = ... ) -> Generator[Tuple[str, Any], None, None]: ... def parse_parts(self, file: Any, boundary: bytes, content_length: int) -> Generator[Tuple[str, Any], None, None]: ... def parse(self, file: Any, boundary: bytes, content_length: int) -> Tuple[_Dict, _Dict]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/http.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/http.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/http.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/http.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,39 @@ import sys +from _typeshed.wsgi import WSGIEnvironment from datetime import datetime, timedelta from typing import ( - Dict, Text, Union, Tuple, Any, Optional, Mapping, Iterable, Callable, List, Type, - TypeVar, overload, SupportsInt, + Any, + Callable, + Dict, + Iterable, + List, + Mapping, + Optional, + SupportsInt, + Text, + Tuple, + Type, + TypeVar, + Union, + overload, ) -from _typeshed.wsgi import WSGIEnvironment from .datastructures import ( - Headers, Accept, RequestCacheControl, HeaderSet, Authorization, WWWAuthenticate, - IfRange, Range, ContentRange, ETags, TypeConversionDict, + Accept, + Authorization, + ContentRange, + ETags, + Headers, + HeaderSet, + IfRange, + Range, + RequestCacheControl, + TypeConversionDict, + WWWAuthenticate, ) if sys.version_info < (3,): - _Str = TypeVar('_Str', str, unicode) + _Str = TypeVar("_Str", str, unicode) _ToBytes = Union[bytes, bytearray, buffer, unicode] _ETagData = Union[str, unicode, bytearray, buffer, memoryview] else: @@ -40,6 +61,7 @@ def parse_options_header(value: None, multiple: bool = ...) -> Tuple[str, Dict[str, Optional[str]]]: ... @overload def parse_options_header(value: _Str) -> Tuple[_Str, Dict[_Str, Optional[_Str]]]: ... + # actually returns Tuple[_Str, Dict[_Str, Optional[_Str]], ...] @overload def parse_options_header(value: _Str, multiple: bool = ...) -> Tuple[Any, ...]: ... @@ -48,22 +70,27 @@ @overload def parse_accept_header(value: Optional[_Str], cls: Callable[[Optional[List[Tuple[str, float]]]], _T]) -> _T: ... @overload -def parse_cache_control_header(value: Union[None, bytes, Text], - on_update: Optional[Callable[[RequestCacheControl], Any]] = ...) -> RequestCacheControl: ... -@overload -def parse_cache_control_header(value: Union[None, bytes, Text], on_update: _T, - cls: Callable[[Dict[Text, Optional[Text]], _T], _U]) -> _U: ... -@overload -def parse_cache_control_header(value: Union[None, bytes, Text], *, - cls: Callable[[Dict[Text, Optional[Text]], None], _U]) -> _U: ... +def parse_cache_control_header( + value: Union[None, bytes, Text], on_update: Optional[Callable[[RequestCacheControl], Any]] = ... +) -> RequestCacheControl: ... +@overload +def parse_cache_control_header( + value: Union[None, bytes, Text], on_update: _T, cls: Callable[[Dict[Text, Optional[Text]], _T], _U] +) -> _U: ... +@overload +def parse_cache_control_header( + value: Union[None, bytes, Text], *, cls: Callable[[Dict[Text, Optional[Text]], None], _U] +) -> _U: ... def parse_set_header(value: Text, on_update: Optional[Callable[[HeaderSet], Any]] = ...) -> HeaderSet: ... def parse_authorization_header(value: Union[None, bytes, Text]) -> Optional[Authorization]: ... -def parse_www_authenticate_header(value: Union[None, bytes, Text], - on_update: Optional[Callable[[WWWAuthenticate], Any]] = ...) -> WWWAuthenticate: ... +def parse_www_authenticate_header( + value: Union[None, bytes, Text], on_update: Optional[Callable[[WWWAuthenticate], Any]] = ... +) -> WWWAuthenticate: ... def parse_if_range_header(value: Optional[Text]) -> IfRange: ... def parse_range_header(value: Optional[Text], make_inclusive: bool = ...) -> Optional[Range]: ... -def parse_content_range_header(value: Optional[Text], - on_update: Optional[Callable[[ContentRange], Any]] = ...) -> Optional[ContentRange]: ... +def parse_content_range_header( + value: Optional[Text], on_update: Optional[Callable[[ContentRange], Any]] = ... +) -> Optional[ContentRange]: ... def quote_etag(etag: _Str, weak: bool = ...) -> _Str: ... def unquote_etag(etag: Optional[_Str]) -> Tuple[Optional[_Str], Optional[_Str]]: ... def parse_etags(value: Optional[Text]) -> ETags: ... @@ -73,20 +100,38 @@ def http_date(timestamp: Union[None, float, datetime] = ...) -> str: ... def parse_age(value: Optional[SupportsInt] = ...) -> Optional[timedelta]: ... def dump_age(age: Union[None, timedelta, SupportsInt]) -> Optional[str]: ... -def is_resource_modified(environ: WSGIEnvironment, etag: Optional[Text] = ..., data: Optional[_ETagData] = ..., - last_modified: Union[None, Text, datetime] = ..., ignore_if_range: bool = ...) -> bool: ... +def is_resource_modified( + environ: WSGIEnvironment, + etag: Optional[Text] = ..., + data: Optional[_ETagData] = ..., + last_modified: Union[None, Text, datetime] = ..., + ignore_if_range: bool = ..., +) -> bool: ... def remove_entity_headers(headers: Union[List[Tuple[Text, Text]], Headers], allowed: Iterable[Text] = ...) -> None: ... def remove_hop_by_hop_headers(headers: Union[List[Tuple[Text, Text]], Headers]) -> None: ... def is_entity_header(header: Text) -> bool: ... def is_hop_by_hop_header(header: Text) -> bool: ... @overload -def parse_cookie(header: Union[None, WSGIEnvironment, Text, bytes], charset: Text = ..., - errors: Text = ...) -> TypeConversionDict[Any, Any]: ... -@overload -def parse_cookie(header: Union[None, WSGIEnvironment, Text, bytes], charset: Text = ..., - errors: Text = ..., cls: Optional[Callable[[Iterable[Tuple[Text, Text]]], _T]] = ...) -> _T: ... -def dump_cookie(key: _ToBytes, value: _ToBytes = ..., max_age: Union[None, float, timedelta] = ..., - expires: Union[None, Text, float, datetime] = ..., path: Union[None, Tuple[Any, ...], str, bytes] = ..., - domain: Union[None, str, bytes] = ..., secure: bool = ..., httponly: bool = ..., charset: Text = ..., - sync_expires: bool = ...) -> str: ... +def parse_cookie( + header: Union[None, WSGIEnvironment, Text, bytes], charset: Text = ..., errors: Text = ... +) -> TypeConversionDict[Any, Any]: ... +@overload +def parse_cookie( + header: Union[None, WSGIEnvironment, Text, bytes], + charset: Text = ..., + errors: Text = ..., + cls: Optional[Callable[[Iterable[Tuple[Text, Text]]], _T]] = ..., +) -> _T: ... +def dump_cookie( + key: _ToBytes, + value: _ToBytes = ..., + max_age: Union[None, float, timedelta] = ..., + expires: Union[None, Text, float, datetime] = ..., + path: Union[None, Tuple[Any, ...], str, bytes] = ..., + domain: Union[None, str, bytes] = ..., + secure: bool = ..., + httponly: bool = ..., + charset: Text = ..., + sync_expires: bool = ..., +) -> str: ... def is_byte_range_valid(start: Optional[int], stop: Optional[int], length: Optional[int]) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,28 +1,29 @@ from types import ModuleType from typing import Any -from werkzeug import _internal -from werkzeug import datastructures -from werkzeug import debug -from werkzeug import exceptions -from werkzeug import formparser -from werkzeug import http -from werkzeug import local -from werkzeug import security -from werkzeug import serving -from werkzeug import test -from werkzeug import testapp -from werkzeug import urls -from werkzeug import useragents -from werkzeug import utils -from werkzeug import wrappers -from werkzeug import wsgi +from werkzeug import ( + _internal, + datastructures, + debug, + exceptions, + formparser, + http, + local, + security, + serving, + test, + testapp, + urls, + useragents, + utils, + wrappers, + wsgi, +) class module(ModuleType): def __getattr__(self, name): ... def __dir__(self): ... - __version__: Any run_simple = serving.run_simple diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_internal.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_internal.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_internal.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/_internal.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -10,8 +10,15 @@ load_func: Any dump_func: Any __doc__: Any - def __init__(self, name, default: Optional[Any] = ..., load_func: Optional[Any] = ..., dump_func: Optional[Any] = ..., - read_only: Optional[Any] = ..., doc: Optional[Any] = ...): ... + def __init__( + self, + name, + default: Optional[Any] = ..., + load_func: Optional[Any] = ..., + dump_func: Optional[Any] = ..., + read_only: Optional[Any] = ..., + doc: Optional[Any] = ..., + ): ... def __get__(self, obj, type: Optional[Any] = ...): ... def __set__(self, obj, value): ... def __delete__(self, obj): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/dispatcher.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/dispatcher.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/dispatcher.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/dispatcher.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Iterable, Mapping, Optional, Text from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import Iterable, Mapping, Optional, Text class DispatcherMiddleware(object): app: WSGIApplication diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/http_proxy.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/http_proxy.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/http_proxy.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/http_proxy.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Any, Dict, Iterable, Mapping, MutableMapping, Text from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import Any, Dict, Iterable, Mapping, MutableMapping, Text _Opts = Mapping[Text, Any] _MutableOpts = MutableMapping[Text, Any] @@ -8,11 +8,7 @@ app: WSGIApplication targets: Dict[Text, _MutableOpts] def __init__( - self, - app: WSGIApplication, - targets: Mapping[Text, _MutableOpts], - chunk_size: int = ..., - timeout: int = ..., + self, app: WSGIApplication, targets: Mapping[Text, _MutableOpts], chunk_size: int = ..., timeout: int = ... ) -> None: ... def proxy_to(self, opts: _Opts, path: Text, prefix: Text) -> WSGIApplication: ... def __call__(self, environ: WSGIEnvironment, start_response: StartResponse) -> Iterable[bytes]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/lint.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/lint.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/lint.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/lint.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,7 @@ import sys -from typing import Any, Iterable, Iterator, List, Mapping, Optional, Protocol, Tuple from _typeshed import SupportsWrite from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import Any, Iterable, Iterator, List, Mapping, Optional, Protocol, Tuple from ..datastructures import Headers @@ -55,10 +55,7 @@ def __init__(self, app: WSGIApplication) -> None: ... def check_environ(self, environ: WSGIEnvironment) -> None: ... def check_start_response( - self, - status: str, - headers: List[Tuple[str, str]], - exc_info: Optional[Tuple[Any, ...]], + self, status: str, headers: List[Tuple[str, str]], exc_info: Optional[Tuple[Any, ...]] ) -> Tuple[int, Headers]: ... def check_headers(self, headers: Mapping[str, str]) -> None: ... def check_iterator(self, app_iter: Iterable[bytes]) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/profiler.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/profiler.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/profiler.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/profiler.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import IO, Iterable, List, Optional, Text, Tuple, Union from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import IO, Iterable, List, Optional, Text, Tuple, Union class ProfilerMiddleware(object): def __init__( diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/proxy_fix.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/proxy_fix.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/proxy_fix.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/proxy_fix.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,5 @@ -from typing import Iterable, Optional from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import Iterable, Optional class ProxyFix(object): app: WSGIApplication diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/shared_data.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/shared_data.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/shared_data.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/middleware/shared_data.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,6 @@ import datetime -from typing import Callable, IO, Iterable, List, Mapping, Optional, Text, Tuple, Union from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment +from typing import IO, Callable, Iterable, List, Mapping, Optional, Text, Tuple, Union _V = Union[Tuple[Text, Text], Text] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/posixemulation.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/posixemulation.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/posixemulation.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/posixemulation.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any + from ._compat import to_unicode as to_unicode from .filesystem import get_filesystem_encoding as get_filesystem_encoding diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/routing.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/routing.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/routing.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/routing.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any, Optional, Text + from werkzeug.exceptions import HTTPException def parse_converter_args(argstr): ... @@ -76,9 +77,19 @@ endpoint: Any redirect_to: Any arguments: Any - def __init__(self, string, defaults: Optional[Any] = ..., subdomain: Optional[Any] = ..., methods: Optional[Any] = ..., - build_only: bool = ..., endpoint: Optional[Any] = ..., strict_slashes: Optional[Any] = ..., - redirect_to: Optional[Any] = ..., alias: bool = ..., host: Optional[Any] = ...): ... + def __init__( + self, + string, + defaults: Optional[Any] = ..., + subdomain: Optional[Any] = ..., + methods: Optional[Any] = ..., + build_only: bool = ..., + endpoint: Optional[Any] = ..., + strict_slashes: Optional[Any] = ..., + redirect_to: Optional[Any] = ..., + alias: bool = ..., + host: Optional[Any] = ..., + ): ... def empty(self): ... def get_empty_kwargs(self): ... def get_rules(self, map): ... @@ -151,15 +162,32 @@ converters: Any sort_parameters: Any sort_key: Any - def __init__(self, rules: Optional[Any] = ..., default_subdomain: str = ..., charset: Text = ..., - strict_slashes: bool = ..., redirect_defaults: bool = ..., converters: Optional[Any] = ..., - sort_parameters: bool = ..., sort_key: Optional[Any] = ..., encoding_errors: Text = ..., - host_matching: bool = ...): ... + def __init__( + self, + rules: Optional[Any] = ..., + default_subdomain: str = ..., + charset: Text = ..., + strict_slashes: bool = ..., + redirect_defaults: bool = ..., + converters: Optional[Any] = ..., + sort_parameters: bool = ..., + sort_key: Optional[Any] = ..., + encoding_errors: Text = ..., + host_matching: bool = ..., + ): ... def is_endpoint_expecting(self, endpoint, *arguments): ... def iter_rules(self, endpoint: Optional[Any] = ...): ... def add(self, rulefactory): ... - def bind(self, server_name, script_name: Optional[Any] = ..., subdomain: Optional[Any] = ..., url_scheme: str = ..., - default_method: str = ..., path_info: Optional[Any] = ..., query_args: Optional[Any] = ...): ... + def bind( + self, + server_name, + script_name: Optional[Any] = ..., + subdomain: Optional[Any] = ..., + url_scheme: str = ..., + default_method: str = ..., + path_info: Optional[Any] = ..., + query_args: Optional[Any] = ..., + ): ... def bind_to_environ(self, environ, server_name: Optional[Any] = ..., subdomain: Optional[Any] = ...): ... def update(self): ... @@ -172,12 +200,19 @@ path_info: Any default_method: Any query_args: Any - def __init__(self, map, server_name, script_name, subdomain, url_scheme, path_info, default_method, - query_args: Optional[Any] = ...): ... - def dispatch(self, view_func, path_info: Optional[Any] = ..., method: Optional[Any] = ..., - catch_http_exceptions: bool = ...): ... - def match(self, path_info: Optional[Any] = ..., method: Optional[Any] = ..., return_rule: bool = ..., - query_args: Optional[Any] = ...): ... + def __init__( + self, map, server_name, script_name, subdomain, url_scheme, path_info, default_method, query_args: Optional[Any] = ... + ): ... + def dispatch( + self, view_func, path_info: Optional[Any] = ..., method: Optional[Any] = ..., catch_http_exceptions: bool = ... + ): ... + def match( + self, + path_info: Optional[Any] = ..., + method: Optional[Any] = ..., + return_rule: bool = ..., + query_args: Optional[Any] = ..., + ): ... def test(self, path_info: Optional[Any] = ..., method: Optional[Any] = ...): ... def allowed_methods(self, path_info: Optional[Any] = ...): ... def get_host(self, domain_part): ... @@ -185,5 +220,11 @@ def encode_query_args(self, query_args): ... def make_redirect_url(self, path_info, query_args: Optional[Any] = ..., domain_part: Optional[Any] = ...): ... def make_alias_redirect_url(self, path, endpoint, values, method, query_args): ... - def build(self, endpoint, values: Optional[Any] = ..., method: Optional[Any] = ..., force_external: bool = ..., - append_unknown: bool = ...): ... + def build( + self, + endpoint, + values: Optional[Any] = ..., + method: Optional[Any] = ..., + force_external: bool = ..., + append_unknown: bool = ..., + ): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/script.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/script.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/script.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/script.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -9,6 +9,16 @@ def print_usage(actions): ... def analyse_action(func): ... def make_shell(init_func: Optional[Any] = ..., banner: Optional[Any] = ..., use_ipython: bool = ...): ... -def make_runserver(app_factory, hostname: str = ..., port: int = ..., use_reloader: bool = ..., use_debugger: bool = ..., - use_evalex: bool = ..., threaded: bool = ..., processes: int = ..., static_files: Optional[Any] = ..., - extra_files: Optional[Any] = ..., ssl_context: Optional[Any] = ...): ... +def make_runserver( + app_factory, + hostname: str = ..., + port: int = ..., + use_reloader: bool = ..., + use_debugger: bool = ..., + use_evalex: bool = ..., + threaded: bool = ..., + processes: int = ..., + static_files: Optional[Any] = ..., + extra_files: Optional[Any] = ..., + ssl_context: Optional[Any] = ..., +): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/serving.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/serving.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/serving.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/serving.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,14 +2,15 @@ from typing import Any, Optional if sys.version_info < (3,): + from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer from SocketServer import ThreadingMixIn - from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler else: + from http.server import BaseHTTPRequestHandler, HTTPServer from socketserver import ThreadingMixIn - from http.server import HTTPServer, BaseHTTPRequestHandler if sys.platform == "win32": class ForkingMixIn(object): ... + else: if sys.version_info < (3,): from SocketServer import ForkingMixIn as ForkingMixIn @@ -72,8 +73,16 @@ socket: Any server_address: Any ssl_context: Any - def __init__(self, host, port, app, handler: Optional[Any] = ..., passthrough_errors: bool = ..., - ssl_context: Optional[Any] = ..., fd: Optional[Any] = ...): ... + def __init__( + self, + host, + port, + app, + handler: Optional[Any] = ..., + passthrough_errors: bool = ..., + ssl_context: Optional[Any] = ..., + fd: Optional[Any] = ..., + ): ... def log(self, type, message, *args): ... def serve_forever(self): ... def handle_error(self, request, client_address): ... @@ -86,16 +95,46 @@ class ForkingWSGIServer(ForkingMixIn, BaseWSGIServer): multiprocess: Any max_children: Any - def __init__(self, host, port, app, processes: int = ..., handler: Optional[Any] = ..., passthrough_errors: bool = ..., - ssl_context: Optional[Any] = ..., fd: Optional[Any] = ...): ... - -def make_server(host: Optional[Any] = ..., port: Optional[Any] = ..., app: Optional[Any] = ..., threaded: bool = ..., - processes: int = ..., request_handler: Optional[Any] = ..., passthrough_errors: bool = ..., - ssl_context: Optional[Any] = ..., fd: Optional[Any] = ...): ... + def __init__( + self, + host, + port, + app, + processes: int = ..., + handler: Optional[Any] = ..., + passthrough_errors: bool = ..., + ssl_context: Optional[Any] = ..., + fd: Optional[Any] = ..., + ): ... + +def make_server( + host: Optional[Any] = ..., + port: Optional[Any] = ..., + app: Optional[Any] = ..., + threaded: bool = ..., + processes: int = ..., + request_handler: Optional[Any] = ..., + passthrough_errors: bool = ..., + ssl_context: Optional[Any] = ..., + fd: Optional[Any] = ..., +): ... def is_running_from_reloader(): ... -def run_simple(hostname, port, application, use_reloader: bool = ..., use_debugger: bool = ..., use_evalex: bool = ..., - extra_files: Optional[Any] = ..., reloader_interval: int = ..., reloader_type: str = ..., threaded: bool = ..., - processes: int = ..., request_handler: Optional[Any] = ..., static_files: Optional[Any] = ..., - passthrough_errors: bool = ..., ssl_context: Optional[Any] = ...): ... +def run_simple( + hostname, + port, + application, + use_reloader: bool = ..., + use_debugger: bool = ..., + use_evalex: bool = ..., + extra_files: Optional[Any] = ..., + reloader_interval: int = ..., + reloader_type: str = ..., + threaded: bool = ..., + processes: int = ..., + request_handler: Optional[Any] = ..., + static_files: Optional[Any] = ..., + passthrough_errors: bool = ..., + ssl_context: Optional[Any] = ..., +): ... def run_with_reloader(*args, **kwargs): ... def main(): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/testapp.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/testapp.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/testapp.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/testapp.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ from typing import Any + from werkzeug.wrappers import BaseRequest as Request, BaseResponse as Response logo: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/test.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/test.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/test.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/test.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -4,14 +4,15 @@ from typing_extensions import Literal if sys.version_info < (3,): - from urllib2 import Request as U2Request from cookielib import CookieJar + from urllib2 import Request as U2Request else: - from urllib.request import Request as U2Request from http.cookiejar import CookieJar + from urllib.request import Request as U2Request -def stream_encode_multipart(values, use_tempfile: int = ..., threshold=..., boundary: Optional[Any] = ..., - charset: Text = ...): ... +def stream_encode_multipart( + values, use_tempfile: int = ..., threshold=..., boundary: Optional[Any] = ..., charset: Text = ... +): ... def encode_multipart(values, boundary: Optional[Any] = ..., charset: Text = ...): ... def File(fd, filename: Optional[Any] = ..., mimetype: Optional[Any] = ...): ... @@ -51,98 +52,118 @@ input_stream: Any content_length: Any closed: Any - def __init__(self, path: str = ..., base_url: Optional[Any] = ..., query_string: Optional[Any] = ..., - method: str = ..., input_stream: Optional[Any] = ..., content_type: Optional[Any] = ..., - content_length: Optional[Any] = ..., errors_stream: Optional[Any] = ..., multithread: bool = ..., - multiprocess: bool = ..., run_once: bool = ..., headers: Optional[Any] = ..., data: Optional[Any] = ..., - environ_base: Optional[Any] = ..., environ_overrides: Optional[Any] = ..., charset: Text = ...): ... + def __init__( + self, + path: str = ..., + base_url: Optional[Any] = ..., + query_string: Optional[Any] = ..., + method: str = ..., + input_stream: Optional[Any] = ..., + content_type: Optional[Any] = ..., + content_length: Optional[Any] = ..., + errors_stream: Optional[Any] = ..., + multithread: bool = ..., + multiprocess: bool = ..., + run_once: bool = ..., + headers: Optional[Any] = ..., + data: Optional[Any] = ..., + environ_base: Optional[Any] = ..., + environ_overrides: Optional[Any] = ..., + charset: Text = ..., + ): ... form: Any files: Any @property - def server_name(self): ... + def server_name(self) -> str: ... @property - def server_port(self): ... - def __del__(self): ... - def close(self): ... - def get_environ(self): ... + def server_port(self) -> int: ... + def __del__(self) -> None: ... + def close(self) -> None: ... + def get_environ(self) -> WSGIEnvironment: ... def get_request(self, cls: Optional[Any] = ...): ... class ClientRedirectError(Exception): ... # Response type for the client below. # By default _R is Tuple[Iterable[Any], Union[Text, int], datastructures.Headers] -_R = TypeVar('_R') +_R = TypeVar("_R") class Client(Generic[_R]): application: Any response_wrapper: Optional[Type[_R]] cookie_jar: Any allow_subdomain_redirects: Any - def __init__(self, application, response_wrapper: Optional[Type[_R]] = ..., use_cookies: bool = ..., - allow_subdomain_redirects: bool = ...): ... - def set_cookie(self, server_name, key, value: str = ..., max_age: Optional[Any] = ..., expires: Optional[Any] = ..., - path: str = ..., domain: Optional[Any] = ..., secure: Optional[Any] = ..., httponly: bool = ..., - charset: Text = ...): ... + def __init__( + self, + application, + response_wrapper: Optional[Type[_R]] = ..., + use_cookies: bool = ..., + allow_subdomain_redirects: bool = ..., + ): ... + def set_cookie( + self, + server_name, + key, + value: str = ..., + max_age: Optional[Any] = ..., + expires: Optional[Any] = ..., + path: str = ..., + domain: Optional[Any] = ..., + secure: Optional[Any] = ..., + httponly: bool = ..., + charset: Text = ..., + ): ... def delete_cookie(self, server_name, key, path: str = ..., domain: Optional[Any] = ...): ... def run_wsgi_app(self, environ, buffered: bool = ...): ... def resolve_redirect(self, response, new_location, environ, buffered: bool = ...): ... - @overload def open(self, *args, as_tuple: Literal[True], **kwargs) -> Tuple[WSGIEnvironment, _R]: ... @overload def open(self, *args, as_tuple: Literal[False] = ..., **kwargs) -> _R: ... @overload def open(self, *args, as_tuple: bool, **kwargs) -> Any: ... - @overload def get(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def get(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def get(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def patch(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def patch(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def patch(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def post(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def post(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def post(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def head(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def head(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def head(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def put(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def put(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def put(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def delete(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def delete(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def delete(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def options(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload def options(self, *args, as_tuple: Literal[False] = ..., **kw) -> _R: ... @overload def options(self, *args, as_tuple: bool, **kw) -> Any: ... - @overload def trace(self, *args, as_tuple: Literal[True], **kw) -> Tuple[WSGIEnvironment, _R]: ... @overload diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/urls.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/urls.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/urls.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/urls.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -50,15 +50,38 @@ def url_fix(s, charset: Text = ...): ... def uri_to_iri(uri, charset: Text = ..., errors: Text = ...): ... def iri_to_uri(iri, charset: Text = ..., errors: Text = ..., safe_conversion: bool = ...): ... -def url_decode(s, charset: Text = ..., decode_keys: bool = ..., include_empty: bool = ..., errors: Text = ..., - separator: str = ..., cls: Optional[Any] = ...): ... -def url_decode_stream(stream, charset: Text = ..., decode_keys: bool = ..., include_empty: bool = ..., errors: Text = ..., - separator: str = ..., cls: Optional[Any] = ..., limit: Optional[Any] = ..., - return_iterator: bool = ...): ... -def url_encode(obj, charset: Text = ..., encode_keys: bool = ..., sort: bool = ..., key: Optional[Any] = ..., - separator: bytes = ...): ... -def url_encode_stream(obj, stream: Optional[Any] = ..., charset: Text = ..., encode_keys: bool = ..., sort: bool = ..., - key: Optional[Any] = ..., separator: bytes = ...): ... +def url_decode( + s, + charset: Text = ..., + decode_keys: bool = ..., + include_empty: bool = ..., + errors: Text = ..., + separator: str = ..., + cls: Optional[Any] = ..., +): ... +def url_decode_stream( + stream, + charset: Text = ..., + decode_keys: bool = ..., + include_empty: bool = ..., + errors: Text = ..., + separator: str = ..., + cls: Optional[Any] = ..., + limit: Optional[Any] = ..., + return_iterator: bool = ..., +): ... +def url_encode( + obj, charset: Text = ..., encode_keys: bool = ..., sort: bool = ..., key: Optional[Any] = ..., separator: bytes = ... +): ... +def url_encode_stream( + obj, + stream: Optional[Any] = ..., + charset: Text = ..., + encode_keys: bool = ..., + sort: bool = ..., + key: Optional[Any] = ..., + separator: bytes = ..., +): ... def url_join(base, url, allow_fragments: bool = ...): ... class Href: diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/useragents.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/useragents.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/useragents.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/useragents.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,4 @@ -from typing import Any +from typing import Any, Optional class UserAgentParser: platforms: Any @@ -8,6 +8,10 @@ class UserAgent: string: Any + platform: Optional[str] + browser: Optional[str] + version: Optional[str] + language: Optional[str] def __init__(self, environ_or_string): ... def to_header(self): ... def __nonzero__(self): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/utils.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,4 +1,5 @@ -from typing import Any, Optional, overload, Type, TypeVar +from typing import Any, Optional, Text, Type, TypeVar, overload + from werkzeug._internal import _DictAccessorProperty from werkzeug.wrappers import Response @@ -28,7 +29,7 @@ def get_content_type(mimetype, charset): ... def format_string(string, context): ... -def secure_filename(filename): ... +def secure_filename(filename: Text) -> Text: ... def escape(s, quote: Optional[Any] = ...): ... def unescape(s): ... @@ -39,7 +40,6 @@ def redirect(location, code: int = ..., Response: None = ...) -> Response: ... @overload def redirect(location, code: int = ..., Response: Type[_RC] = ...) -> _RC: ... - def append_slash_redirect(environ, code: int = ...): ... def import_string(import_name, silent: bool = ...): ... def find_modules(import_path, include_packages: bool = ..., recursive: bool = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wrappers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wrappers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wrappers.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wrappers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,15 +1,36 @@ -import sys +from _typeshed.wsgi import InputStream, WSGIEnvironment from datetime import datetime from typing import ( - Any, Callable, Iterable, Iterator, Mapping, MutableMapping, Optional, Sequence, Text, Tuple, Type, TypeVar, Union, overload + Any, + Callable, + Iterable, + Iterator, + Mapping, + MutableMapping, + Optional, + Sequence, + Text, + Tuple, + Type, + TypeVar, + Union, + overload, ) from typing_extensions import Literal -from _typeshed.wsgi import WSGIEnvironment, InputStream from .datastructures import ( - Authorization, CombinedMultiDict, EnvironHeaders, Headers, ImmutableMultiDict, - MultiDict, ImmutableTypeConversionDict, HeaderSet, - Accept, MIMEAccept, CharsetAccept, LanguageAccept, + Accept, + Authorization, + CharsetAccept, + CombinedMultiDict, + EnvironHeaders, + Headers, + HeaderSet, + ImmutableMultiDict, + ImmutableTypeConversionDict, + LanguageAccept, + MIMEAccept, + MultiDict, ) from .useragents import UserAgent @@ -83,13 +104,13 @@ is_multiprocess: bool is_run_once: bool -_OnCloseT = TypeVar('_OnCloseT', bound=Callable[[], Any]) -_SelfT = TypeVar('_SelfT', bound=BaseResponse) +_OnCloseT = TypeVar("_OnCloseT", bound=Callable[[], Any]) +_SelfT = TypeVar("_SelfT", bound=BaseResponse) class BaseResponse: charset: str default_status: int - default_mimetype: str + default_mimetype: Optional[str] implicit_sequence_conversion: bool autocorrect_location_header: bool automatically_set_content_length: bool @@ -98,14 +119,15 @@ status: str direct_passthrough: bool response: Iterable[bytes] - def __init__(self, response: Optional[Union[str, bytes, bytearray, Iterable[str], Iterable[bytes]]] = ..., - status: Optional[Union[Text, int]] = ..., - headers: Optional[Union[Headers, - Mapping[Text, Text], - Sequence[Tuple[Text, Text]]]] = ..., - mimetype: Optional[Text] = ..., - content_type: Optional[Text] = ..., - direct_passthrough: bool = ...) -> None: ... + def __init__( + self, + response: Optional[Union[str, bytes, bytearray, Iterable[str], Iterable[bytes]]] = ..., + status: Optional[Union[Text, int]] = ..., + headers: Optional[Union[Headers, Mapping[Text, Text], Sequence[Tuple[Text, Text]]]] = ..., + mimetype: Optional[Text] = ..., + content_type: Optional[Text] = ..., + direct_passthrough: bool = ..., + ) -> None: ... def call_on_close(self, func: _OnCloseT) -> _OnCloseT: ... @classmethod def force_type(cls: Type[_SelfT], response: object, environ: Optional[WSGIEnvironment] = ...) -> _SelfT: ... @@ -122,8 +144,18 @@ def calculate_content_length(self) -> Optional[int]: ... def make_sequence(self) -> None: ... def iter_encoded(self) -> Iterator[bytes]: ... - def set_cookie(self, key, value: str = ..., max_age: Optional[Any] = ..., expires: Optional[Any] = ..., - path: str = ..., domain: Optional[Any] = ..., secure: bool = ..., httponly: bool = ..., samesite: Optional[str] = ...): ... + def set_cookie( + self, + key: str, + value: Union[str, bytes] = ..., + max_age: Optional[int] = ..., + expires: Optional[int] = ..., + path: str = ..., + domain: Optional[str] = ..., + secure: bool = ..., + httponly: bool = ..., + samesite: Optional[str] = ..., + ) -> None: ... def delete_cookie(self, key, path: str = ..., domain: Optional[Any] = ...): ... @property def is_streamed(self) -> bool: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wsgi.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wsgi.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wsgi.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/2and3/werkzeug/wsgi.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,14 +1,15 @@ -from typing import Any, Optional, Iterable, Text from _typeshed import SupportsRead -from _typeshed.wsgi import WSGIEnvironment, InputStream +from _typeshed.wsgi import InputStream, WSGIEnvironment +from typing import Any, Iterable, Optional, Text from .middleware.dispatcher import DispatcherMiddleware as DispatcherMiddleware from .middleware.http_proxy import ProxyMiddleware as ProxyMiddleware from .middleware.shared_data import SharedDataMiddleware as SharedDataMiddleware def responder(f): ... -def get_current_url(environ, root_only: bool = ..., strip_querystring: bool = ..., host_only: bool = ..., - trusted_hosts: Optional[Any] = ...): ... +def get_current_url( + environ, root_only: bool = ..., strip_querystring: bool = ..., host_only: bool = ..., trusted_hosts: Optional[Any] = ... +): ... def host_is_trusted(hostname, trusted_list): ... def get_host(environ, trusted_hosts: Optional[Any] = ...): ... def get_content_length(environ: WSGIEnvironment) -> Optional[int]: ... @@ -18,8 +19,9 @@ def get_script_name(environ, charset: Text = ..., errors: Text = ...): ... def pop_path_info(environ, charset: Text = ..., errors: Text = ...): ... def peek_path_info(environ, charset: Text = ..., errors: Text = ...): ... -def extract_path_info(environ_or_baseurl, path_or_url, charset: Text = ..., errors: Text = ..., - collapse_http_schemes: bool = ...): ... +def extract_path_info( + environ_or_baseurl, path_or_url, charset: Text = ..., errors: Text = ..., collapse_http_schemes: bool = ... +): ... class ClosingIterator: def __init__(self, iterable, callbacks: Optional[Any] = ...): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/base.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/base.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/base.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/base.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,35 @@ +from types import CodeType, FrameType, TracebackType, coroutine +from typing import Any, Coroutine, Generator, Generic, Iterator, Optional, Type, TypeVar, Union + +_T = TypeVar("_T") +_T_co = TypeVar("_T_co", covariant=True) +_V_co = TypeVar("_V_co", covariant=True) +_T_contra = TypeVar("_T_contra", contravariant=True) + +class AsyncBase(Generic[_T]): + def __init__(self, file: str, loop: Any, executor: Any) -> None: ... + async def __aiter__(self) -> Iterator[_T]: ... + async def __anext__(self) -> _T: ... + +class AiofilesContextManager(Generic[_T_co, _T_contra, _V_co]): + def __init__(self, coro: Coroutine[_T_co, _T_contra, _V_co]) -> None: ... + def send(self, value: _T_contra) -> _T_co: ... + def throw( + self, typ: Type[BaseException], val: Union[BaseException, object] = ..., tb: Optional[TracebackType] = ... + ) -> _T_co: ... + def close(self) -> None: ... + @property + def gi_frame(self) -> FrameType: ... + @property + def gi_running(self) -> bool: ... + @property + def gi_code(self) -> CodeType: ... + def __next__(self) -> _T_co: ... + @coroutine + def __iter__(self) -> Iterator[Coroutine[_T_co, _T_contra, _V_co]]: ... + def __await__(self) -> Generator[Any, None, _V_co]: ... + async def __anext__(self) -> _V_co: ... + async def __aenter__(self) -> _V_co: ... + async def __aexit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + ) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .threadpool import open as open diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/os.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/os.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/os.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/os.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,26 @@ +import sys +from _typeshed import AnyPath +from os import stat_result +from typing import Optional, Sequence, Union, overload + +_FdOrAnyPath = Union[int, AnyPath] + +async def stat(path: _FdOrAnyPath, *, dir_fd: Optional[int] = ..., follow_symlinks: bool = ...) -> stat_result: ... +async def rename(src: AnyPath, dst: AnyPath, *, src_dir_fd: Optional[int] = ..., dst_dir_fd: Optional[int] = ...) -> None: ... +async def remove(path: AnyPath, *, dir_fd: Optional[int] = ...) -> None: ... +async def mkdir(path: AnyPath, mode: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... +async def rmdir(path: AnyPath, *, dir_fd: Optional[int] = ...) -> None: ... + +if sys.platform != "win32": + @overload + async def sendfile(__out_fd: int, __in_fd: int, offset: Optional[int], count: int) -> int: ... + @overload + async def sendfile( + __out_fd: int, + __in_fd: int, + offset: int, + count: int, + headers: Sequence[bytes] = ..., + trailers: Sequence[bytes] = ..., + flags: int = ..., + ) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/binary.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/binary.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/binary.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/binary.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,41 @@ +from _typeshed import AnyPath, ReadableBuffer, WriteableBuffer +from io import FileIO +from typing import Iterable, List, Optional, Union + +from ..base import AsyncBase + +class _UnknownAsyncBinaryIO(AsyncBase[bytes]): + async def close(self) -> None: ... + async def flush(self) -> None: ... + async def isatty(self) -> bool: ... + async def read(self, __size: int = ...) -> bytes: ... + async def readinto(self, __buffer: WriteableBuffer) -> Optional[int]: ... + async def readline(self, __size: Optional[int] = ...) -> bytes: ... + async def readlines(self, __hint: int = ...) -> List[bytes]: ... + async def seek(self, __offset: int, __whence: int = ...) -> int: ... + async def seekable(self) -> bool: ... + async def tell(self) -> int: ... + async def truncate(self, __size: Optional[int] = ...) -> int: ... + async def writable(self) -> bool: ... + async def write(self, __b: ReadableBuffer) -> int: ... + async def writelines(self, __lines: Iterable[ReadableBuffer]) -> None: ... + def fileno(self) -> int: ... + def readable(self) -> bool: ... + @property + def closed(self) -> bool: ... + @property + def mode(self) -> str: ... + @property + def name(self) -> Union[AnyPath, int]: ... + +class AsyncBufferedIOBase(_UnknownAsyncBinaryIO): + async def read1(self, __size: int = ...) -> bytes: ... + def detach(self) -> FileIO: ... + @property + def raw(self) -> FileIO: ... + +class AsyncBufferedReader(AsyncBufferedIOBase): + async def peek(self, __size: int = ...) -> bytes: ... + +class AsyncFileIO(_UnknownAsyncBinaryIO): + async def readall(self) -> bytes: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,91 @@ +from _typeshed import AnyPath, OpenBinaryMode, OpenBinaryModeReading, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenTextMode +from asyncio import AbstractEventLoop +from typing import Any, Callable, Optional, TypeVar, Union, overload +from typing_extensions import Literal + +from ..base import AiofilesContextManager +from .binary import AsyncBufferedIOBase, AsyncBufferedReader, AsyncFileIO, _UnknownAsyncBinaryIO +from .text import AsyncTextIOWrapper + +_OpenFile = TypeVar("_OpenFile", bound=Union[AnyPath, int]) +_Opener = Callable[[str, int], int] + +# Text mode: always returns AsyncTextIOWrapper +@overload +def open( + file: _OpenFile, + mode: OpenTextMode = ..., + buffering: int = ..., + encoding: Optional[str] = ..., + errors: Optional[str] = ..., + newline: Optional[str] = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., + *, + loop: Optional[AbstractEventLoop] = ..., + executor: Optional[Any] = ..., +) -> AiofilesContextManager[None, None, AsyncTextIOWrapper]: ... + +# Unbuffered binary: returns a FileIO +@overload +def open( + file: _OpenFile, + mode: OpenBinaryMode, + buffering: Literal[0], + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., + *, + loop: Optional[AbstractEventLoop] = ..., + executor: Optional[Any] = ..., +) -> AiofilesContextManager[None, None, AsyncFileIO]: ... + +# Buffered binary reading/updating: AsyncBufferedReader +@overload +def open( + file: _OpenFile, + mode: Union[OpenBinaryModeReading, OpenBinaryModeUpdating], + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., + *, + loop: Optional[AbstractEventLoop] = ..., + executor: Optional[Any] = ..., +) -> AiofilesContextManager[None, None, AsyncBufferedReader]: ... + +# Buffered binary writing: AsyncBufferedIOBase +@overload +def open( + file: _OpenFile, + mode: OpenBinaryModeWriting, + buffering: Literal[-1, 1] = ..., + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., + *, + loop: Optional[AbstractEventLoop] = ..., + executor: Optional[Any] = ..., +) -> AiofilesContextManager[None, None, AsyncBufferedIOBase]: ... + +# Buffering cannot be determined: fall back to _UnknownAsyncBinaryIO +@overload +def open( + file: _OpenFile, + mode: OpenBinaryMode, + buffering: int, + encoding: None = ..., + errors: None = ..., + newline: None = ..., + closefd: bool = ..., + opener: Optional[_Opener] = ..., + *, + loop: Optional[AbstractEventLoop] = ..., + executor: Optional[Any] = ..., +) -> AiofilesContextManager[None, None, _UnknownAsyncBinaryIO]: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/text.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/text.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/text.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/aiofiles/threadpool/text.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,38 @@ +from _typeshed import AnyPath +from typing import BinaryIO, Iterable, List, Optional, Tuple, Union + +from ..base import AsyncBase + +class AsyncTextIOWrapper(AsyncBase[str]): + async def close(self) -> None: ... + async def flush(self) -> None: ... + async def isatty(self) -> bool: ... + async def read(self, __size: Optional[int] = ...) -> str: ... + async def readline(self, __size: int = ...) -> str: ... + async def readlines(self, __hint: int = ...) -> List[str]: ... + async def seek(self, __offset: int, __whence: int = ...) -> int: ... + async def seekable(self) -> bool: ... + async def tell(self) -> int: ... + async def truncate(self, __size: Optional[int] = ...) -> int: ... + async def writable(self) -> bool: ... + async def write(self, __b: str) -> int: ... + async def writelines(self, __lines: Iterable[str]) -> None: ... + def detach(self) -> BinaryIO: ... + def fileno(self) -> int: ... + def readable(self) -> bool: ... + @property + def buffer(self) -> BinaryIO: ... + @property + def closed(self) -> bool: ... + @property + def encoding(self) -> str: ... + @property + def errors(self) -> Optional[str]: ... + @property + def line_buffering(self) -> bool: ... + @property + def newlines(self) -> Union[str, Tuple[str, ...], None]: ... + @property + def name(self) -> Union[AnyPath, int]: ... + @property + def mode(self) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/contextvars.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/contextvars.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/contextvars.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/contextvars.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,10 @@ +import sys from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar -_T = TypeVar('_T') +if sys.version_info >= (3, 9): + from types import GenericAlias + +_T = TypeVar("_T") class ContextVar(Generic[_T]): def __init__(self, name: str, *, default: _T = ...) -> None: ... @@ -9,6 +13,8 @@ def get(self, default: _T = ...) -> _T: ... def set(self, value: _T) -> Token[_T]: ... def reset(self, token: Token[_T]) -> None: ... + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... class Token(Generic[_T]): @property @@ -16,6 +22,8 @@ @property def old_value(self) -> Any: ... # returns either _T or MISSING, but that's hard to express MISSING: ClassVar[object] + if sys.version_info >= (3, 9): + def __class_getitem__(cls, item: Any) -> GenericAlias: ... def copy_context() -> Context: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/filelock/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/filelock/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/filelock/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/filelock/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,54 @@ +import sys +from logging import Logger +from types import TracebackType +from typing import Optional, Type, Union + +def logger() -> Logger: ... + +class Timeout(TimeoutError): + def __init__(self, lock_file: str) -> None: ... + def __str__(self) -> str: ... + +class _Acquire_ReturnProxy: + def __init__(self, lock: str) -> None: ... + def __enter__(self) -> str: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], traceback: Optional[TracebackType] + ) -> None: ... + +class BaseFileLock: + def __init__(self, lock_file: str, timeout: Union[float, int, str] = ...) -> None: ... + @property + def lock_file(self) -> str: ... + @property + def timeout(self) -> float: ... + @timeout.setter + def timeout(self, value: Union[int, str, float]) -> None: ... + @property + def is_locked(self) -> bool: ... + def acquire(self, timeout: Optional[float] = ..., poll_intervall: float = ...) -> _Acquire_ReturnProxy: ... + def release(self, force: bool = ...) -> None: ... + def __enter__(self) -> BaseFileLock: ... + def __exit__( + self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], traceback: Optional[TracebackType] + ) -> None: ... + def __del__(self) -> None: ... + +class WindowsFileLock(BaseFileLock): + def _acquire(self) -> None: ... + def _release(self) -> None: ... + +class UnixFileLock(BaseFileLock): + def _acquire(self) -> None: ... + def _release(self) -> None: ... + +class SoftFileLock(BaseFileLock): + def _acquire(self) -> None: ... + def _release(self) -> None: ... + +if sys.platform == "win32": + FileLock = WindowsFileLock +elif sys.platform == "linux" or sys.platform == "darwin": + FileLock = UnixFileLock +else: + FileLock = SoftFileLock diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/api.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/api.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/api.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/api.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,56 @@ +from datetime import date, datetime, timedelta +from numbers import Real +from typing import Any, Awaitable, Callable, Iterator, Optional, Sequence, Type, TypeVar, Union, overload + +_T = TypeVar("_T") +_Freezable = Union[str, datetime, date, timedelta] + +class TickingDateTimeFactory(object): + def __init__(self, time_to_freeze: datetime, start: datetime) -> None: ... + def __call__(self) -> datetime: ... + +class FrozenDateTimeFactory(object): + def __init__(self, time_to_freeze: datetime) -> None: ... + def __call__(self) -> datetime: ... + def tick(self, delta: Union[float, Real, timedelta] = ...) -> None: ... + def move_to(self, target_datetime: Optional[_Freezable]) -> None: ... + +class StepTickTimeFactory(object): + def __init__(self, time_to_freeze: datetime, step_width: float) -> None: ... + def __call__(self) -> datetime: ... + def tick(self, delta: Optional[timedelta] = ...) -> None: ... + def update_step_width(self, step_width: float) -> None: ... + def move_to(self, target_datetime: Optional[_Freezable]) -> None: ... + +class _freeze_time: + def __init__( + self, + time_to_freeze_str: Optional[_Freezable], + tz_offset: float, + ignore: Sequence[str], + tick: bool, + as_arg: bool, + auto_tick_seconds: float, + ) -> None: ... + @overload + def __call__(self, func: Type[_T]) -> Type[_T]: ... + @overload + def __call__(self, func: Callable[..., Awaitable[_T]]) -> Callable[..., Awaitable[_T]]: ... + @overload + def __call__(self, func: Callable[..., _T]) -> Callable[..., _T]: ... + def __enter__(self) -> Any: ... + def __exit__(self, *args: Any) -> None: ... + def start(self) -> Any: ... + def stop(self) -> None: ... + def decorate_class(self, klass: Type[_T]) -> _T: ... + def decorate_coroutine(self, coroutine: _T) -> _T: ... + def decorate_callable(self, func: Callable[..., _T]) -> Callable[..., _T]: ... + +def freeze_time( + time_to_freeze: Optional[Union[_Freezable, Callable[..., _Freezable], Iterator[_Freezable]]] = ..., + tz_offset: Optional[float] = ..., + ignore: Optional[Sequence[str]] = ..., + tick: Optional[bool] = ..., + as_arg: Optional[bool] = ..., + auto_tick_seconds: Optional[float] = ..., +) -> _freeze_time: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/freezegun/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1 @@ +from .api import freeze_time as freeze_time diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/frozendict.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/frozendict.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/frozendict.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/frozendict.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,27 @@ +import collections +from typing import Any, Dict, Generic, Iterable, Iterator, Mapping, Tuple, Type, TypeVar, overload + +_S = TypeVar("_S") +_KT = TypeVar("_KT") +_VT = TypeVar("_VT") + +class frozendict(Mapping[_KT, _VT], Generic[_KT, _VT]): + + dict_cls: Type[Dict] = ... + @overload + def __init__(self, **kwargs: _VT) -> None: ... + @overload + def __init__(self, mapping: Mapping[_KT, _VT]) -> None: ... + @overload + def __init__(self, iterable: Iterable[Tuple[_KT, _VT]]) -> None: ... + def __getitem__(self, key: _KT) -> _VT: ... + def __contains__(self, key: object) -> bool: ... + def copy(self: _S, **add_or_replace: _VT) -> _S: ... + def __iter__(self) -> Iterator[_KT]: ... + def __len__(self) -> int: ... + def __repr__(self) -> str: ... + def __hash__(self) -> int: ... + +class FrozenOrderedDict(frozendict): + + dict_cls: Type[collections.OrderedDict] = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/orjson.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/orjson.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/orjson.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/orjson.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,21 +1,21 @@ from typing import Any, Callable, Optional, Union -__version__ = str +__version__: str -def dumps( - __obj: Any, - default: Optional[Callable[[Any], Any]] = ..., - option: Optional[int] = ..., -) -> bytes: ... +def dumps(__obj: Any, default: Optional[Callable[[Any], Any]] = ..., option: Optional[int] = ...) -> bytes: ... def loads(__obj: Union[bytes, bytearray, str]) -> Any: ... class JSONDecodeError(ValueError): ... class JSONEncodeError(TypeError): ... +OPT_APPEND_NEWLINE: int OPT_INDENT_2: int OPT_NAIVE_UTC: int OPT_NON_STR_KEYS: int OPT_OMIT_MICROSECONDS: int +OPT_PASSTHROUGH_DATACLASS: int +OPT_PASSTHROUGH_DATETIME: int +OPT_PASSTHROUGH_SUBCLASS: int OPT_SERIALIZE_DATACLASS: int OPT_SERIALIZE_NUMPY: int OPT_SERIALIZE_UUID: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,8 @@ -# Stubs for pkg_resources (Python 3.4) - -from typing import Any, Callable, Dict, IO, Iterable, Generator, Optional, Sequence, Tuple, List, Set, Union, TypeVar, overload -from abc import ABCMeta import importlib.abc import types import zipimport +from abc import ABCMeta +from typing import IO, Any, Callable, Dict, Generator, Iterable, List, Optional, Sequence, Set, Tuple, TypeVar, Union, overload _T = TypeVar("_T") _NestedStr = Union[str, Iterable[Union[str, Iterable[Any]]]] @@ -201,7 +199,15 @@ def run_script(self, script_name: str, namespace: Dict[str, Any]) -> None: ... class ResolutionError(Exception): ... -class DistributionNotFound(ResolutionError): ... + +class DistributionNotFound(ResolutionError): + @property + def req(self) -> Requirement: ... + @property + def requirers(self) -> Set[str]: ... + @property + def requirers_str(self) -> str: ... + def report(self) -> str: ... class VersionConflict(ResolutionError): @property diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/py31compat.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/py31compat.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/py31compat.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pkg_resources/py31compat.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,4 @@ -from typing import Text import os -import sys needs_makedirs: bool diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/generator.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/generator.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/generator.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/generator.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from datetime import datetime + +def generate(dt: datetime, utc: bool = ..., accept_naive: bool = ..., microseconds: bool = ...) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/__init__.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,2 @@ +from .generator import generate as generate +from .parser import parse as parse diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/parser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/parser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/parser.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/parser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from datetime import datetime + +def parse(timestamp: str, utc: bool = ..., produce_naive: bool = ...) -> datetime: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/utils.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/utils.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/utils.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/pyrfc3339/utils.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,11 @@ +from datetime import datetime, timedelta, tzinfo +from typing import Optional + +class FixedOffset(tzinfo): + def __init__(self, hours: float, minutes: float) -> None: ... + def dst(self, dt: Optional[datetime]) -> timedelta: ... + def utcoffset(self, dt: Optional[datetime]) -> timedelta: ... + def tzname(self, dt: Optional[datetime]) -> str: ... + +def timedelta_seconds(td: timedelta) -> int: ... +def timezone(utcoffset: float) -> str: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,11 @@ from __future__ import print_function +import types +import typing +import unittest +from builtins import next as next +from functools import wraps as wraps +from io import BytesIO as BytesIO, StringIO as StringIO from typing import ( Any, AnyStr, @@ -12,7 +18,6 @@ NoReturn, Optional, Pattern, - Text, Tuple, Type, TypeVar, @@ -20,18 +25,12 @@ ValuesView, overload, ) -import types -import typing -import unittest -from io import StringIO as StringIO, BytesIO as BytesIO -from builtins import next as next -from functools import wraps as wraps -from . import moves +from . import moves as moves -_T = TypeVar('_T') -_K = TypeVar('_K') -_V = TypeVar('_V') +_T = TypeVar("_T") +_K = TypeVar("_K") +_V = TypeVar("_V") __version__: str @@ -41,16 +40,15 @@ PY3 = True PY34: bool -string_types = str, -integer_types = int, -class_types = type, +string_types = (str,) +integer_types = (int,) +class_types = (type,) text_type = str binary_type = bytes MAXSIZE: int def callable(obj: object) -> bool: ... - def get_unbound_function(unbound: types.FunctionType) -> types.FunctionType: ... def create_bound_method(func: types.FunctionType, obj: object) -> types.MethodType: ... def create_unbound_method(func: types.FunctionType, cls: type) -> types.FunctionType: ... @@ -63,44 +61,47 @@ def get_function_code(fun: types.FunctionType) -> types.CodeType: ... def get_function_defaults(fun: types.FunctionType) -> Optional[Tuple[Any, ...]]: ... def get_function_globals(fun: types.FunctionType) -> Dict[str, Any]: ... - def iterkeys(d: Mapping[_K, _V]) -> typing.Iterator[_K]: ... def itervalues(d: Mapping[_K, _V]) -> typing.Iterator[_V]: ... def iteritems(d: Mapping[_K, _V]) -> typing.Iterator[Tuple[_K, _V]]: ... + # def iterlists def viewkeys(d: Mapping[_K, _V]) -> KeysView[_K]: ... def viewvalues(d: Mapping[_K, _V]) -> ValuesView[_V]: ... def viewitems(d: Mapping[_K, _V]) -> ItemsView[_K, _V]: ... - def b(s: str) -> binary_type: ... def u(s: str) -> text_type: ... unichr = chr + def int2byte(i: int) -> bytes: ... def byte2int(bs: binary_type) -> int: ... def indexbytes(buf: binary_type, i: int) -> int: ... def iterbytes(buf: binary_type) -> typing.Iterator[int]: ... - def assertCountEqual(self: unittest.TestCase, first: Iterable[_T], second: Iterable[_T], msg: Optional[str] = ...) -> None: ... @overload def assertRaisesRegex(self: unittest.TestCase, msg: Optional[str] = ...) -> Any: ... @overload def assertRaisesRegex(self: unittest.TestCase, callable_obj: Callable[..., Any], *args: Any, **kwargs: Any) -> Any: ... -def assertRegex(self: unittest.TestCase, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Optional[str] = ...) -> None: ... +def assertRegex( + self: unittest.TestCase, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Optional[str] = ... +) -> None: ... exec_ = exec -def reraise(tp: Optional[Type[BaseException]], value: Optional[BaseException], tb: Optional[types.TracebackType] = ...) -> NoReturn: ... +def reraise( + tp: Optional[Type[BaseException]], value: Optional[BaseException], tb: Optional[types.TracebackType] = ... +) -> NoReturn: ... def raise_from(value: Union[BaseException, Type[BaseException]], from_value: Optional[BaseException]) -> NoReturn: ... print_ = print def with_metaclass(meta: type, *bases: type) -> type: ... def add_metaclass(metaclass: type) -> Callable[[_T], _T]: ... -def ensure_binary(s: Union[bytes, Text], encoding: str = ..., errors: str = ...) -> bytes: ... -def ensure_str(s: Union[bytes, Text], encoding: str = ..., errors: str = ...) -> str: ... -def ensure_text(s: Union[bytes, Text], encoding: str = ..., errors: str = ...) -> Text: ... +def ensure_binary(s: Union[bytes, str], encoding: str = ..., errors: str = ...) -> bytes: ... +def ensure_str(s: Union[bytes, str], encoding: str = ..., errors: str = ...) -> str: ... +def ensure_text(s: Union[bytes, str], encoding: str = ..., errors: str = ...) -> str: ... def python_2_unicode_compatible(klass: _T) -> _T: ... class _LazyDescriptor: @@ -116,7 +117,9 @@ class MovedAttribute(_LazyDescriptor): mod: str attr: str - def __init__(self, name: str, old_mod: str, new_mod: str, old_attr: Optional[str] = ..., new_attr: Optional[str] = ...) -> None: ... + def __init__( + self, name: str, old_mod: str, new_mod: str, old_attr: Optional[str] = ..., new_attr: Optional[str] = ... + ) -> None: ... def add_move(move: Union[MovedModule, MovedAttribute]) -> None: ... def remove_move(name: str) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,68 +2,64 @@ # # Note: Commented out items means they weren't implemented at the time. # Uncomment them when the modules have been added to the typeshed. -import sys - -from io import StringIO as cStringIO -from builtins import filter as filter -from itertools import filterfalse as filterfalse -from builtins import input as input -from sys import intern as intern -from builtins import map as map -from os import getcwd as getcwd -from os import getcwdb as getcwdb -from builtins import range as range +import importlib +import shlex +from builtins import filter as filter, input as input, map as map, range as range, zip as zip +from collections import UserDict as UserDict, UserList as UserList, UserString as UserString from functools import reduce as reduce -from shlex import quote as shlex_quote from io import StringIO as StringIO -from collections import UserDict as UserDict -from collections import UserList as UserList -from collections import UserString as UserString -from builtins import range as xrange -from builtins import zip as zip -from itertools import zip_longest as zip_longest -from . import builtins -from . import configparser -# import copyreg as copyreg -# import dbm.gnu as dbm_gnu -from . import _dummy_thread -from . import http_cookiejar -from . import http_cookies -from . import html_entities -from . import html_parser -from . import http_client -from . import email_mime_multipart -from . import email_mime_nonmultipart -from . import email_mime_text -from . import email_mime_base -from . import BaseHTTPServer -from . import CGIHTTPServer -from . import SimpleHTTPServer -from . import cPickle -from . import queue -from . import reprlib -from . import socketserver -from . import _thread -from . import tkinter -from . import tkinter_dialog -from . import tkinter_filedialog -# import tkinter.scrolledtext as tkinter_scrolledtext -# import tkinter.simpledialog as tkinter_simpledialog -# import tkinter.tix as tkinter_tix -from . import tkinter_ttk -from . import tkinter_constants -# import tkinter.dnd as tkinter_dnd -# import tkinter.colorchooser as tkinter_colorchooser -from . import tkinter_commondialog -from . import tkinter_tkfiledialog +from itertools import filterfalse as filterfalse, zip_longest as zip_longest +from os import getcwd as getcwd, getcwdb as getcwdb +from sys import intern as intern + # import tkinter.font as tkinter_font # import tkinter.messagebox as tkinter_messagebox # import tkinter.simpledialog as tkinter_tksimpledialog -from . import urllib_parse -from . import urllib_error -from . import urllib -from . import urllib_robotparser +# import tkinter.dnd as tkinter_dnd +# import tkinter.colorchooser as tkinter_colorchooser +# import tkinter.scrolledtext as tkinter_scrolledtext +# import tkinter.simpledialog as tkinter_simpledialog +# import tkinter.tix as tkinter_tix +# import copyreg as copyreg +# import dbm.gnu as dbm_gnu +from . import ( + BaseHTTPServer as BaseHTTPServer, + CGIHTTPServer as CGIHTTPServer, + SimpleHTTPServer as SimpleHTTPServer, + _dummy_thread as _dummy_thread, + _thread as _thread, + builtins as builtins, + configparser as configparser, + cPickle as cPickle, + email_mime_base as email_mime_base, + email_mime_multipart as email_mime_multipart, + email_mime_nonmultipart as email_mime_nonmultipart, + email_mime_text as email_mime_text, + html_entities as html_entities, + html_parser as html_parser, + http_client as http_client, + http_cookiejar as http_cookiejar, + http_cookies as http_cookies, + queue as queue, + reprlib as reprlib, + socketserver as socketserver, + tkinter as tkinter, + tkinter_commondialog as tkinter_commondialog, + tkinter_constants as tkinter_constants, + tkinter_dialog as tkinter_dialog, + tkinter_filedialog as tkinter_filedialog, + tkinter_tkfiledialog as tkinter_tkfiledialog, + tkinter_ttk as tkinter_ttk, + urllib as urllib, + urllib_error as urllib_error, + urllib_parse as urllib_parse, + urllib_robotparser as urllib_robotparser, +) + # import xmlrpc.client as xmlrpc_client # import xmlrpc.server as xmlrpc_server -from importlib import reload as reload_module +xrange = range +reload_module = importlib.reload +cStringIO = StringIO +shlex_quote = shlex.quote diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/error.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/error.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/error.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/error.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,3 +1 @@ -from urllib.error import URLError as URLError -from urllib.error import HTTPError as HTTPError -from urllib.error import ContentTooShortError as ContentTooShortError +from urllib.error import ContentTooShortError as ContentTooShortError, HTTPError as HTTPError, URLError as URLError diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/parse.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/parse.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/parse.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/parse.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,27 +2,29 @@ # # Note: Commented out items means they weren't implemented at the time. # Uncomment them when the modules have been added to the typeshed. -from urllib.parse import ParseResult as ParseResult -from urllib.parse import SplitResult as SplitResult -from urllib.parse import parse_qs as parse_qs -from urllib.parse import parse_qsl as parse_qsl -from urllib.parse import urldefrag as urldefrag -from urllib.parse import urljoin as urljoin -from urllib.parse import urlparse as urlparse -from urllib.parse import urlsplit as urlsplit -from urllib.parse import urlunparse as urlunparse -from urllib.parse import urlunsplit as urlunsplit -from urllib.parse import quote as quote -from urllib.parse import quote_plus as quote_plus -from urllib.parse import unquote as unquote -from urllib.parse import unquote_plus as unquote_plus -from urllib.parse import unquote_to_bytes as unquote_to_bytes -from urllib.parse import urlencode as urlencode # from urllib.parse import splitquery as splitquery # from urllib.parse import splittag as splittag # from urllib.parse import splituser as splituser -from urllib.parse import uses_fragment as uses_fragment -from urllib.parse import uses_netloc as uses_netloc -from urllib.parse import uses_params as uses_params -from urllib.parse import uses_query as uses_query -from urllib.parse import uses_relative as uses_relative +from urllib.parse import ( + ParseResult as ParseResult, + SplitResult as SplitResult, + parse_qs as parse_qs, + parse_qsl as parse_qsl, + quote as quote, + quote_plus as quote_plus, + unquote as unquote, + unquote_plus as unquote_plus, + unquote_to_bytes as unquote_to_bytes, + urldefrag as urldefrag, + urlencode as urlencode, + urljoin as urljoin, + urlparse as urlparse, + urlsplit as urlsplit, + urlunparse as urlunparse, + urlunsplit as urlunsplit, + uses_fragment as uses_fragment, + uses_netloc as uses_netloc, + uses_params as uses_params, + uses_query as uses_query, + uses_relative as uses_relative, +) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/request.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/request.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/request.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/six/moves/urllib/request.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -2,38 +2,40 @@ # # Note: Commented out items means they weren't implemented at the time. # Uncomment them when the modules have been added to the typeshed. -from urllib.request import urlopen as urlopen -from urllib.request import install_opener as install_opener -from urllib.request import build_opener as build_opener -from urllib.request import pathname2url as pathname2url -from urllib.request import url2pathname as url2pathname -from urllib.request import getproxies as getproxies -from urllib.request import Request as Request -from urllib.request import OpenerDirector as OpenerDirector -from urllib.request import HTTPDefaultErrorHandler as HTTPDefaultErrorHandler -from urllib.request import HTTPRedirectHandler as HTTPRedirectHandler -from urllib.request import HTTPCookieProcessor as HTTPCookieProcessor -from urllib.request import ProxyHandler as ProxyHandler -from urllib.request import BaseHandler as BaseHandler -from urllib.request import HTTPPasswordMgr as HTTPPasswordMgr -from urllib.request import HTTPPasswordMgrWithDefaultRealm as HTTPPasswordMgrWithDefaultRealm -from urllib.request import AbstractBasicAuthHandler as AbstractBasicAuthHandler -from urllib.request import HTTPBasicAuthHandler as HTTPBasicAuthHandler -from urllib.request import ProxyBasicAuthHandler as ProxyBasicAuthHandler -from urllib.request import AbstractDigestAuthHandler as AbstractDigestAuthHandler -from urllib.request import HTTPDigestAuthHandler as HTTPDigestAuthHandler -from urllib.request import ProxyDigestAuthHandler as ProxyDigestAuthHandler -from urllib.request import HTTPHandler as HTTPHandler -from urllib.request import HTTPSHandler as HTTPSHandler -from urllib.request import FileHandler as FileHandler -from urllib.request import FTPHandler as FTPHandler -from urllib.request import CacheFTPHandler as CacheFTPHandler -from urllib.request import UnknownHandler as UnknownHandler -from urllib.request import HTTPErrorProcessor as HTTPErrorProcessor -from urllib.request import urlretrieve as urlretrieve -from urllib.request import urlcleanup as urlcleanup -from urllib.request import URLopener as URLopener -from urllib.request import FancyURLopener as FancyURLopener # from urllib.request import proxy_bypass as proxy_bypass -from urllib.request import parse_http_list as parse_http_list -from urllib.request import parse_keqv_list as parse_keqv_list +from urllib.request import ( + AbstractBasicAuthHandler as AbstractBasicAuthHandler, + AbstractDigestAuthHandler as AbstractDigestAuthHandler, + BaseHandler as BaseHandler, + CacheFTPHandler as CacheFTPHandler, + FancyURLopener as FancyURLopener, + FileHandler as FileHandler, + FTPHandler as FTPHandler, + HTTPBasicAuthHandler as HTTPBasicAuthHandler, + HTTPCookieProcessor as HTTPCookieProcessor, + HTTPDefaultErrorHandler as HTTPDefaultErrorHandler, + HTTPDigestAuthHandler as HTTPDigestAuthHandler, + HTTPErrorProcessor as HTTPErrorProcessor, + HTTPHandler as HTTPHandler, + HTTPPasswordMgr as HTTPPasswordMgr, + HTTPPasswordMgrWithDefaultRealm as HTTPPasswordMgrWithDefaultRealm, + HTTPRedirectHandler as HTTPRedirectHandler, + HTTPSHandler as HTTPSHandler, + OpenerDirector as OpenerDirector, + ProxyBasicAuthHandler as ProxyBasicAuthHandler, + ProxyDigestAuthHandler as ProxyDigestAuthHandler, + ProxyHandler as ProxyHandler, + Request as Request, + UnknownHandler as UnknownHandler, + URLopener as URLopener, + build_opener as build_opener, + getproxies as getproxies, + install_opener as install_opener, + parse_http_list as parse_http_list, + parse_keqv_list as parse_keqv_list, + pathname2url as pathname2url, + url2pathname as url2pathname, + urlcleanup as urlcleanup, + urlopen as urlopen, + urlretrieve as urlretrieve, +) diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast27.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast27.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast27.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast27.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,335 @@ +import typing +from typing import Any, Iterator, Optional, Union + +class NodeVisitor: + def visit(self, node: AST) -> Any: ... + def generic_visit(self, node: AST) -> None: ... + +class NodeTransformer(NodeVisitor): + def generic_visit(self, node: AST) -> None: ... + +def parse(source: Union[str, bytes], filename: Union[str, bytes] = ..., mode: str = ...) -> AST: ... +def copy_location(new_node: AST, old_node: AST) -> AST: ... +def dump(node: AST, annotate_fields: bool = ..., include_attributes: bool = ...) -> str: ... +def fix_missing_locations(node: AST) -> AST: ... +def get_docstring(node: AST, clean: bool = ...) -> Optional[bytes]: ... +def increment_lineno(node: AST, n: int = ...) -> AST: ... +def iter_child_nodes(node: AST) -> Iterator[AST]: ... +def iter_fields(node: AST) -> Iterator[typing.Tuple[str, Any]]: ... +def literal_eval(node_or_string: Union[str, AST]) -> Any: ... +def walk(node: AST) -> Iterator[AST]: ... + +PyCF_ONLY_AST: int + +# ast classes + +identifier = str + +class AST: + _attributes: typing.Tuple[str, ...] + _fields: typing.Tuple[str, ...] + def __init__(self, *args: Any, **kwargs: Any) -> None: ... + +class mod(AST): ... + +class Module(mod): + body: typing.List[stmt] + type_ignores: typing.List[TypeIgnore] + +class Interactive(mod): + body: typing.List[stmt] + +class Expression(mod): + body: expr + +class FunctionType(mod): + argtypes: typing.List[expr] + returns: expr + +class Suite(mod): + body: typing.List[stmt] + +class stmt(AST): + lineno: int + col_offset: int + +class FunctionDef(stmt): + name: identifier + args: arguments + body: typing.List[stmt] + decorator_list: typing.List[expr] + type_comment: Optional[str] + +class ClassDef(stmt): + name: identifier + bases: typing.List[expr] + body: typing.List[stmt] + decorator_list: typing.List[expr] + +class Return(stmt): + value: Optional[expr] + +class Delete(stmt): + targets: typing.List[expr] + +class Assign(stmt): + targets: typing.List[expr] + value: expr + type_comment: Optional[str] + +class AugAssign(stmt): + target: expr + op: operator + value: expr + +class Print(stmt): + dest: Optional[expr] + values: typing.List[expr] + nl: bool + +class For(stmt): + target: expr + iter: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + type_comment: Optional[str] + +class While(stmt): + test: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + +class If(stmt): + test: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + +class With(stmt): + context_expr: expr + optional_vars: Optional[expr] + body: typing.List[stmt] + type_comment: Optional[str] + +class Raise(stmt): + type: Optional[expr] + inst: Optional[expr] + tback: Optional[expr] + +class TryExcept(stmt): + body: typing.List[stmt] + handlers: typing.List[ExceptHandler] + orelse: typing.List[stmt] + +class TryFinally(stmt): + body: typing.List[stmt] + finalbody: typing.List[stmt] + +class Assert(stmt): + test: expr + msg: Optional[expr] + +class Import(stmt): + names: typing.List[alias] + +class ImportFrom(stmt): + module: Optional[identifier] + names: typing.List[alias] + level: Optional[int] + +class Exec(stmt): + body: expr + globals: Optional[expr] + locals: Optional[expr] + +class Global(stmt): + names: typing.List[identifier] + +class Expr(stmt): + value: expr + +class Pass(stmt): ... +class Break(stmt): ... +class Continue(stmt): ... +class slice(AST): ... + +_slice = slice # this lets us type the variable named 'slice' below + +class Slice(slice): + lower: Optional[expr] + upper: Optional[expr] + step: Optional[expr] + +class ExtSlice(slice): + dims: typing.List[slice] + +class Index(slice): + value: expr + +class Ellipsis(slice): ... + +class expr(AST): + lineno: int + col_offset: int + +class BoolOp(expr): + op: boolop + values: typing.List[expr] + +class BinOp(expr): + left: expr + op: operator + right: expr + +class UnaryOp(expr): + op: unaryop + operand: expr + +class Lambda(expr): + args: arguments + body: expr + +class IfExp(expr): + test: expr + body: expr + orelse: expr + +class Dict(expr): + keys: typing.List[expr] + values: typing.List[expr] + +class Set(expr): + elts: typing.List[expr] + +class ListComp(expr): + elt: expr + generators: typing.List[comprehension] + +class SetComp(expr): + elt: expr + generators: typing.List[comprehension] + +class DictComp(expr): + key: expr + value: expr + generators: typing.List[comprehension] + +class GeneratorExp(expr): + elt: expr + generators: typing.List[comprehension] + +class Yield(expr): + value: Optional[expr] + +class Compare(expr): + left: expr + ops: typing.List[cmpop] + comparators: typing.List[expr] + +class Call(expr): + func: expr + args: typing.List[expr] + keywords: typing.List[keyword] + starargs: Optional[expr] + kwargs: Optional[expr] + +class Repr(expr): + value: expr + +class Num(expr): + n: Union[int, float, complex] + +class Str(expr): + s: Union[str, bytes] + kind: str + +class Attribute(expr): + value: expr + attr: identifier + ctx: expr_context + +class Subscript(expr): + value: expr + slice: _slice + ctx: expr_context + +class Name(expr): + id: identifier + ctx: expr_context + +class List(expr): + elts: typing.List[expr] + ctx: expr_context + +class Tuple(expr): + elts: typing.List[expr] + ctx: expr_context + +class expr_context(AST): ... +class AugLoad(expr_context): ... +class AugStore(expr_context): ... +class Del(expr_context): ... +class Load(expr_context): ... +class Param(expr_context): ... +class Store(expr_context): ... +class boolop(AST): ... +class And(boolop): ... +class Or(boolop): ... +class operator(AST): ... +class Add(operator): ... +class BitAnd(operator): ... +class BitOr(operator): ... +class BitXor(operator): ... +class Div(operator): ... +class FloorDiv(operator): ... +class LShift(operator): ... +class Mod(operator): ... +class Mult(operator): ... +class Pow(operator): ... +class RShift(operator): ... +class Sub(operator): ... +class unaryop(AST): ... +class Invert(unaryop): ... +class Not(unaryop): ... +class UAdd(unaryop): ... +class USub(unaryop): ... +class cmpop(AST): ... +class Eq(cmpop): ... +class Gt(cmpop): ... +class GtE(cmpop): ... +class In(cmpop): ... +class Is(cmpop): ... +class IsNot(cmpop): ... +class Lt(cmpop): ... +class LtE(cmpop): ... +class NotEq(cmpop): ... +class NotIn(cmpop): ... + +class comprehension(AST): + target: expr + iter: expr + ifs: typing.List[expr] + +class ExceptHandler(AST): + type: Optional[expr] + name: Optional[expr] + body: typing.List[stmt] + lineno: int + col_offset: int + +class arguments(AST): + args: typing.List[expr] + vararg: Optional[identifier] + kwarg: Optional[identifier] + defaults: typing.List[expr] + type_comments: typing.List[Optional[str]] + +class keyword(AST): + arg: identifier + value: expr + +class alias(AST): + name: identifier + asname: Optional[identifier] + +class TypeIgnore(AST): + lineno: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast3.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast3.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast3.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/ast3.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,384 @@ +import typing +from typing import Any, Iterator, Optional, Union + +class NodeVisitor: + def visit(self, node: AST) -> Any: ... + def generic_visit(self, node: AST) -> None: ... + +class NodeTransformer(NodeVisitor): + def generic_visit(self, node: AST) -> None: ... + +def parse(source: Union[str, bytes], filename: Union[str, bytes] = ..., mode: str = ..., feature_version: int = ...) -> AST: ... +def copy_location(new_node: AST, old_node: AST) -> AST: ... +def dump(node: AST, annotate_fields: bool = ..., include_attributes: bool = ...) -> str: ... +def fix_missing_locations(node: AST) -> AST: ... +def get_docstring(node: AST, clean: bool = ...) -> Optional[str]: ... +def increment_lineno(node: AST, n: int = ...) -> AST: ... +def iter_child_nodes(node: AST) -> Iterator[AST]: ... +def iter_fields(node: AST) -> Iterator[typing.Tuple[str, Any]]: ... +def literal_eval(node_or_string: Union[str, AST]) -> Any: ... +def walk(node: AST) -> Iterator[AST]: ... + +PyCF_ONLY_AST: int + +# ast classes + +identifier = str + +class AST: + _attributes: typing.Tuple[str, ...] + _fields: typing.Tuple[str, ...] + def __init__(self, *args: Any, **kwargs: Any) -> None: ... + +class mod(AST): ... + +class Module(mod): + body: typing.List[stmt] + type_ignores: typing.List[TypeIgnore] + +class Interactive(mod): + body: typing.List[stmt] + +class Expression(mod): + body: expr + +class FunctionType(mod): + argtypes: typing.List[expr] + returns: expr + +class Suite(mod): + body: typing.List[stmt] + +class stmt(AST): + lineno: int + col_offset: int + +class FunctionDef(stmt): + name: identifier + args: arguments + body: typing.List[stmt] + decorator_list: typing.List[expr] + returns: Optional[expr] + type_comment: Optional[str] + +class AsyncFunctionDef(stmt): + name: identifier + args: arguments + body: typing.List[stmt] + decorator_list: typing.List[expr] + returns: Optional[expr] + type_comment: Optional[str] + +class ClassDef(stmt): + name: identifier + bases: typing.List[expr] + keywords: typing.List[keyword] + body: typing.List[stmt] + decorator_list: typing.List[expr] + +class Return(stmt): + value: Optional[expr] + +class Delete(stmt): + targets: typing.List[expr] + +class Assign(stmt): + targets: typing.List[expr] + value: expr + type_comment: Optional[str] + +class AugAssign(stmt): + target: expr + op: operator + value: expr + +class AnnAssign(stmt): + target: expr + annotation: expr + value: Optional[expr] + simple: int + +class For(stmt): + target: expr + iter: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + type_comment: Optional[str] + +class AsyncFor(stmt): + target: expr + iter: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + type_comment: Optional[str] + +class While(stmt): + test: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + +class If(stmt): + test: expr + body: typing.List[stmt] + orelse: typing.List[stmt] + +class With(stmt): + items: typing.List[withitem] + body: typing.List[stmt] + type_comment: Optional[str] + +class AsyncWith(stmt): + items: typing.List[withitem] + body: typing.List[stmt] + type_comment: Optional[str] + +class Raise(stmt): + exc: Optional[expr] + cause: Optional[expr] + +class Try(stmt): + body: typing.List[stmt] + handlers: typing.List[ExceptHandler] + orelse: typing.List[stmt] + finalbody: typing.List[stmt] + +class Assert(stmt): + test: expr + msg: Optional[expr] + +class Import(stmt): + names: typing.List[alias] + +class ImportFrom(stmt): + module: Optional[identifier] + names: typing.List[alias] + level: Optional[int] + +class Global(stmt): + names: typing.List[identifier] + +class Nonlocal(stmt): + names: typing.List[identifier] + +class Expr(stmt): + value: expr + +class Pass(stmt): ... +class Break(stmt): ... +class Continue(stmt): ... +class slice(AST): ... + +_slice = slice # this lets us type the variable named 'slice' below + +class Slice(slice): + lower: Optional[expr] + upper: Optional[expr] + step: Optional[expr] + +class ExtSlice(slice): + dims: typing.List[slice] + +class Index(slice): + value: expr + +class expr(AST): + lineno: int + col_offset: int + +class BoolOp(expr): + op: boolop + values: typing.List[expr] + +class BinOp(expr): + left: expr + op: operator + right: expr + +class UnaryOp(expr): + op: unaryop + operand: expr + +class Lambda(expr): + args: arguments + body: expr + +class IfExp(expr): + test: expr + body: expr + orelse: expr + +class Dict(expr): + keys: typing.List[expr] + values: typing.List[expr] + +class Set(expr): + elts: typing.List[expr] + +class ListComp(expr): + elt: expr + generators: typing.List[comprehension] + +class SetComp(expr): + elt: expr + generators: typing.List[comprehension] + +class DictComp(expr): + key: expr + value: expr + generators: typing.List[comprehension] + +class GeneratorExp(expr): + elt: expr + generators: typing.List[comprehension] + +class Await(expr): + value: expr + +class Yield(expr): + value: Optional[expr] + +class YieldFrom(expr): + value: expr + +class Compare(expr): + left: expr + ops: typing.List[cmpop] + comparators: typing.List[expr] + +class Call(expr): + func: expr + args: typing.List[expr] + keywords: typing.List[keyword] + +class Num(expr): + n: Union[float, int, complex] + +class Str(expr): + s: str + kind: str + +class FormattedValue(expr): + value: expr + conversion: typing.Optional[int] + format_spec: typing.Optional[expr] + +class JoinedStr(expr): + values: typing.List[expr] + +class Bytes(expr): + s: bytes + +class NameConstant(expr): + value: Any + +class Ellipsis(expr): ... + +class Attribute(expr): + value: expr + attr: identifier + ctx: expr_context + +class Subscript(expr): + value: expr + slice: _slice + ctx: expr_context + +class Starred(expr): + value: expr + ctx: expr_context + +class Name(expr): + id: identifier + ctx: expr_context + +class List(expr): + elts: typing.List[expr] + ctx: expr_context + +class Tuple(expr): + elts: typing.List[expr] + ctx: expr_context + +class expr_context(AST): ... +class AugLoad(expr_context): ... +class AugStore(expr_context): ... +class Del(expr_context): ... +class Load(expr_context): ... +class Param(expr_context): ... +class Store(expr_context): ... +class boolop(AST): ... +class And(boolop): ... +class Or(boolop): ... +class operator(AST): ... +class Add(operator): ... +class BitAnd(operator): ... +class BitOr(operator): ... +class BitXor(operator): ... +class Div(operator): ... +class FloorDiv(operator): ... +class LShift(operator): ... +class Mod(operator): ... +class Mult(operator): ... +class MatMult(operator): ... +class Pow(operator): ... +class RShift(operator): ... +class Sub(operator): ... +class unaryop(AST): ... +class Invert(unaryop): ... +class Not(unaryop): ... +class UAdd(unaryop): ... +class USub(unaryop): ... +class cmpop(AST): ... +class Eq(cmpop): ... +class Gt(cmpop): ... +class GtE(cmpop): ... +class In(cmpop): ... +class Is(cmpop): ... +class IsNot(cmpop): ... +class Lt(cmpop): ... +class LtE(cmpop): ... +class NotEq(cmpop): ... +class NotIn(cmpop): ... + +class comprehension(AST): + target: expr + iter: expr + ifs: typing.List[expr] + is_async: int + +class ExceptHandler(AST): + type: Optional[expr] + name: Optional[identifier] + body: typing.List[stmt] + lineno: int + col_offset: int + +class arguments(AST): + args: typing.List[arg] + vararg: Optional[arg] + kwonlyargs: typing.List[arg] + kw_defaults: typing.List[expr] + kwarg: Optional[arg] + defaults: typing.List[expr] + +class arg(AST): + arg: identifier + annotation: Optional[expr] + lineno: int + col_offset: int + type_comment: typing.Optional[str] + +class keyword(AST): + arg: Optional[identifier] + value: expr + +class alias(AST): + name: identifier + asname: Optional[identifier] + +class withitem(AST): + context_expr: expr + optional_vars: Optional[expr] + +class TypeIgnore(AST): + lineno: int diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/conversions.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/conversions.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/conversions.pyi 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/typed_ast/conversions.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -0,0 +1,3 @@ +from . import ast3, ast27 + +def py2to3(ast: ast27.AST) -> ast3.AST: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/adjustments.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/adjustments.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/adjustments.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/adjustments.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,8 @@ -from .compat import HAS_IPV6, PY2, WIN, string_types -from .proxy_headers import PROXY_HEADERS from socket import SocketType -from typing import Any, Dict, FrozenSet, Iterable, List, Sequence, Optional, Set, Tuple, Union +from typing import Any, Dict, FrozenSet, Iterable, List, Optional, Sequence, Set, Tuple, Union + +from .compat import HAS_IPV6 as HAS_IPV6, PY2 as PY2, WIN as WIN, string_types as string_types +from .proxy_headers import PROXY_HEADERS as PROXY_HEADERS truthy: FrozenSet KNOWN_PROXY_HEADERS: FrozenSet diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/channel.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/channel.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/channel.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/channel.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,13 +1,14 @@ -from . import wasyncore as wasyncore from socket import SocketType from threading import Condition, Lock -from typing import Mapping, Sequence, Optional, Tuple +from typing import Mapping, Optional, Sequence, Tuple + from waitress.adjustments import Adjustments -from waitress.buffers import OverflowableBuffer, ReadOnlyFileBasedBuffer +from waitress.buffers import OverflowableBuffer from waitress.parser import HTTPRequestParser from waitress.server import BaseWSGIServer -from waitress.task import ErrorTask, WSGITask, Task -from waitress.utilities import InternalServerError +from waitress.task import ErrorTask, WSGITask + +from . import wasyncore as wasyncore class ClientDisconnected(Exception): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/compat.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/compat.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/compat.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/compat.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,26 +1,27 @@ -from io import TextIOWrapper import sys -from typing import Any, Optional, Text, Tuple - -if sys.version_info[0] == 3: - from urllib import parse as urlparse -else: - import urlparse +from io import TextIOWrapper +from typing import Any, Optional, Tuple PY2: bool PY3: bool WIN: bool -string_types: Tuple[str, ] -integer_types: Tuple[int, ] -class_types: Tuple[type, ] +string_types: Tuple[ + str, +] +integer_types: Tuple[ + int, +] +class_types: Tuple[ + type, +] text_type = str binary_type = bytes long = int def unquote_bytes_to_wsgi(bytestring: bytes) -> str: ... -def text_(s: Text, encoding: str = ..., errors: str = ...) -> str: ... -def tostr(s: Text) -> str: ... -def tobytes(s: Text) -> bytes: ... +def text_(s: str, encoding: str = ..., errors: str = ...) -> str: ... +def tostr(s: str) -> str: ... +def tobytes(s: str) -> bytes: ... exec_: Any diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/__init__.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/__init__.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/__init__.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/__init__.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,5 +1,6 @@ from typing import Any, Tuple -from waitress.server import create_server + +from waitress.server import create_server as create_server def serve(app: Any, **kw: Any) -> None: ... def serve_paste(app: Any, global_conf: Any, **kw: Any) -> int: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/parser.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/parser.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/parser.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/parser.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,18 +1,11 @@ -from .rfc7230 import HEADER_FIELD from io import BytesIO -from typing import Mapping, Sequence, Optional, Pattern, Tuple, Union +from typing import Mapping, Optional, Pattern, Sequence, Tuple, Union + from waitress.adjustments import Adjustments -from waitress.buffers import OverflowableBuffer -from waitress.compat import tostr, unquote_bytes_to_wsgi, urlparse from waitress.receiver import ChunkedReceiver, FixedStreamReceiver -from waitress.utilities import ( - BadRequest, - RequestEntityTooLarge, - RequestHeaderFieldsTooLarge, - ServerNotImplemented, - find_double_newline, - Error, -) +from waitress.utilities import Error + +from .rfc7230 import HEADER_FIELD as HEADER_FIELD class ParsingError(Exception): ... class TransferEncodingNotImplemented(Exception): ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/proxy_headers.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/proxy_headers.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/proxy_headers.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/proxy_headers.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,8 @@ -from .utilities import BadRequest from collections import namedtuple from logging import Logger -from typing import Any, Callable, Mapping, Sequence, Optional, Set +from typing import Any, Callable, Mapping, Optional, Sequence, Set + +from .utilities import BadRequest as BadRequest PROXY_HEADERS: frozenset diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/receiver.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/receiver.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/receiver.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/receiver.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,7 +1,8 @@ from io import BytesIO from typing import Optional + from waitress.buffers import OverflowableBuffer -from waitress.utilities import BadRequest, find_double_newline +from waitress.utilities import BadRequest class FixedStreamReceiver: completed: bool = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/rfc7230.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/rfc7230.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/rfc7230.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/rfc7230.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,7 @@ -from .compat import tobytes from typing import Pattern +from .compat import tobytes as tobytes + WS: str OWS: str RWS: str diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/runner.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/runner.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/runner.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/runner.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,5 @@ from io import TextIOWrapper -from typing import Any, Callable, Sequence, Optional, Pattern, Tuple -from waitress import serve +from typing import Any, Callable, Optional, Pattern, Sequence, Tuple HELP: str RUNNER_PATTERN: Pattern @@ -9,4 +8,4 @@ def resolve(module_name: str, object_name: str) -> Any: ... def show_help(stream: TextIOWrapper, name: str, error: Optional[str] = ...) -> None: ... def show_exception(stream: TextIOWrapper) -> None: ... -def run(argv: Sequence[str] = ..., _serve: Callable[..., Any] = ...): ... +def run(argv: Sequence[str] = ..., _serve: Callable[..., Any] = ...) -> None: ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/server.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/server.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/server.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/server.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,12 +1,11 @@ -from . import wasyncore -from .proxy_headers import proxy_headers_middleware from socket import SocketType -from typing import Any, Sequence, Optional, Tuple, Union +from typing import Any, Optional, Sequence, Tuple, Union + from waitress.adjustments import Adjustments from waitress.channel import HTTPChannel -from waitress.compat import IPPROTO_IPV6, IPV6_V6ONLY from waitress.task import Task, ThreadedTaskDispatcher -from waitress.utilities import cleanup_unix_socket + +from . import wasyncore def create_server( application: Any, diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/task.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/task.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/task.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/task.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,9 @@ -from .buffers import ReadOnlyFileBasedBuffer -from .channel import HTTPChannel -from .compat import reraise, tobytes -from .utilities import Error from logging import Logger from threading import Condition, Lock -from typing import Any, Deque, Mapping, Sequence, Optional, Set, Tuple +from typing import Any, Deque, Mapping, Optional, Sequence, Set, Tuple + +from .channel import HTTPChannel +from .utilities import Error rename_headers: Mapping[str, str] hop_by_hop: frozenset diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/trigger.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/trigger.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/trigger.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/trigger.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,10 +1,11 @@ -from . import wasyncore as wasyncore -from threading import Lock -from socket import SocketType import sys +from socket import SocketType +from threading import Lock from typing import Callable, Mapping, Optional from typing_extensions import Literal +from . import wasyncore as wasyncore + class _triggerbase: kind: Optional[str] = ... lock: Lock = ... diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/utilities.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/utilities.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/utilities.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/utilities.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,6 +1,7 @@ -from .rfc7230 import OBS_TEXT, VCHAR from logging import Logger -from typing import Any, Callable, Mapping, Sequence, Match, Pattern, Tuple +from typing import Any, Callable, Mapping, Match, Pattern, Sequence, Tuple + +from .rfc7230 import OBS_TEXT as OBS_TEXT, VCHAR as VCHAR logger: Logger queue_logger: Logger diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/wasyncore.pyi pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/wasyncore.pyi --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/third_party/3/waitress/wasyncore.pyi 2020-12-01 13:51:33.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/third_party/3/waitress/wasyncore.pyi 2020-12-01 23:26:19.000000000 +0000 @@ -1,9 +1,10 @@ -from . import compat, utilities from io import BytesIO from logging import Logger from socket import SocketType from typing import Any, Callable, Mapping, Optional, Tuple +from . import compat as compat, utilities as utilities + socket_map: Mapping[int, SocketType] map: Mapping[int, SocketType] diff -Nru pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.travis.yml pycharm-2020.3/plugins/python-ce/helpers/typeshed/.travis.yml --- pycharm-2020.2.5/plugins/python-ce/helpers/typeshed/.travis.yml 2020-12-01 13:51:32.000000000 +0000 +++ pycharm-2020.3/plugins/python-ce/helpers/typeshed/.travis.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -dist: bionic -language: python -python: 3.8 - -jobs: - include: - - name: "pytype" - python: 3.6 - install: pip install -r requirements-tests-py3.txt - script: ./tests/pytype_test.py - - name: "mypy (typed-ast)" - python: 3.7 - install: pip install -U git+git://github.com/python/mypy git+git://github.com/python/typed_ast - script: ./tests/mypy_test.py --platform=linux - - name: "mypy (ast)" - python: 3.8 - install: pip install -U git+git://github.com/python/mypy - script: ./tests/mypy_test.py --platform=linux - - name: "mypy (Windows)" - install: pip install -U git+git://github.com/python/mypy - script: ./tests/mypy_test.py --platform=win32 - - name: "mypy (Darwin)" - install: pip install -U git+git://github.com/python/mypy - script: ./tests/mypy_test.py --platform=darwin - - name: "mypy self test" - script: ./tests/mypy_selftest.py - - name: "check file consistency" - script: ./tests/check_consistent.py - - name: "flake8" - install: pip install -r requirements-tests-py3.txt - script: flake8 Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/lib/completion-ranking-python-0.0.11.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/lib/completion-ranking-python-0.0.11.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/lib/completion-ranking-python-0.1.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/lib/completion-ranking-python-0.1.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/python-ce/lib/python-ce.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/python-ce/lib/python-ce.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/pythonIDE/lib/python-ide.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/pythonIDE/lib/python-ide.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/pythonIDE/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/pythonIDE/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/rest/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/rest/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/rest/lib/rest.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/rest/lib/rest.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/settings-repository/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/settings-repository/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/settings-repository/lib/settings-repository.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/settings-repository/lib/settings-repository.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/sh/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/sh/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/sh/lib/sh.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/sh/lib/sh.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/completion-ranking-kotlin-0.1.3.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/completion-ranking-kotlin-0.1.3.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/completion-ranking-scala-0.2.0.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/completion-ranking-scala-0.2.0.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/log-events.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/log-events.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/ngram-slp-0.0.2.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/ngram-slp-0.0.2.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/statsCollector-completionRanker.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/statsCollector-completionRanker.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/stats-collector/lib/stats-collector.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/stats-collector/lib/stats-collector.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/svn4idea/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/svn4idea/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/svn4idea/lib/svn4idea.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/svn4idea/lib/svn4idea.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/tasks/lib/jira.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/tasks/lib/jira.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/tasks/lib/tasks-api.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/tasks/lib/tasks-api.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/tasks/lib/tasks-compatibility.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/tasks/lib/tasks-compatibility.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/tasks/lib/tasks-core.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/tasks/lib/tasks-core.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/tasks/lib/tasks-java.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/tasks/lib/tasks-java.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/terminal/lib/resources_en.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/terminal/lib/resources_en.jar differ Binary files /tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/terminal/lib/terminal.jar and /tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/terminal/lib/terminal.jar differ diff -Nru pycharm-2020.2.5/plugins/terminal/.zshenv pycharm-2020.3/plugins/terminal/.zshenv --- pycharm-2020.2.5/plugins/terminal/.zshenv 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/terminal/.zshenv 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,91 @@ +# Injecting code in user Zsh rc files is a delicate business. +# We prefix all builtins to avoid accidentally calling into +# user-defined functions. Up until we disable alias expansion +# we also quote every word to prevent accidental alias +# expansion. We also clean up after ourselves so that no +# temporary parameters or functions are left over once we are +# done. +# +# According to http://zsh.sourceforge.net/Doc/Release/Files.html, zsh startup configuration files are read in this order: +# 1. /etc/zshenv +# 2. $ZDOTDIR/.zshenv +# 3. /etc/zprofile (if shell is login) +# 4. $ZDOTDIR/.zprofile (if shell is login) +# 5. /etc/zshrc (if shell is interactive) +# 6. $ZDOTDIR/.zshrc (if shell is interactive) +# 7. /etc/zlogin (if shell is login) +# 8. $ZDOTDIR/.zlogin (if shell is login) +# +# If ZDOTDIR is unset, HOME is used instead. + +# This file is read, because IntelliJ launches zsh with custom ZDOTDIR. +# Restore ZDOTDIR original value to load further zsh startup files correctly. +if [[ -n "$_INTELLIJ_ORIGINAL_ZDOTDIR" ]]; then + ZDOTDIR="$_INTELLIJ_ORIGINAL_ZDOTDIR" + 'builtin' 'unset' '_INTELLIJ_ORIGINAL_ZDOTDIR' +else + # defaults ZDOTDIR to HOME + 'builtin' 'unset' 'ZDOTDIR' +fi + +# Source original $ZDOTDIR/.zshenv manually +if [[ -f "${ZDOTDIR:-$HOME}"/.zshenv ]]; then + 'builtin' 'source' '--' "${ZDOTDIR:-$HOME}"/.zshenv +fi + +# Bind Ctrl+Left and Ctrl+Right in the main keymap (usually emacs) +# to cursor movement by words. +'builtin' 'bindkey' '^[^[[C' 'forward-word' +'builtin' 'bindkey' '^[^[[D' 'backward-word' + +# Stop right here if this is not interactive shell. +[[ -o 'interactive' ]] || 'builtin' 'return' '0' + +'builtin' 'typeset' '-i' '_jedi_restore_aliases' +if [[ -o 'aliases' ]]; then + 'builtin' 'setopt' 'no_aliases' + # No need to quote everything after this point because aliases + # are disabled. We didn't do this earlier because we must source + # the user's .zshenv with the default shell options. + _jedi_restore_aliases=1 +fi + +# This function will be called after all rc files are processed +# and before the first prompt is displayed. +function _jedi_precmd_hook() { + if [[ -n "$JEDITERM_SOURCE" ]]; then + # TODO: Is it correct to split JEDITERM_SOURCE_ARGS on IFS and + # drop empty arguments? Bash integration does it and it looks + # intentional. + builtin source -- "$JEDITERM_SOURCE" ${=JEDITERM_SOURCE_ARGS} + fi + builtin unset JEDITERM_SOURCE JEDITERM_SOURCE_ARGS + + # Enable native zsh options to make coding easier. + builtin emulate -L zsh + builtin zmodload zsh/parameter 2>/dev/null + + builtin local var + # For every _INTELLIJ_FORCE_SET_FOO=BAR run: export FOO=BAR. + for var in ${parameters[(I)_INTELLIJ_FORCE_SET_*]}; do + builtin export ${var:20}=${(P)var} + builtin unset $var + done + # For every _INTELLIJ_FORCE_PREPEND_FOO=BAR run: export FOO=BAR$FOO. + for var in ${parameters[(I)_INTELLIJ_FORCE_PREPEND_*]}; do + builtin local name=${var:24} + builtin export $name=${(P)var}${(P)name} + builtin unset $var + done + + # Remove the hook and the function. + builtin typeset -ga precmd_functions + precmd_functions=(${precmd_functions:#_jedi_precmd_hook}) + builtin unset -f _jedi_precmd_hook +} + +builtin typeset -ga precmd_functions +precmd_functions+=(_jedi_precmd_hook) + +(( _jedi_restore_aliases )) && builtin setopt aliases +'builtin' 'unset' '_jedi_restore_aliases' diff -Nru pycharm-2020.2.5/plugins/terminal/.zshrc pycharm-2020.3/plugins/terminal/.zshrc --- pycharm-2020.2.5/plugins/terminal/.zshrc 2020-12-01 13:51:37.000000000 +0000 +++ pycharm-2020.3/plugins/terminal/.zshrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -#!/bin/bash - -# mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving -bindkey '^[^[[C' forward-word -bindkey '^[^[[D' backward-word - -ZDOTDIR=$_OLD_ZDOTDIR - -if [ -n "$JEDITERM_USER_RCFILE" ] -then - source "$JEDITERM_USER_RCFILE" - unset JEDITERM_USER_RCFILE -fi - -if [ -n "$ZDOTDIR" ] -then - DOTDIR=$ZDOTDIR -else - DOTDIR=$HOME -fi - -if [ -f "$DOTDIR/.zshenv" ]; then - source "$DOTDIR/.zshenv" -fi - -if [ -n $LOGIN_SHELL ]; then - if [ -f "$DOTDIR/.zprofile" ]; then - source "$DOTDIR/.zprofile" - fi -fi - -if [ -f "$DOTDIR/.zshrc" ]; then - source "$DOTDIR/.zshrc" -fi - -if [ -n $LOGIN_SHELL ]; then - if [ -f "$DOTDIR/.zlogin" ]; then - source "$DOTDIR/.zlogin" - fi -fi - -if [ -n "$JEDITERM_SOURCE" ] -then - source $(echo $JEDITERM_SOURCE) $JEDITERM_SOURCE_ARGS - unset JEDITERM_SOURCE - unset JEDITERM_SOURCE_ARGS -fi - -function override_jb_variables { - env | while read VARIABLE - do - NAME=${VARIABLE%%=*} - if [[ $NAME = '_INTELLIJ_FORCE_SET_'* ]] - then - NEW_NAME=${NAME:20} - if [ -n "$NEW_NAME" ] - then - VALUE=${VARIABLE#*=} - export "$NEW_NAME"="$VALUE" - fi - fi - if [[ $NAME = '_INTELLIJ_FORCE_PREPEND_'* ]] - then - NEW_NAME=${NAME:24} - if [ -n "$NEW_NAME" ] - then - VALUE=${VARIABLE#*=} - export "$NEW_NAME"="$VALUE${(P)NEW_NAME}" - fi - fi - done -} - -override_jb_variables diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/info.plist pycharm-2020.3/plugins/textmate/lib/bundles/toml/info.plist --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/info.plist 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/info.plist 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + contactEmailRot13 + zfurrgf@juvgrsnyyf.bet + contactName + Michael Sheets + description + Tom's Obvious, Minimal Language: A minimal configuration file format that's easy to read due to obvious semantics. + name + TOML + uuid + 13A041AB-28AA-4170-8DCE-912B90E11C35 + + diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Comments.tmPreferences pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Comments.tmPreferences --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Comments.tmPreferences 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Comments.tmPreferences 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + name + Comments + scope + source.toml + settings + + shellVariables + + + name + TM_COMMENT_START + value + # + + + + uuid + 57E002AF-9FB0-4EEF-A7E9-D966AF048D2C + + diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Folding.tmPreferences pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Folding.tmPreferences --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Folding.tmPreferences 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Folding.tmPreferences 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,19 @@ + + + + + name + Folding + scope + source.toml + settings + + foldingIndentedBlockIgnore + ^(?!\s*\[[^\[\]]*\]) + foldingIndentedBlockStart + ^\s*\[[^\[\]]*\] + + uuid + EF7208F3-37FE-48A7-A399-483A053AC519 + + diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Indent.tmPreferences pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Indent.tmPreferences --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Indent.tmPreferences 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Indent.tmPreferences 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,23 @@ + + + + + name + Indent + scope + source.toml + settings + + decreaseIndentPattern + ^\s*[\]] + disableIndentCorrections + + increaseIndentPattern + \[\s*(#.*)?$ + indentOnPaste + simple + + uuid + D71CCB5E-824F-4CCC-9C95-E380ABEBAD59 + + diff -Nru "/tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Symbol List.tmPreferences" "/tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Symbol List.tmPreferences" --- "/tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Symbol List.tmPreferences" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Symbol List.tmPreferences" 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + name + Symbol List + scope + meta.group.toml + settings + + showInSymbolList + 1 + symbolTransformation + + s/\[|\]//g; + + + uuid + 73D9E9DB-B037-4FEB-BB0C-99F5C55454C2 + + diff -Nru "/tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Typing Pairs.tmPreferences" "/tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Typing Pairs.tmPreferences" --- "/tmp/tmpyUiaXT/Eqv52P5S6i/pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Preferences/Typing Pairs.tmPreferences" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpyUiaXT/GNqJp4lkQU/pycharm-2020.3/plugins/textmate/lib/bundles/toml/Preferences/Typing Pairs.tmPreferences" 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + name + Typing Pairs + scope + source.toml + settings + + smartTypingPairs + + + " + " + + + [ + ] + + + + uuid + 11D23FEA-93F7-40C9-A996-EF6CF370D090 + + diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/README.mdown pycharm-2020.3/plugins/textmate/lib/bundles/toml/README.mdown --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/README.mdown 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/README.mdown 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,20 @@ +# Installation + +You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you. + +# General + +* [Bundle Styleguide](http://kb.textmate.org/bundle_styleguide) — _before you make changes_ +* [Commit Styleguide](http://kb.textmate.org/commit_styleguide) — _before you send a pull request_ +* [Writing Bug Reports](http://kb.textmate.org/writing_bug_reports) — _before you report an issue_ + +# License + +If not otherwise specified (see below), files in this repository fall under the following license: + + Permission to copy, use, modify, sell and distribute this + software is granted. This software is provided "as is" without + express or implied warranty, and with no claim as to its + suitability for any purpose. + +An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”. \ No newline at end of file diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Syntaxes/TOML.tmLanguage pycharm-2020.3/plugins/textmate/lib/bundles/toml/Syntaxes/TOML.tmLanguage --- pycharm-2020.2.5/plugins/textmate/lib/bundles/toml/Syntaxes/TOML.tmLanguage 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/toml/Syntaxes/TOML.tmLanguage 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,736 @@ + + + + + fileTypes + + toml + + keyEquivalent + ^~T + name + TOML + patterns + + + include + #comments + + + include + #groups + + + include + #key_pair + + + include + #invalid + + + repository + + comments + + begin + (^[ \t]+)?(?=#) + beginCaptures + + 1 + + name + punctuation.whitespace.comment.leading.toml + + + end + (?!\G) + patterns + + + begin + # + beginCaptures + + 0 + + name + punctuation.definition.comment.toml + + + end + \n + name + comment.line.number-sign.toml + + + + groups + + patterns + + + captures + + 1 + + name + punctuation.definition.section.begin.toml + + 2 + + patterns + + + match + [^\s.]+ + name + entity.name.section.toml + + + + 3 + + name + punctuation.definition.section.begin.toml + + + match + ^\s*(\[)([^\[\]]*)(\]) + name + meta.group.toml + + + captures + + 1 + + name + punctuation.definition.section.begin.toml + + 2 + + patterns + + + match + [^\s.]+ + name + entity.name.section.toml + + + + 3 + + name + punctuation.definition.section.begin.toml + + + match + ^\s*(\[\[)([^\[\]]*)(\]\]) + name + meta.group.double.toml + + + + invalid + + match + \S+(\s*(?=\S))? + name + invalid.illegal.not-allowed-here.toml + + key_pair + + patterns + + + begin + ([A-Za-z0-9_-]+)\s*(=)\s* + captures + + 1 + + name + variable.other.key.toml + + 2 + + name + punctuation.separator.key-value.toml + + + end + (?<=\S)(?<!=)|$ + patterns + + + include + #primatives + + + + + begin + ((")(.*?)("))\s*(=)\s* + captures + + 1 + + name + variable.other.key.toml + + 2 + + name + punctuation.definition.variable.begin.toml + + 3 + + patterns + + + match + \\([btnfr"\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}) + name + constant.character.escape.toml + + + match + \\[^btnfr"\\] + name + invalid.illegal.escape.toml + + + match + " + name + invalid.illegal.not-allowed-here.toml + + + + 4 + + name + punctuation.definition.variable.end.toml + + 5 + + name + punctuation.separator.key-value.toml + + + end + (?<=\S)(?<!=)|$ + patterns + + + include + #primatives + + + + + begin + ((')([^']*)('))\s*(=)\s* + captures + + 1 + + name + variable.other.key.toml + + 2 + + name + punctuation.definition.variable.begin.toml + + 4 + + name + punctuation.definition.variable.end.toml + + 5 + + name + punctuation.separator.key-value.toml + + + end + (?<=\S)(?<!=)|$ + patterns + + + include + #primatives + + + + + begin + (?x) + ( + ( + (?: + [A-Za-z0-9_-]+ # Bare key + | " (?:[^"\\]|\\.)* " # Double quoted key + | ' [^']* ' # Sindle quoted key + ) + (?: + \s* \. \s* # Dot + | (?= \s* =) # or look-ahead for equals + ) + ){2,} # Ensure at least one dot + ) + \s*(=)\s* + + captures + + 1 + + name + variable.other.key.toml + patterns + + + match + \. + name + punctuation.separator.variable.toml + + + captures + + 1 + + name + punctuation.definition.variable.begin.toml + + 2 + + patterns + + + match + \\([btnfr"\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}) + name + constant.character.escape.toml + + + match + \\[^btnfr"\\] + name + invalid.illegal.escape.toml + + + + 3 + + name + punctuation.definition.variable.end.toml + + + match + (")((?:[^"\\]|\\.)*)(") + + + captures + + 1 + + name + punctuation.definition.variable.begin.toml + + 2 + + name + punctuation.definition.variable.end.toml + + + match + (')[^']*(') + + + + 3 + + name + punctuation.separator.key-value.toml + + + comment + Dotted key + end + (?<=\S)(?<!=)|$ + patterns + + + include + #primatives + + + + + + primatives + + patterns + + + begin + \G""" + beginCaptures + + 0 + + name + punctuation.definition.string.begin.toml + + + end + "{3,5} + endCaptures + + 0 + + name + punctuation.definition.string.end.toml + + + name + string.quoted.triple.double.toml + patterns + + + match + \\([btnfr"\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}) + name + constant.character.escape.toml + + + match + \\[^btnfr"\\\n] + name + invalid.illegal.escape.toml + + + + + begin + \G" + beginCaptures + + 0 + + name + punctuation.definition.string.begin.toml + + + end + " + endCaptures + + 0 + + name + punctuation.definition.string.end.toml + + + name + string.quoted.double.toml + patterns + + + match + \\([btnfr"\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}) + name + constant.character.escape.toml + + + match + \\[^btnfr"\\] + name + invalid.illegal.escape.toml + + + + + begin + \G''' + beginCaptures + + 0 + + name + punctuation.definition.string.begin.toml + + + end + '{3,5} + endCaptures + + 0 + + name + punctuation.definition.string.end.toml + + + name + string.quoted.triple.single.toml + + + begin + \G' + beginCaptures + + 0 + + name + punctuation.definition.string.begin.toml + + + end + ' + endCaptures + + 0 + + name + punctuation.definition.string.end.toml + + + name + string.quoted.single.toml + + + match + \G(?x) + [0-9]{4} + - + (0[1-9]|1[012]) + - + (?!00|3[2-9])[0-3][0-9] + ( + [Tt ] + (?!2[5-9])[0-2][0-9] + : + [0-5][0-9] + : + (?!6[1-9])[0-6][0-9] + (\.[0-9]+)? + ( + Z + | [+-](?!2[5-9])[0-2][0-9]:[0-5][0-9] + )? + )? + + name + constant.other.date.toml + + + match + \G(?x) + (?!2[5-9])[0-2][0-9] + : + [0-5][0-9] + : + (?!6[1-9])[0-6][0-9] + (\.[0-9]+)? + + name + constant.other.time.toml + + + match + \G(true|false) + name + constant.language.boolean.toml + + + match + \G0x\h(\h|_\h)* + name + constant.numeric.hex.toml + + + match + \G0o[0-7]([0-7]|_[0-7])* + name + constant.numeric.octal.toml + + + match + \G0b[01]([01]|_[01])* + name + constant.numeric.binary.toml + + + match + \G[+-]?(inf|nan) + name + constant.numeric.toml + + + match + (?x) + \G + ( + [+-]? + ( + 0 + | ([1-9](([0-9]|_[0-9])+)?) + ) + ) + (?=[.eE]) + ( + \. + ([0-9](([0-9]|_[0-9])+)?) + )? + ( + [eE] + ([+-]?[0-9](([0-9]|_[0-9])+)?) + )? + + name + constant.numeric.float.toml + + + match + (?x) + \G + ( + [+-]? + ( + 0 + | ([1-9](([0-9]|_[0-9])+)?) + ) + ) + + name + constant.numeric.integer.toml + + + begin + \G\[ + beginCaptures + + 0 + + name + punctuation.definition.array.begin.toml + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.array.end.toml + + + name + meta.array.toml + patterns + + + begin + (?=["'']|[+-]?[0-9]|[+-]?(inf|nan)|true|false|\[|\{) + end + ,|(?=]) + endCaptures + + 0 + + name + punctuation.separator.array.toml + + + patterns + + + include + #primatives + + + include + #comments + + + include + #invalid + + + + + include + #comments + + + include + #invalid + + + + + begin + \G\{ + beginCaptures + + 0 + + name + punctuation.definition.inline-table.begin.toml + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.inline-table.end.toml + + + name + meta.inline-table.toml + patterns + + + begin + (?=\S) + end + ,|(?=}) + endCaptures + + 0 + + name + punctuation.separator.inline-table.toml + + + patterns + + + include + #key_pair + + + + + include + #comments + + + + + + + scopeName + source.toml + uuid + 7DEF2EDB-5BB7-4DD2-9E78-3541A26B7923 + + diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/grammars/viml.json pycharm-2020.3/plugins/textmate/lib/bundles/viml/grammars/viml.json --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/grammars/viml.json 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/grammars/viml.json 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,1203 @@ +{ + "name": "VimL", + "scopeName": "source.viml", + "fileTypes": [ + "vim", + "vimrc", + "gvimrc", + "nvimrc", + "_vimrc", + "vmb", + "ideavimrc" + ], + "firstLineMatch": "(?x)\n\n# Vimball\n(?:^|\\n)UseVimball\\b\n\n|\n\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)\n\t(?:vim|nvim)\n(?:$|\\s)\n\n|\n\n# Modeline\n(?i:\n\t# Vim/Vi modeline, accounting for all possible variations\n\t(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))\n\t(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:]\n\t(?:filetype|ft|syntax)\\s*=\n\t\tvim\n\t(?=\\s|:|$)\n\t\n\t|\n\t\n\t# Emacs modeline, assuming a major mode for VimScript even exists\n\t-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n\t\t(?:Vim|VimL|VimScript)\n\t(?=[\\s;]|(?]?\\d+|m)?|[\\t\\x20]ex):\\s*(?=set?\\s)", + "end": ":|$" + }, + { + "name": "string.other.modeline.viml", + "patterns": [ + { + "include": "$self" + } + ], + "begin": "(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|[\\t\\x20]ex):", + "end": "$" + } + ] + }, + "hashbang": { + "name": "comment.line.shebang.viml", + "begin": "\\A#!", + "end": "$", + "beginCaptures": { + "0": { + "name": "punctuation.definition.comment.shebang.viml" + } + } + }, + "numbers": { + "patterns": [ + { + "name": "constant.numeric.hex.viml", + "match": "0[xX][0-9A-Fa-f]+" + }, + { + "name": "constant.numeric.float.exponential.viml", + "match": "(?<]=[#?]?|[=!]~(?!\\/)[#?]?|[><][#?*]|\\b(?:isnot|is)\\b|\\\\|[-+%*]" + }, + { + "match": "\\s[><]\\s", + "name": "keyword.operator.logical.viml" + }, + { + "match": "(?<=\\S)!", + "name": "storage.modifier.force.viml" + }, + { + "match": "!(?=\\S)", + "name": "keyword.operator.logical.not.viml" + }, + { + "match": "{", + "name": "punctuation.expression.bracket.curly.begin.viml" + }, + { + "match": "}", + "name": "punctuation.expression.bracket.curly.end.viml" + }, + { + "match": "\\[", + "name": "punctuation.expression.bracket.square.begin.viml" + }, + { + "match": "\\]", + "name": "punctuation.expression.bracket.square.end.viml" + }, + { + "match": "\\(", + "name": "punctuation.expression.bracket.round.begin.viml" + }, + { + "match": "\\)", + "name": "punctuation.expression.bracket.round.end.viml" + }, + { + "match": "\\|", + "name": "punctuation.separator.statement.viml" + }, + { + "match": ",", + "name": "punctuation.separator.comma.viml" + }, + { + "match": ":", + "name": "punctuation.separator.colon.viml" + }, + { + "match": "\\.{3}", + "name": "keyword.operator.rest.viml" + }, + { + "match": "\\.", + "name": "punctuation.delimiter.property.dot.viml" + }, + { + "match": "&(?=\\w+)", + "name": "punctuation.definition.option.viml" + } + ] + }, + "keyword": { + "patterns": [ + { + "name": "keyword.control.$1.viml", + "match": "\\b(if|while|for|return|try|catch|finally|end(if|for|while|try)?|else(if)?|do|in|:)\\b" + }, + { + "name": "keyword.operator.$1.viml", + "match": "\\b(unlet)\\b" + }, + { + "name": "storage.type.let.viml", + "match": "\\blet\\b" + }, + { + "name": "support.constant.vimball.use.viml", + "match": "(?<=^|\\n)UseVimball(?=\\s*$)" + } + ] + }, + "register": { + "name": "variable.other.register.viml", + "match": "(@)([-\"A-Za-z\\d:.%#=*+~_/])", + "captures": { + "1": { + "name": "punctuation.definition.register.viml" + } + } + }, + "variable": { + "patterns": [ + { + "name": "variable.language.self.viml", + "match": "\\b(self)\\b" + }, + { + "name": "support.variable.environment.viml", + "match": "(\\$)\\w+", + "captures": { + "1": { + "name": "punctuation.definition.variable.viml" + } + } + }, + { + "name": "variable.other.viml", + "match": "(&?)(?:([sSgGbBwWlLaAvV](:))|[@$]|&(?!&))\\w*", + "captures": { + "1": { + "name": "punctuation.definition.reference.viml" + }, + "2": { + "name": "storage.modifier.scope.viml" + }, + "3": { + "name": "punctuation.definition.scope.key-value.viml" + } + } + } + ] + }, + "supportType": { + "name": "support.type.viml", + "match": "(<).*?(>)", + "captures": { + "1": { + "name": "punctuation.definition.bracket.angle.begin.viml" + }, + "2": { + "name": "punctuation.definition.bracket.angle.end.viml" + } + } + }, + "supportVariable": { + "name": "support.variable.viml", + "match": "\\b(?:am(?:enu)?|(?:hl|inc)?search|[Bb]uf(?:[Nn]ew[Ff]ile|[Rr]ead)?|[Ff]ile[Tt]ype)\\b" + }, + "highlightLink": { + "match": "(?x)^\\s* (:)? \\s* (?# 1: punctuation.separator.key-value.colon.viml) (hi|highlight) (?# 2: support.function.highlight.viml) (!)? (?# 3: storage.modifier.force.viml) (?:\\s+(def|default))? (?# 4: support.function.highlight-default.viml) (?:\\s+(link)) (?# 5: support.function.highlight-link.viml) (?:\\s+([-\\w]+)) (?# 6: variable.parameter.group-name.viml) (?:\\s+(?:(NONE)|([-\\w]+)))?", + "captures": { + "1": { + "name": "punctuation.separator.key-value.colon.viml" + }, + "2": { + "name": "support.function.highlight.viml" + }, + "3": { + "name": "storage.modifier.force.viml" + }, + "4": { + "name": "support.function.highlight-default.viml" + }, + "5": { + "name": "support.function.highlight-link.viml" + }, + "6": { + "name": "variable.parameter.group-name.viml" + }, + "7": { + "name": "support.constant.highlighting.viml" + }, + "8": { + "name": "variable.parameter.group-name.viml" + } + } + }, + "syntax": { + "name": "meta.syntax-item.viml", + "begin": "^\\s*(:)?\\s*(syntax|syn?)(?=\\s|$)", + "end": "$", + "beginCaptures": { + "1": { + "name": "punctuation.separator.key-value.colon.viml" + }, + "2": { + "name": "support.function.syntax-item.viml" + } + }, + "patterns": [ + { + "match": "\\G\\s+(case)(?:\\s+(match|ignore))?(?=\\s|$)", + "captures": { + "1": { + "name": "support.function.syntax-case.viml" + }, + "2": { + "name": "support.constant.$2-case.viml" + } + } + }, + { + "match": "\\G\\s+(spell)(?:\\s+(toplevel|notoplevel|default))?(?=\\s|$)", + "captures": { + "1": { + "name": "support.function.syntax-spellcheck.viml" + }, + "2": { + "name": "support.constant.$2-checking.viml" + } + } + }, + { + "begin": "\\G\\s+(keyword)(?:\\s+([-\\w]+))?", + "end": "(?=$)", + "beginCaptures": { + "1": { + "name": "support.function.syntax-keywords.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + }, + "contentName": "keyword.other.syntax-definition.viml", + "patterns": [ + { + "include": "#syntaxOptions" + }, + { + "include": "#assignment" + }, + { + "include": "#expr" + } + ] + }, + { + "begin": "\\G\\s+(match)(?:\\s+([-\\w]+))?\\s*", + "end": "(?=$)", + "beginCaptures": { + "1": { + "name": "support.function.syntax-match.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + }, + "patterns": [ + { + "include": "#syntaxRegex" + } + ] + }, + { + "begin": "\\G\\s+(region)(?:\\s+([-\\w]+))?", + "end": "(?=$)", + "beginCaptures": { + "1": { + "name": "support.function.syntax-region.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + }, + "patterns": [ + { + "include": "#syntaxOptions" + }, + { + "include": "$self" + } + ] + }, + { + "begin": "\\G\\s+(cluster)(?:\\s+([-\\w]+))?(?=\\s|$)", + "end": "(?=$)", + "beginCaptures": { + "1": { + "name": "support.function.syntax-cluster.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + }, + "patterns": [ + { + "include": "#syntaxOptions" + }, + { + "include": "$self" + } + ] + }, + { + "match": "\\G\\s+(conceal)(?:\\s+(on|off)(?=\\s|$))?", + "captures": { + "1": { + "name": "support.function.syntax-conceal.viml" + }, + "2": { + "name": "support.constant.boolean.$2.viml" + } + } + }, + { + "match": "\\G\\s+(include)(?:\\s+((@)?[-\\w]+))?(?:\\s+(\\S+))?", + "captures": { + "1": { + "name": "support.function.syntax-include.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + }, + "3": { + "name": "punctuation.definition.group-reference.viml" + }, + "4": { + "name": "string.unquoted.filename.viml", + "patterns": [ + { + "include": "#supportType" + } + ] + } + } + }, + { + "begin": "\\G\\s+(sync)(?=\\s|$)", + "end": "$", + "beginCaptures": { + "1": { + "name": "support.function.syntax-sync.viml" + } + }, + "patterns": [ + { + "match": "\\G\\s+(fromstart)(?=\\s|$)", + "captures": { + "1": { + "name": "support.constant.sync-$1.viml" + } + } + }, + { + "match": "\\G\\s+(ccomment|clear)(?:\\s+(?![-\\w]+\\s*=)([-\\w]+))?", + "captures": { + "1": { + "name": "support.constant.sync-$1.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + } + }, + { + "match": "\\G\\s+(minlines|lines)\\s*(=)(\\d*)", + "captures": { + "1": { + "name": "support.constant.sync-mode.viml" + }, + "2": { + "name": "punctuation.assignment.parameter.viml" + }, + "3": { + "name": "constant.numeric.integer.viml" + } + } + }, + { + "match": "(?x)\\G\\s+(match|region)(?:\\s+(?![-\\w]+\\s*=)([-\\w]+))?", + "captures": { + "1": { + "name": "support.constant.sync-mode.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + }, + "3": { + "name": "support.constant.sync-mode-location.viml" + } + } + }, + { + "begin": "(?<=\\s)(groupt?here|linecont)(?:\\s+(?![-\\w]+\\s*=)([-\\w]+))?(?=\\s|$)", + "end": "(?=$)", + "beginCaptures": { + "1": { + "name": "support.constant.sync-match.viml" + }, + "2": { + "name": "variable.parameter.group-name.viml" + } + }, + "patterns": [ + { + "include": "#syntaxRegex" + } + ] + }, + { + "include": "#syntaxOptions" + } + ] + }, + { + "include": "$self" + } + ] + }, + "syntaxOptions": { + "patterns": [ + { + "name": "meta.syntax-item.pattern-argument.viml", + "begin": "(?<=\\s)(start|skip|end)(?:\\s*(=))", + "end": "(?=$|\\s)", + "beginCaptures": { + "1": { + "name": "support.constant.$1-pattern.viml" + }, + "2": { + "name": "punctuation.assignment.parameter.viml" + } + }, + "patterns": [ + { + "include": "#regex" + } + ] + }, + { + "name": "meta.syntax-item.argument.viml", + "match": "(?x)(?<=\\s)\n((?:matchgroup|contains|containedin|nextgroup|add|remove|minlines|linebreaks|maxlines)(?=\\s*=)\n|(?:cchar|conceal|concealends|contained|display|excludenl|extend|fold|keepend|oneline|skipempty|skipnl|skipwhite|transparent))\n(?:(?=$|\\s)|\\s*(=)(\\S*)?)", + "captures": { + "1": { + "name": "support.constant.syntax-$1.viml" + }, + "2": { + "name": "punctuation.assignment.parameter.viml" + }, + "3": { + "name": "string.unquoted.syntax-option.viml", + "patterns": [ + { + "include": "#numbers" + }, + { + "match": ",", + "name": "punctuation.separator.comma.viml" + }, + { + "match": "@", + "name": "punctuation.definition.group-reference.viml" + } + ] + } + } + } + ] + }, + "syntaxRegex": { + "patterns": [ + { + "include": "#syntaxOptions" + }, + { + "name": "string.regexp.viml", + "begin": "(?<=\\s)(\\S)", + "end": "(?:(\\1)(\\S*)(.*))?$", + "patterns": [ + { + "include": "#regexInnards" + } + ], + "beginCaptures": { + "1": { + "name": "punctuation.definition.string.begin.viml" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.definition.string.end.viml" + }, + "2": { + "patterns": [ + { + "include": "#regexOffset" + } + ] + }, + "3": { + "patterns": [ + { + "include": "#syntaxOptions" + }, + { + "include": "$self" + } + ] + } + } + } + ] + }, + "regex": { + "name": "string.regexp.viml", + "begin": "(?<=\\s|=)(\\S)", + "end": "$|(\\1)(\\S*)", + "patterns": [ + { + "include": "#regexInnards" + } + ], + "beginCaptures": { + "1": { + "name": "punctuation.definition.string.begin.viml" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.definition.string.end.viml" + }, + "2": { + "patterns": [ + { + "include": "#regexOffset" + } + ] + } + } + }, + "regexOffset": { + "name": "meta.pattern-offset.viml", + "match": "(ms|me|hs|he|rs|re|lc)(=)(?:(\\d+)|([se])(?:([-+])(\\d+))?)(,)?", + "captures": { + "1": { + "name": "constant.language.pattern-offset.viml" + }, + "2": { + "name": "punctuation.assignment.parameter.viml" + }, + "3": { + "name": "constant.numeric.integer.viml" + }, + "4": { + "name": "constant.language.pattern-position.viml" + }, + "5": { + "name": "keyword.operator.arithmetic.viml" + }, + "6": { + "name": "constant.numeric.integer.viml" + }, + "7": { + "name": "punctuation.separator.comma.viml" + } + } + }, + "regexInnards": { + "patterns": [ + { + "begin": "\\[", + "end": "\\]|$", + "beginCaptures": { + "0": { + "name": "punctuation.definition.character-class.begin.viml" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.character-class.end.viml" + } + }, + "patterns": [ + { + "include": "#regexInnards" + } + ] + }, + { + "name": "constant.character.escape.viml", + "match": "(\\\\).", + "captures": { + "1": { + "name": "punctuation.definition.backslash.escape.viml" + } + } + } + ] + }, + "extraVimFunc": { + "name": "support.function.viml", + "match": "(?x)\\b\n\t((?:echo(?:hl?)?)|exe(?:c(?:ute)?)?|[lxvn]?noremap|smapc(?:lear)?|mapmode|xmap|(?:[xs]un|snore)map\n\t|Plugin|autocmd|[cinvo]?(?:un|nore)?(?:map|menu)|(?:range)?go(?:to)?|(?:count)?(?:pop?|tag?|tn(?:ext)?|tp(?:revious)?|tr(?:ewind)?)\n\t|(?:range)?(?:s(?:ubstitute)?|ret(?:ab)?|g(?:lobal)?)|unm(?:ap)?|map_l|mapc(?:lear)?|N?buffer|N?bnext|N?bNext|N?bprevious|N?bmod\n\t|ab(?:breviate)?|norea(?:bbrev)?|[ic](?:un|nore)?ab|split_f|rangefold|[ic](?:un|nore)?ab|[ic]abbrev|edit_f|next_f|[vcoxli]u\n\t|(?:range)?(?:w(?:rite)?|up(?:date)?)|sar|cno|[vl]n|[io]?no|[xn]n|snor|lm(?:ap)?|lunmap|lear|[vnx]m|om|[ci]m|ap|nun|sunm)\n\\b" + }, + "keywordLists": { + "patterns": [ + { + "include": "#vimTodo" + }, + { + "include": "#vimAugroupKey" + }, + { + "include": "#vimAutoEvent" + }, + { + "include": "#vimBehaveModel" + }, + { + "include": "#vimCommand" + }, + { + "include": "#vimFTCmd" + }, + { + "include": "#vimFTOption" + }, + { + "include": "#vimFgBgAttrib" + }, + { + "include": "#vimFuncKey" + }, + { + "include": "#vimFuncName" + }, + { + "include": "#vimGroup" + }, + { + "include": "#vimGroupSpecial" + }, + { + "include": "#vimHLGroup" + }, + { + "include": "#vimHiAttrib" + }, + { + "include": "#vimHiClear" + }, + { + "include": "#vimHiCtermColor" + }, + { + "include": "#vimMapModKey" + }, + { + "include": "#vimOption" + }, + { + "include": "#vimPattern" + }, + { + "include": "#vimStdPlugin" + }, + { + "include": "#vimSynCase" + }, + { + "include": "#vimSynType" + }, + { + "include": "#vimSyncC" + }, + { + "include": "#vimSyncLinecont" + }, + { + "include": "#vimSyncMatch" + }, + { + "include": "#vimSyncNone" + }, + { + "include": "#vimSyncRegion" + }, + { + "include": "#vimUserAttrbCmplt" + }, + { + "include": "#vimUserAttrbKey" + }, + { + "include": "#vimUserCommand" + }, + { + "include": "#vimErrSetting" + } + ] + }, + "vimTodo": { + "name": "support.constant.${1:/downcase}.viml", + "match": "(?x) \\b\n( COMBAK\n| FIXME\n| TODO\n| XXX\n) \\b" + }, + "vimAugroupKey": { + "name": "support.function.vimAugroupKey.viml", + "match": "(?x) \\b\n( aug\n| augroup\n) \\b" + }, + "vimAutoEvent": { + "name": "support.function.auto-event.viml", + "match": "(?xi) \\b\n( BufAdd\n| BufCreate\n| BufDelete\n| BufEnter\n| BufFilePost\n| BufFilePre\n| BufHidden\n| BufLeave\n| BufNewFile\n| BufNew\n| BufReadCmd\n| BufReadPost\n| BufReadPre\n| BufRead\n| BufUnload\n| BufWinEnter\n| BufWinLeave\n| BufWipeout\n| BufWriteCmd\n| BufWritePost\n| BufWritePre\n| BufWrite\n| CmdUndefined\n| CmdlineChanged\n| CmdlineEnter\n| CmdlineLeave\n| CmdwinEnter\n| CmdwinLeave\n| ColorSchemePre\n| ColorScheme\n| CompleteChanged\n| CompleteDonePre\n| CompleteDone\n| CursorHoldI\n| CursorHold\n| CursorMovedI\n| CursorMoved\n| DiffUpdated\n| DirChanged\n| EncodingChanged\n| ExitPre\n| FileAppendCmd\n| FileAppendPost\n| FileAppendPre\n| FileChangedRO\n| FileChangedShellPost\n| FileChangedShell\n| FileEncoding\n| FileReadCmd\n| FileReadPost\n| FileReadPre\n| FileType\n| FileWriteCmd\n| FileWritePost\n| FileWritePre\n| FilterReadPost\n| FilterReadPre\n| FilterWritePost\n| FilterWritePre\n| FocusGained\n| FocusLost\n| FuncUndefined\n| GUIEnter\n| GUIFailed\n| InsertChange\n| InsertCharPre\n| InsertEnter\n| InsertLeave\n| MenuPopup\n| OptionSet\n| QuickFixCmdPost\n| QuickFixCmdPre\n| QuitPre\n| RemoteReply\n| SafeStateAgain\n| SafeState\n| SessionLoadPost\n| ShellCmdPost\n| ShellFilterPost\n| SourceCmd\n| SourcePost\n| SourcePre\n| SpellFileMissing\n| StdinReadPost\n| StdinReadPre\n| SwapExists\n| Syntax\n| TabClosed\n| TabEnter\n| TabLeave\n| TabNew\n| TermChanged\n| TermResponse\n| TerminalOpen\n| TerminalWinOpen\n| TextChangedI\n| TextChangedP\n| TextChanged\n| TextYankPost\n| User\n| VimEnter\n| VimLeavePre\n| VimLeave\n| VimResized\n| WinEnter\n| WinLeave\n| WinNew\n) \\b" + }, + "vimBehaveModel": { + "name": "support.function.vimBehaveModel.viml", + "match": "(?x) \\b\n( mswin\n| xterm\n) \\b" + }, + "vimCommand": { + "name": "support.function.command.viml", + "match": "(?x) \\b\n( abc\n| abclear\n| abo\n| aboveleft\n| ab\n| addd\n| all?\n| ar\n| args\n| arga\n| argadd\n| argd\n| argdelete\n| argdo\n| arge\n| argedit\n| argg\n| argglobal\n| argl\n| arglocal\n| argu\n| argument\n| as\n| ascii\n| au\n| a\n| bN\n| bNext\n| b\n| buffer\n| ba\n| ball\n| badd?\n| bd\n| bdelete\n| bel\n| belowright\n| bf\n| bfirst\n| bl\n| blast\n| bm\n| bmodified\n| bn\n| bnext\n| bo\n| botright\n| bp\n| bprevious\n| br\n| brewind\n| break?\n| breaka\n| breakadd\n| breakd\n| breakdel\n| breakl\n| breaklist\n| bro\n| browse\n| bufdo\n| buffers\n| bun\n| bunload\n| bw\n| bwipeout\n| cN\n| cNext\n| cNf\n| cNfile\n| c\n| change\n| cabc\n| cabclear\n| cabo\n| cabove\n| cad\n| caddbuffer\n| cadde\n| caddexpr\n| caddf\n| caddfile\n| caf\n| cafter\n| call?\n| cat\n| catch\n| ca\n| cb\n| cbuffer\n| cbe\n| cbefore\n| cbel\n| cbelow\n| cbo\n| cbottom\n| ccl\n| cclose\n| cc\n| cdo\n| cd\n| ce\n| center\n| cex\n| cexpr\n| cf\n| cfile\n| cfdo\n| cfir\n| cfirst\n| cg\n| cgetfile\n| cgetb\n| cgetbuffer\n| cgete\n| cgetexpr\n| changes\n| chd\n| chdir\n| che\n| checkpath\n| checkt\n| checktime\n| chi\n| chistory\n| cl\n| clist\n| cla\n| clast\n| cle\n| clearjumps\n| clo\n| close\n| cmapc\n| cmapclear\n| cn\n| cnext\n| cnew\n| cnewer\n| cnf\n| cnfile\n| cnor\n| co\n| copy\n| col\n| colder\n| colo\n| colorscheme\n| comc\n| comclear\n| comp\n| compiler\n| com\n| con\n| continue\n| conf\n| confirm\n| const?\n| copen?\n| cp\n| cprevious\n| cpf\n| cpfile\n| cq\n| cquit\n| cr\n| crewind\n| cscope\n| cstag\n| cs\n| cuna\n| cunabbrev\n| cun\n| cw\n| cwindow\n| d\n| delete\n| debugg\n| debuggreedy\n| debug\n| def\n| delc\n| delcommand\n| delel\n| delep\n| deletel\n| deletep\n| deletl\n| deletp\n| delf\n| delfunction\n| dell\n| delm\n| delmarks\n| delp\n| dep\n| di\n| display\n| dif\n| diffupdate\n| diffg\n| diffget\n| diffo\n| diffoff\n| diffp\n| diffpatch\n| diffput?\n| diffs\n| diffsplit\n| difft\n| diffthis\n| dig\n| digraphs\n| dir\n| disa\n| disassemble\n| dj\n| djump\n| dli\n| dlist\n| dl\n| doaut\n| doau\n| do\n| dp\n| dr\n| drop\n| ds\n| dsearch\n| dsp\n| dsplit\n| e\n| edit\n| earlier\n| ea\n| echoe\n| echoerr\n| echom\n| echomsg\n| echon\n| ec\n| el\n| else\n| elseif?\n| em\n| emenu\n| en\n| endif\n| endd\n| enddef\n| endf\n| endfunction\n| endfor?\n| endt\n| endtry\n| endw\n| endwhile\n| enew?\n| eval\n| exit?\n| exp\n| export\n| exu\n| exusage\n| ex\n| f\n| file\n| files\n| filetype\n| filet\n| filt\n| filter\n| find?\n| fina\n| finally\n| fini\n| finish\n| fir\n| first\n| fix\n| fixdel\n| fo\n| fold\n| foldc\n| foldclose\n| foldd\n| folddoopen\n| folddoc\n| folddoclosed\n| foldo\n| foldopen\n| for\n| fu\n| function\n| go\n| goto\n| gr\n| grep\n| grepa\n| grepadd\n| gui\n| gvim\n| g\n| h\n| help\n| ha\n| hardcopy\n| helpc\n| helpclose\n| helpf\n| helpfind\n| helpg\n| helpgrep\n| helpt\n| helptags\n| hide?\n| his\n| history\n| hi\n| iabc\n| iabclear\n| ia\n| if\n| ij\n| ijump\n| il\n| ilist\n| imapc\n| imapclear\n| imp\n| import\n| inor\n| intro\n| in\n| is\n| isearch\n| isp\n| isplit\n| iuna\n| iunabbrev\n| i\n| j\n| join\n| ju\n| jumps\n| kee\n| keepmarks\n| keepalt\n| keepa\n| keepj\n| keepjumps\n| keepp\n| keeppatterns\n| k\n| lN\n| lNext\n| lNf\n| lNfile\n| l\n| list\n| la\n| last\n| lab\n| labove\n| lad\n| laddexpr\n| laddb\n| laddbuffer\n| laddf\n| laddfile\n| laf\n| lafter\n| lan\n| language\n| later\n| lat\n| lb\n| lbuffer\n| lbe\n| lbefore\n| lbel\n| lbelow\n| lbo\n| lbottom\n| lcd?\n| lch\n| lchdir\n| lcl\n| lclose\n| lcscope\n| lcs\n| ldo?\n| le\n| left\n| lefta\n| leftabove\n| lex\n| lexpr\n| lf\n| lfile\n| lfdo\n| lfir\n| lfirst\n| lg\n| lgetfile\n| lgetb\n| lgetbuffer\n| lgete\n| lgetexpr\n| lgr\n| lgrep\n| lgrepa\n| lgrepadd\n| lh\n| lhelpgrep\n| lhi\n| lhistory\n| lla\n| llast\n| lli\n| llist\n| ll\n| lmake?\n| lmapc\n| lmapclear\n| lma\n| lne\n| lnext\n| lnew\n| lnewer\n| lnf\n| lnfile\n| lo\n| loadview\n| loadkeymap\n| loadk\n| loc\n| lockmarks\n| lockv\n| lockvar\n| lol\n| lolder\n| lop\n| lopen\n| lp\n| lprevious\n| lpf\n| lpfile\n| lr\n| lrewind\n| ls\n| lt\n| ltag\n| luado\n| luafile\n| lua\n| lv\n| lvimgrep\n| lvimgrepa\n| lvimgrepadd\n| lw\n| lwindow\n| m\n| move\n| ma\n| mark\n| make?\n| marks\n| mat\n| match\n| menut\n| menutranslate\n| messages\n| mes\n| mk\n| mkexrc\n| mks\n| mksession\n| mksp\n| mkspell\n| mkv\n| mkvimrc\n| mkview?\n| mode?\n| mz\n| mzscheme\n| mzf\n| mzfile\n| n\n| next\n| nb\n| nbkey\n| nbc\n| nbclose\n| nbs\n| nbstart\n| new\n| nmapc\n| nmapclear\n| noautocmd\n| noa\n| noh\n| nohlsearch\n| nore\n| nor\n| nos\n| noswapfile\n| nu\n| number\n| o\n| open\n| ol\n| oldfiles\n| omapc\n| omapclear\n| on\n| only\n| opt\n| options\n| ownsyntax\n| p\n| print\n| pa\n| packadd\n| packl\n| packloadall\n| pc\n| pclose\n| pe\n| perl\n| ped\n| pedit\n| perldo?\n| pop?\n| popup?\n| pp\n| ppop\n| pre\n| preserve\n| prev\n| previous\n| prof\n| profile\n| profd\n| profdel\n| promptf\n| promptfind\n| promptr\n| promptrepl\n| pro\n| ps\n| psearch\n| ptN\n| ptNext\n| ptag?\n| ptf\n| ptfirst\n| ptj\n| ptjump\n| ptl\n| ptlast\n| ptn\n| ptnext\n| ptp\n| ptprevious\n| ptr\n| ptrewind\n| pts\n| ptselect\n| put?\n| pwd?\n| py3do\n| py3f\n| py3file\n| py3\n| py\n| python\n| pydo\n| pyf\n| pyfile\n| python3\n| pythonx\n| pyxdo\n| pyxfile\n| pyx\n| q\n| quit\n| qa\n| qall\n| quita\n| quitall\n| r\n| read\n| rec\n| recover\n| redo?\n| redir?\n| redr\n| redraw\n| redraws\n| redrawstatus\n| redrawt\n| redrawtabline\n| reg\n| registers\n| res\n| resize\n| ret\n| retab\n| retu\n| return\n| rew\n| rewind\n| ri\n| right\n| rightb\n| rightbelow\n| ru\n| runtime\n| ruby?\n| rubydo?\n| rubyf\n| rubyfile\n| rundo\n| rv\n| rviminfo\n| sIc\n| sIe\n| sIg\n| sIl\n| sIn\n| sIp\n| sIr\n| sI\n| sN\n| sNext\n| sa\n| sargument\n| sall?\n| san\n| sandbox\n| sav\n| saveas\n| sbN\n| sbNext\n| sb\n| sbuffer\n| sba\n| sball\n| sbf\n| sbfirst\n| sbl\n| sblast\n| sbm\n| sbmodified\n| sbn\n| sbnext\n| sbp\n| sbprevious\n| sbr\n| sbrewind\n| scI\n| sce\n| scg\n| sci\n| scl\n| scp\n| scr\n| scriptnames\n| scripte\n| scriptencoding\n| scriptv\n| scriptversion\n| scscope\n| scs\n| sc\n| set?\n| setf\n| setfiletype\n| setg\n| setglobal\n| setl\n| setlocal\n| sf\n| sfind\n| sfir\n| sfirst\n| sgI\n| sgc\n| sge\n| sgi\n| sgl\n| sgn\n| sgp\n| sgr\n| sg\n| sh\n| shell\n| sic\n| sie\n| sign\n| sig\n| sil\n| silent\n| sim\n| simalt\n| sin\n| sip\n| sir\n| si\n| sl\n| sleep\n| sla\n| slast\n| sm\n| smagic\n| sm\n| smap\n| smenu\n| sme\n| smile\n| sn\n| snext\n| sno\n| snomagic\n| snoremenu\n| snoreme\n| so\n| source\n| sort?\n| sp\n| split\n| spe\n| spellgood\n| spelld\n| spelldump\n| spelli\n| spellinfo\n| spellr\n| spellrare\n| spellr\n| spellrepall\n| spellr\n| spellrrare\n| spellu\n| spellundo\n| spellw\n| spellwrong\n| spr\n| sprevious\n| srI\n| src\n| sre\n| srewind\n| srg\n| sri\n| srl\n| srn\n| srp\n| sr\n| st\n| stop\n| stag?\n| star\n| startinsert\n| startg\n| startgreplace\n| startr\n| startreplace\n| stj\n| stjump\n| stopi\n| stopinsert\n| sts\n| stselect\n| sun\n| sunhide\n| sunmenu\n| sunme\n| sus\n| suspend\n| sv\n| sview\n| sw\n| swapname\n| syncbind\n| sync\n| syntime\n| syn\n| sy\n| tN\n| tNext\n| tag?\n| tabN\n| tabNext\n| tabc\n| tabclose\n| tabdo?\n| tabe\n| tabedit\n| tabf\n| tabfind\n| tabfir\n| tabfirst\n| tabl\n| tablast\n| tabm\n| tabmove\n| tabn\n| tabnext\n| tabnew\n| tabo\n| tabonly\n| tabp\n| tabprevious\n| tabr\n| tabrewind\n| tabs\n| tab\n| tags\n| tcl?\n| tcd\n| tch\n| tchdir\n| tcldo?\n| tclf\n| tclfile\n| te\n| tearoff\n| ter\n| terminal\n| tf\n| tfirst\n| th\n| throw\n| tj\n| tjump\n| tl\n| tlast\n| tlmenu\n| tlm\n| tlnoremenu\n| tln\n| tlunmenu\n| tlu\n| tm\n| tmenu\n| tmap?\n| tmapc\n| tmapclear\n| tn\n| tnext\n| tno\n| tnoremap\n| to\n| topleft\n| tp\n| tprevious\n| tr\n| trewind\n| try\n| ts\n| tselect\n| tu\n| tunmenu\n| tunmap?\n| t\n| u\n| undo\n| una\n| unabbreviate\n| undoj\n| undojoin\n| undol\n| undolist\n| unh\n| unhide\n| unlo\n| unlockvar\n| unl\n| uns\n| unsilent\n| up\n| update\n| ve\n| version\n| verb\n| verbose\n| vert\n| vertical\n| vi\n| visual\n| view?\n| vim9\n| vim9script\n| vim\n| vimgrep\n| vimgrepa\n| vimgrepadd\n| viu\n| viusage\n| vmapc\n| vmapclear\n| vnew?\n| vs\n| vsplit\n| v\n| wN\n| wNext\n| w\n| write\n| wa\n| wall\n| wh\n| while\n| win\n| winsize\n| winc\n| wincmd\n| windo\n| winp\n| winpos\n| wn\n| wnext\n| wp\n| wprevious\n| wqa\n| wqall\n| wq\n| wundo\n| wv\n| wviminfo\n| x\n| xit\n| xa\n| xall\n| xmapc\n| xmapclear\n| xmenu\n| xme\n| xnoremenu\n| xnoreme\n| xprop\n| xr\n| xrestore\n| xunmenu\n| xunme\n| xwininfo\n| y\n| yank\n) \\b" + }, + "vimErrSetting": { + "name": "invalid.deprecated.legacy-setting.viml", + "match": "(?x) \\b\n( autoprint\n| beautify\n| bioskey\n| biosk\n| conskey\n| consk\n| flash\n| graphic\n| hardtabs\n| ht\n| mesg\n| noautoprint\n| nobeautify\n| nobioskey\n| nobiosk\n| noconskey\n| noconsk\n| noflash\n| nographic\n| nohardtabs\n| nomesg\n| nonovice\n| noopen\n| nooptimize\n| noop\n| noredraw\n| noslowopen\n| noslow\n| nosourceany\n| novice\n| now1200\n| now300\n| now9600\n| open\n| optimize\n| op\n| redraw\n| slowopen\n| slow\n| sourceany\n| w1200\n| w300\n| w9600\n) \\b" + }, + "vimFTCmd": { + "name": "support.function.vimFTCmd.viml", + "match": "(?x) \\b\n( filet\n| filetype\n) \\b" + }, + "vimFTOption": { + "name": "support.function.vimFTOption.viml", + "match": "(?x) \\b\n( detect\n| indent\n| off\n| on\n| plugin\n) \\b" + }, + "vimFgBgAttrib": { + "name": "support.constant.attribute.viml", + "match": "(?x) \\b\n( background\n| bg\n| fg\n| foreground\n| none\n) \\b" + }, + "vimFuncKey": { + "name": "support.function.vimFuncKey.viml", + "match": "(?x) \\b\n( def\n| fu\n| function\n) \\b" + }, + "vimFuncName": { + "name": "support.function.viml", + "match": "(?x) \\b\n( abs\n| acos\n| add\n| and\n| appendbufline\n| append\n| argc\n| argidx\n| arglistid\n| argv\n| asin\n| assert_beeps\n| assert_equalfile\n| assert_equal\n| assert_exception\n| assert_fails\n| assert_false\n| assert_inrange\n| assert_match\n| assert_notequal\n| assert_notmatch\n| assert_report\n| assert_true\n| atan2\n| atan\n| balloon_gettext\n| balloon_show\n| balloon_split\n| browsedir\n| browse\n| bufadd\n| bufexists\n| buflisted\n| bufloaded\n| bufload\n| bufname\n| bufnr\n| bufwinid\n| bufwinnr\n| byte2line\n| byteidxcomp\n| byteidx\n| call\n| ceil\n| ch_canread\n| ch_close_in\n| ch_close\n| ch_evalexpr\n| ch_evalraw\n| ch_getbufnr\n| ch_getjob\n| ch_info\n| ch_logfile\n| ch_log\n| ch_open\n| ch_readblob\n| ch_readraw\n| ch_read\n| ch_sendexpr\n| ch_sendraw\n| ch_setoptions\n| ch_status\n| changenr\n| char2nr\n| chdir\n| cindent\n| clearmatches\n| col\n| complete_add\n| complete_check\n| complete_info\n| complete\n| confirm\n| copy\n| cosh\n| cos\n| count\n| cscope_connection\n| cursor\n| debugbreak\n| deepcopy\n| deletebufline\n| delete\n| did_filetype\n| diff_filler\n| diff_hlID\n| echoraw\n| empty\n| environ\n| escape\n| eval\n| eventhandler\n| executable\n| execute\n| exepath\n| exists\n| expandcmd\n| expand\n| exp\n| extend\n| feedkeys\n| filereadable\n| filewritable\n| filter\n| finddir\n| findfile\n| float2nr\n| floor\n| fmod\n| fnameescape\n| fnamemodify\n| foldclosedend\n| foldclosed\n| foldlevel\n| foldtextresult\n| foldtext\n| foreground\n| funcref\n| function\n| garbagecollect\n| getbufinfo\n| getbufline\n| getbufvar\n| getchangelist\n| getcharmod\n| getcharsearch\n| getchar\n| getcmdline\n| getcmdpos\n| getcmdtype\n| getcmdwintype\n| getcompletion\n| getcurpos\n| getcwd\n| getenv\n| getfontname\n| getfperm\n| getfsize\n| getftime\n| getftype\n| getimstatus\n| getjumplist\n| getline\n| getloclist\n| getmatches\n| getmousepos\n| getpid\n| getpos\n| getqflist\n| getregtype\n| getreg\n| gettabinfo\n| gettabvar\n| gettabwinvar\n| gettagstack\n| getwininfo\n| getwinposx\n| getwinposy\n| getwinpos\n| getwinvar\n| get\n| glob2regpat\n| globpath\n| glob\n| has_key\n| haslocaldir\n| hasmapto\n| has\n| histadd\n| histdel\n| histget\n| histnr\n| hlID\n| hlexists\n| hostname\n| iconv\n| indent\n| index\n| inputdialog\n| inputlist\n| inputrestore\n| inputsave\n| inputsecret\n| input\n| insert\n| interrupt\n| invert\n| isdirectory\n| isinf\n| islocked\n| isnan\n| items\n| job_getchannel\n| job_info\n| job_setoptions\n| job_start\n| job_status\n| job_stop\n| join\n| js_decode\n| js_encode\n| json_decode\n| json_encode\n| keys\n| len\n| libcallnr\n| libcall\n| line2byte\n| line\n| lispindent\n| list2str\n| listener_add\n| listener_flush\n| listener_remove\n| localtime\n| log10\n| log\n| luaeval\n| maparg\n| mapcheck\n| map\n| matchaddpos\n| matchadd\n| matcharg\n| matchdelete\n| matchend\n| matchlist\n| matchstrpos\n| matchstr\n| match\n| max\n| min\n| mkdir\n| mode\n| mzeval\n| nextnonblank\n| nr2char\n| or\n| pathshorten\n| perleval\n| popup_atcursor\n| popup_beval\n| popup_clear\n| popup_close\n| popup_create\n| popup_dialog\n| popup_filter_menu\n| popup_filter_yesno\n| popup_findinfo\n| popup_findpreview\n| popup_getoptions\n| popup_getpos\n| popup_hide\n| popup_menu\n| popup_move\n| popup_notification\n| popup_setoptions\n| popup_settext\n| popup_show\n| pow\n| prevnonblank\n| printf\n| prompt_setcallback\n| prompt_setinterrupt\n| prompt_setprompt\n| prop_add\n| prop_clear\n| prop_find\n| prop_list\n| prop_remove\n| prop_type_add\n| prop_type_change\n| prop_type_delete\n| prop_type_get\n| prop_type_list\n| pum_getpos\n| pumvisible\n| py3eval\n| pyeval\n| pyxeval\n| rand\n| range\n| readdir\n| readfile\n| reg_executing\n| reg_recording\n| reltimefloat\n| reltimestr\n| reltime\n| remote_expr\n| remote_foreground\n| remote_peek\n| remote_read\n| remote_send\n| remote_startserver\n| remove\n| rename\n| repeat\n| resolve\n| reverse\n| round\n| rubyeval\n| screenattr\n| screenchars\n| screenchar\n| screencol\n| screenpos\n| screenrow\n| screenstring\n| searchdecl\n| searchpairpos\n| searchpair\n| searchpos\n| search\n| server2client\n| serverlist\n| setbufline\n| setbufvar\n| setcharsearch\n| setcmdpos\n| setenv\n| setfperm\n| setline\n| setloclist\n| setmatches\n| setpos\n| setqflist\n| setreg\n| settabvar\n| settabwinvar\n| settagstack\n| setwinvar\n| sha256\n| shellescape\n| shiftwidth\n| sign_define\n| sign_getdefined\n| sign_getplaced\n| sign_jump\n| sign_placelist\n| sign_place\n| sign_undefine\n| sign_unplacelist\n| sign_unplace\n| simplify\n| sinh\n| sin\n| sort\n| sound_clear\n| sound_playevent\n| sound_playfile\n| sound_stop\n| soundfold\n| spellbadword\n| spellsuggest\n| split\n| sqrt\n| srand\n| state\n| str2float\n| str2list\n| str2nr\n| strcharpart\n| strchars\n| strdisplaywidth\n| strftime\n| strgetchar\n| stridx\n| string\n| strlen\n| strpart\n| strptime\n| strridx\n| strtrans\n| strwidth\n| submatch\n| substitute\n| swapinfo\n| swapname\n| synIDattr\n| synIDtrans\n| synID\n| synconcealed\n| synstack\n| systemlist\n| system\n| tabpagebuflist\n| tabpagenr\n| tabpagewinnr\n| tagfiles\n| taglist\n| tanh\n| tan\n| tempname\n| term_dumpdiff\n| term_dumpload\n| term_dumpwrite\n| term_getaltscreen\n| term_getansicolors\n| term_getattr\n| term_getcursor\n| term_getjob\n| term_getline\n| term_getscrolled\n| term_getsize\n| term_getstatus\n| term_gettitle\n| term_gettty\n| term_list\n| term_scrape\n| term_sendkeys\n| term_setansicolors\n| term_setapi\n| term_setkill\n| term_setrestore\n| term_setsize\n| term_start\n| term_wait\n| test_alloc_fail\n| test_autochdir\n| test_feedinput\n| test_garbagecollect_now\n| test_garbagecollect_soon\n| test_getvalue\n| test_ignore_error\n| test_null_blob\n| test_null_channel\n| test_null_dict\n| test_null_job\n| test_null_list\n| test_null_partial\n| test_null_string\n| test_option_not_set\n| test_override\n| test_refcount\n| test_scrollbar\n| test_setmouse\n| test_settime\n| test_srand_seed\n| test_unknown\n| test_void\n| timer_info\n| timer_pause\n| timer_start\n| timer_stopall\n| timer_stop\n| tolower\n| toupper\n| trim\n| trunc\n| tr\n| type\n| undofile\n| undotree\n| uniq\n| values\n| virtcol\n| visualmode\n| wildmenumode\n| win_execute\n| win_findbuf\n| win_getid\n| win_gettype\n| win_gotoid\n| win_id2tabwin\n| win_id2win\n| win_screenpos\n| win_splitmove\n| win_type\n| winbufnr\n| wincol\n| windowsversion\n| winheight\n| winlayout\n| winline\n| winnr\n| winrestcmd\n| winrestview\n| winsaveview\n| winwidth\n| wordcount\n| writefile\n| xor\n) \\b" + }, + "vimGroup": { + "name": "support.type.group.viml", + "match": "(?xi) \\b\n( Boolean\n| Character\n| Comment\n| Conditional\n| Constant\n| Debug\n| Define\n| Delimiter\n| Error\n| Exception\n| Float\n| Function\n| Identifier\n| Ignore\n| Include\n| Keyword\n| Label\n| Macro\n| Number\n| Operator\n| PreCondit\n| PreProc\n| Repeat\n| SpecialChar\n| SpecialComment\n| Special\n| Statement\n| StorageClass\n| String\n| Structure\n| Tag\n| Todo\n| Typedef\n| Type\n| Underlined\n) \\b" + }, + "vimGroupSpecial": { + "name": "support.function.vimGroupSpecial.viml", + "match": "(?x) \\b\n( ALLBUT\n| ALL\n| CONTAINED\n| TOP\n) \\b" + }, + "vimHLGroup": { + "name": "support.type.highlight-group.viml", + "match": "(?xi) \\b\n( ColorColumn\n| CursorColumn\n| CursorIM\n| CursorLineNr\n| CursorLine\n| Cursor\n| DiffAdd\n| DiffChange\n| DiffDelete\n| DiffText\n| Directory\n| EndOfBuffer\n| ErrorMsg\n| FoldColumn\n| Folded\n| IncSearch\n| LineNrAbove\n| LineNrBelow\n| LineNr\n| MatchParen\n| Menu\n| ModeMsg\n| MoreMsg\n| NonText\n| Normal\n| PmenuSbar\n| PmenuSel\n| PmenuThumb\n| Pmenu\n| Question\n| QuickFixLine\n| Scrollbar\n| Search\n| SignColumn\n| SpecialKey\n| SpellBad\n| SpellCap\n| SpellLocal\n| SpellRare\n| StatusLineNC\n| StatusLineTerm\n| StatusLine\n| TabLineFill\n| TabLineSel\n| TabLine\n| Terminal\n| Title\n| Tooltip\n| VertSplit\n| VisualNOS\n| Visual\n| WarningMsg\n| WildMenu\n) \\b" + }, + "vimHiAttrib": { + "name": "support.function.vimHiAttrib.viml", + "match": "(?x) \\b\n( bold\n| inverse\n| italic\n| nocombine\n| none\n| reverse\n| standout\n| strikethrough\n| undercurl\n| underline\n) \\b" + }, + "vimHiClear": { + "name": "support.function.vimHiClear.viml", + "match": "(?x) \\b\n( clear\n) \\b" + }, + "vimHiCtermColor": { + "name": "support.constant.colour.color.$1.viml", + "match": "(?x) \\b\n( black\n| blue\n| brown\n| cyan\n| darkblue\n| darkcyan\n| darkgray\n| darkgreen\n| darkgrey\n| darkmagenta\n| darkred\n| darkyellow\n| gray\n| green\n| grey\n| lightblue\n| lightcyan\n| lightgray\n| lightgreen\n| lightgrey\n| lightmagenta\n| lightred\n| magenta\n| red\n| white\n| yellow\n) \\b" + }, + "vimMapModKey": { + "name": "support.function.vimMapModKey.viml", + "match": "(?x) \\b\n( buffer\n| expr\n| leader\n| localleader\n| nowait\n| plug\n| script\n| sid\n| silent\n| unique\n) \\b" + }, + "vimOption": { + "name": "support.variable.option.viml", + "match": "(?x) \\b\n( acd\n| ai\n| akm\n| aleph\n| allowrevins\n| altkeymap\n| al\n| ambiwidth\n| ambw\n| antialias\n| anti\n| arabicshape\n| arabic\n| arab\n| ari\n| arshape\n| ar\n| autochdir\n| autoindent\n| autoread\n| autowriteall\n| autowrite\n| awa\n| aw\n| background\n| backspace\n| backupcopy\n| backupdir\n| backupext\n| backupskip\n| backup\n| balloondelay\n| balloonevalterm\n| ballooneval\n| balloonexpr\n| bdir\n| bdlay\n| belloff\n| bevalterm\n| beval\n| bexpr\n| bex\n| bg\n| bh\n| binary\n| bin\n| bkc\n| bk\n| bl\n| bomb\n| bo\n| breakat\n| breakindentopt\n| breakindent\n| briopt\n| bri\n| brk\n| browsedir\n| bsdir\n| bsk\n| bs\n| bt\n| bufhidden\n| buflisted\n| buftype\n| casemap\n| cb\n| ccv\n| cc\n| cdpath\n| cd\n| cedit\n| cfu\n| cf\n| charconvert\n| ch\n| cindent\n| cinkeys\n| cink\n| cinoptions\n| cino\n| cinwords\n| cinw\n| cin\n| ci\n| clipboard\n| cmdheight\n| cmdwinheight\n| cmp\n| cms\n| cm\n| cocu\n| cole\n| colorcolumn\n| columns\n| commentstring\n| comments\n| compatible\n| completefunc\n| completeopt\n| completepopup\n| completeslash\n| complete\n| com\n| confirm\n| copyindent\n| cot\n| co\n| cpoptions\n| cpo\n| cpp\n| cpt\n| cp\n| crb\n| cryptmethod\n| cscopepathcomp\n| cscopeprg\n| cscopequickfix\n| cscoperelative\n| cscopetagorder\n| cscopetag\n| cscopeverbose\n| csl\n| cspc\n| csprg\n| csqf\n| csre\n| csto\n| cst\n| csverb\n| cuc\n| culopt\n| cul\n| cursorbind\n| cursorcolumn\n| cursorlineopt\n| cursorline\n| cursor\n| cwh\n| debug\n| deco\n| define\n| def\n| delcombine\n| dex\n| dg\n| dictionary\n| dict\n| diffexpr\n| diffopt\n| diff\n| digraph\n| dip\n| directory\n| dir\n| display\n| dy\n| eadirection\n| ead\n| ea\n| eb\n| edcompatible\n| ed\n| efm\n| ef\n| ei\n| ek\n| emoji\n| emo\n| encoding\n| enc\n| endofline\n| eol\n| ep\n| equalalways\n| equalprg\n| errorbells\n| errorfile\n| errorformat\n| esckeys\n| et\n| eventignore\n| expandtab\n| exrc\n| ex\n| fcl\n| fcs\n| fdc\n| fde\n| fdi\n| fdls\n| fdl\n| fdm\n| fdn\n| fdo\n| fdt\n| fencs\n| fenc\n| fen\n| fex\n| ffs\n| ff\n| fic\n| fileencodings\n| fileencoding\n| fileformats\n| fileformat\n| fileignorecase\n| filetype\n| fillchars\n| fixendofline\n| fixeol\n| fkmap\n| fk\n| flp\n| fml\n| fmr\n| foldclose\n| foldcolumn\n| foldenable\n| foldexpr\n| foldignore\n| foldlevelstart\n| foldlevel\n| foldmarker\n| foldmethod\n| foldminlines\n| foldnestmax\n| foldopen\n| foldtext\n| formatexpr\n| formatlistpat\n| formatoptions\n| formatprg\n| fo\n| fp\n| fsync\n| fs\n| ft\n| gcr\n| gdefault\n| gd\n| gfm\n| gfn\n| gfs\n| gfw\n| ghr\n| go\n| gp\n| grepformat\n| grepprg\n| gtl\n| gtt\n| guicursor\n| guifontset\n| guifontwide\n| guifont\n| guiheadroom\n| guioptions\n| guipty\n| guitablabel\n| guitabtooltip\n| helpfile\n| helpheight\n| helplang\n| hf\n| hh\n| hidden\n| hid\n| highlight\n| history\n| hi\n| hkmapp\n| hkmap\n| hkp\n| hk\n| hlg\n| hlsearch\n| hls\n| hl\n| iconstring\n| icon\n| ic\n| ignorecase\n| imactivatefunc\n| imactivatekey\n| imaf\n| imak\n| imcmdline\n| imc\n| imdisable\n| imd\n| iminsert\n| imi\n| imsearch\n| imsf\n| imstatusfunc\n| imstyle\n| imst\n| ims\n| im\n| includeexpr\n| include\n| incsearch\n| inc\n| indentexpr\n| indentkeys\n| inde\n| indk\n| inex\n| infercase\n| inf\n| insertmode\n| invacd\n| invai\n| invakm\n| invallowrevins\n| invaltkeymap\n| invantialias\n| invanti\n| invarabicshape\n| invarabic\n| invarab\n| invari\n| invarshape\n| invar\n| invautochdir\n| invautoindent\n| invautoread\n| invautowriteall\n| invautowrite\n| invawa\n| invaw\n| invbackup\n| invballoonevalterm\n| invballooneval\n| invbevalterm\n| invbeval\n| invbinary\n| invbin\n| invbk\n| invbl\n| invbomb\n| invbreakindent\n| invbri\n| invbuflisted\n| invcf\n| invcindent\n| invcin\n| invci\n| invcompatible\n| invconfirm\n| invcopyindent\n| invcp\n| invcrb\n| invcscoperelative\n| invcscopetag\n| invcscopeverbose\n| invcsre\n| invcst\n| invcsverb\n| invcuc\n| invcul\n| invcursorbind\n| invcursorcolumn\n| invcursorline\n| invdeco\n| invdelcombine\n| invdg\n| invdiff\n| invdigraph\n| invea\n| inveb\n| invedcompatible\n| inved\n| invek\n| invemoji\n| invemo\n| invendofline\n| inveol\n| invequalalways\n| inverrorbells\n| invesckeys\n| invet\n| invexpandtab\n| invexrc\n| invex\n| invfen\n| invfic\n| invfileignorecase\n| invfixendofline\n| invfixeol\n| invfkmap\n| invfk\n| invfoldenable\n| invfsync\n| invfs\n| invgdefault\n| invgd\n| invguipty\n| invhidden\n| invhid\n| invhkmapp\n| invhkmap\n| invhkp\n| invhk\n| invhlsearch\n| invhls\n| invicon\n| invic\n| invignorecase\n| invimcmdline\n| invimc\n| invimdisable\n| invimd\n| invim\n| invincsearch\n| invinfercase\n| invinf\n| invinsertmode\n| invis\n| invjoinspaces\n| invjs\n| invlangnoremap\n| invlangremap\n| invlazyredraw\n| invlbr\n| invlinebreak\n| invlisp\n| invlist\n| invlnr\n| invloadplugins\n| invlpl\n| invlrm\n| invlz\n| invmacatsui\n| invmagic\n| invma\n| invmh\n| invmle\n| invml\n| invmodelineexpr\n| invmodeline\n| invmodifiable\n| invmodified\n| invmod\n| invmore\n| invmousefocus\n| invmousef\n| invmousehide\n| invnumber\n| invnu\n| invodev\n| invopendevice\n| invpaste\n| invpi\n| invpreserveindent\n| invpreviewwindow\n| invprompt\n| invpvw\n| invreadonly\n| invrelativenumber\n| invremap\n| invrestorescreen\n| invrevins\n| invrightleft\n| invri\n| invrl\n| invrnu\n| invro\n| invrs\n| invruler\n| invru\n| invsb\n| invscb\n| invscf\n| invscrollbind\n| invscrollfocus\n| invscs\n| invsc\n| invsecure\n| invsft\n| invshellslash\n| invshelltemp\n| invshiftround\n| invshortname\n| invshowcmd\n| invshowfulltag\n| invshowmatch\n| invshowmode\n| invsi\n| invsmartcase\n| invsmartindent\n| invsmarttab\n| invsmd\n| invsm\n| invsn\n| invsol\n| invspell\n| invsplitbelow\n| invsplitright\n| invspr\n| invsr\n| invssl\n| invstartofline\n| invsta\n| invstmp\n| invswapfile\n| invswf\n| invtagbsearch\n| invtagrelative\n| invtagstack\n| invta\n| invtbidi\n| invtbi\n| invtbs\n| invtermbidi\n| invterse\n| invtextauto\n| invtextmode\n| invtf\n| invtgst\n| invtildeop\n| invtimeout\n| invtitle\n| invtop\n| invto\n| invtr\n| invttimeout\n| invttybuiltin\n| invttyfast\n| invtx\n| invudf\n| invundofile\n| invvb\n| invvisualbell\n| invwarn\n| invwa\n| invwb\n| invweirdinvert\n| invwfh\n| invwfw\n| invwic\n| invwildignorecase\n| invwildmenu\n| invwinfixheight\n| invwinfixwidth\n| invwiv\n| invwmnu\n| invwrapscan\n| invwrap\n| invwriteany\n| invwritebackup\n| invwrite\n| invws\n| isfname\n| isf\n| isident\n| isi\n| iskeyword\n| isk\n| isprint\n| isp\n| is\n| joinspaces\n| js\n| keymap\n| keymodel\n| keywordprg\n| key\n| kmp\n| km\n| kp\n| langmap\n| langmenu\n| langnoremap\n| langremap\n| laststatus\n| lazyredraw\n| lbr\n| lcs\n| level\n| linebreak\n| linespace\n| lines\n| lispwords\n| lisp\n| listchars\n| list\n| lmap\n| lm\n| lnr\n| loadplugins\n| lpl\n| lrm\n| lsp\n| ls\n| luadll\n| lw\n| lz\n| macatsui\n| magic\n| makeef\n| makeencoding\n| makeprg\n| matchpairs\n| matchtime\n| mat\n| maxcombine\n| maxfuncdepth\n| maxmapdepth\n| maxmempattern\n| maxmemtot\n| maxmem\n| ma\n| mco\n| mef\n| menc\n| menuitems\n| mfd\n| mh\n| mis\n| mkspellmem\n| mle\n| mls\n| ml\n| mmd\n| mmp\n| mmt\n| mm\n| modelineexpr\n| modelines\n| modeline\n| modifiable\n| modified\n| mod\n| more\n| mousefocus\n| mousef\n| mousehide\n| mousemodel\n| mousem\n| mouseshape\n| mouses\n| mousetime\n| mouset\n| mouse\n| mps\n| mp\n| msm\n| mzquantum\n| mzq\n| mzschemedll\n| mzschemegcdll\n| nf\n| noacd\n| noai\n| noakm\n| noallowrevins\n| noaltkeymap\n| noantialias\n| noanti\n| noarabicshape\n| noarabic\n| noarab\n| noari\n| noarshape\n| noar\n| noautochdir\n| noautoindent\n| noautoread\n| noautowriteall\n| noautowrite\n| noawa\n| noaw\n| nobackup\n| noballoonevalterm\n| noballooneval\n| nobevalterm\n| nobeval\n| nobinary\n| nobin\n| nobk\n| nobl\n| nobomb\n| nobreakindent\n| nobri\n| nobuflisted\n| nocf\n| nocindent\n| nocin\n| noci\n| nocompatible\n| noconfirm\n| nocopyindent\n| nocp\n| nocrb\n| nocscoperelative\n| nocscopetag\n| nocscopeverbose\n| nocsre\n| nocst\n| nocsverb\n| nocuc\n| nocul\n| nocursorbind\n| nocursorcolumn\n| nocursorline\n| nodeco\n| nodelcombine\n| nodg\n| nodiff\n| nodigraph\n| noea\n| noeb\n| noedcompatible\n| noed\n| noek\n| noemoji\n| noemo\n| noendofline\n| noeol\n| noequalalways\n| noerrorbells\n| noesckeys\n| noet\n| noexpandtab\n| noexrc\n| noex\n| nofen\n| nofic\n| nofileignorecase\n| nofixendofline\n| nofixeol\n| nofkmap\n| nofk\n| nofoldenable\n| nofsync\n| nofs\n| nogdefault\n| nogd\n| noguipty\n| nohidden\n| nohid\n| nohkmapp\n| nohkmap\n| nohkp\n| nohk\n| nohlsearch\n| nohls\n| noicon\n| noic\n| noignorecase\n| noimcmdline\n| noimc\n| noimdisable\n| noimd\n| noim\n| noincsearch\n| noinfercase\n| noinf\n| noinsertmode\n| nois\n| nojoinspaces\n| nojs\n| nolangnoremap\n| nolangremap\n| nolazyredraw\n| nolbr\n| nolinebreak\n| nolisp\n| nolist\n| nolnr\n| noloadplugins\n| nolpl\n| nolrm\n| nolz\n| nomacatsui\n| nomagic\n| noma\n| nomh\n| nomle\n| noml\n| nomodelineexpr\n| nomodeline\n| nomodifiable\n| nomodified\n| nomod\n| nomore\n| nomousefocus\n| nomousef\n| nomousehide\n| nonumber\n| nonu\n| noodev\n| noopendevice\n| nopaste\n| nopi\n| nopreserveindent\n| nopreviewwindow\n| noprompt\n| nopvw\n| noreadonly\n| norelativenumber\n| noremap\n| norestorescreen\n| norevins\n| norightleft\n| nori\n| norl\n| nornu\n| noro\n| nors\n| noruler\n| noru\n| nosb\n| noscb\n| noscf\n| noscrollbind\n| noscrollfocus\n| noscs\n| nosc\n| nosecure\n| nosft\n| noshellslash\n| noshelltemp\n| noshiftround\n| noshortname\n| noshowcmd\n| noshowfulltag\n| noshowmatch\n| noshowmode\n| nosi\n| nosmartcase\n| nosmartindent\n| nosmarttab\n| nosmd\n| nosm\n| nosn\n| nosol\n| nospell\n| nosplitbelow\n| nosplitright\n| nospr\n| nosr\n| nossl\n| nostartofline\n| nosta\n| nostmp\n| noswapfile\n| noswf\n| notagbsearch\n| notagrelative\n| notagstack\n| nota\n| notbidi\n| notbi\n| notbs\n| notermbidi\n| noterse\n| notextauto\n| notextmode\n| notf\n| notgst\n| notildeop\n| notimeout\n| notitle\n| notop\n| noto\n| notr\n| nottimeout\n| nottybuiltin\n| nottyfast\n| notx\n| noudf\n| noundofile\n| novb\n| novisualbell\n| nowarn\n| nowa\n| nowb\n| noweirdinvert\n| nowfh\n| nowfw\n| nowic\n| nowildignorecase\n| nowildmenu\n| nowinfixheight\n| nowinfixwidth\n| nowiv\n| nowmnu\n| nowrapscan\n| nowrap\n| nowriteany\n| nowritebackup\n| nowrite\n| nows\n| nrformats\n| numberwidth\n| number\n| nuw\n| nu\n| odev\n| oft\n| ofu\n| omnifunc\n| opendevice\n| operatorfunc\n| opfunc\n| osfiletype\n| packpath\n| paragraphs\n| para\n| pastetoggle\n| paste\n| patchexpr\n| patchmode\n| path\n| pa\n| pdev\n| penc\n| perldll\n| pexpr\n| pex\n| pfn\n| pheader\n| ph\n| pi\n| pmbcs\n| pmbfn\n| pm\n| popt\n| pp\n| preserveindent\n| previewheight\n| previewpopup\n| previewwindow\n| printdevice\n| printencoding\n| printexpr\n| printfont\n| printheader\n| printmbcharset\n| printmbfont\n| printoptions\n| prompt\n| pt\n| pumheight\n| pumwidth\n| pvh\n| pvp\n| pvw\n| pw\n| pythondll\n| pythonhome\n| pythonthreedll\n| pythonthreehome\n| pyxversion\n| pyx\n| qe\n| quoteescape\n| rdt\n| readonly\n| redrawtime\n| regexpengine\n| relativenumber\n| remap\n| renderoptions\n| report\n| restorescreen\n| revins\n| re\n| rightleftcmd\n| rightleft\n| ri\n| rlc\n| rl\n| rnu\n| rop\n| ro\n| rs\n| rtp\n| rubydll\n| ruf\n| rulerformat\n| ruler\n| runtimepath\n| ru\n| sbo\n| sbr\n| sb\n| scb\n| scf\n| scl\n| scrollbind\n| scrollfocus\n| scrolljump\n| scrolloff\n| scrollopt\n| scroll\n| scr\n| scs\n| sc\n| sections\n| sect\n| secure\n| selection\n| selectmode\n| sel\n| sessionoptions\n| sft\n| shcf\n| shellcmdflag\n| shellpipe\n| shellquote\n| shellredir\n| shellslash\n| shelltemp\n| shelltype\n| shellxescape\n| shellxquote\n| shell\n| shiftround\n| shiftwidth\n| shm\n| shortmess\n| shortname\n| showbreak\n| showcmd\n| showfulltag\n| showmatch\n| showmode\n| showtabline\n| shq\n| sh\n| sidescrolloff\n| sidescroll\n| signcolumn\n| siso\n| si\n| sj\n| slm\n| smartcase\n| smartindent\n| smarttab\n| smc\n| smd\n| sm\n| sn\n| softtabstop\n| sol\n| so\n| spc\n| spellcapcheck\n| spellfile\n| spelllang\n| spellsuggest\n| spell\n| spf\n| splitbelow\n| splitright\n| spl\n| spr\n| sps\n| sp\n| srr\n| sr\n| ssl\n| ssop\n| ss\n| stal\n| startofline\n| statusline\n| sta\n| stl\n| stmp\n| sts\n| st\n| sua\n| suffixesadd\n| suffixes\n| su\n| swapfile\n| swapsync\n| swb\n| swf\n| switchbuf\n| sws\n| sw\n| sxe\n| sxq\n| synmaxcol\n| syntax\n| syn\n| t_8b\n| t_8f\n| t_AB\n| t_AF\n| t_AL\n| t_BD\n| t_BE\n| t_CS\n| t_CV\n| t_Ce\n| t_Co\n| t_Cs\n| t_DL\n| t_EC\n| t_EI\n| t_F1\n| t_F2\n| t_F3\n| t_F4\n| t_F5\n| t_F6\n| t_F7\n| t_F8\n| t_F9\n| t_GP\n| t_IE\n| t_IS\n| t_K1\n| t_K3\n| t_K4\n| t_K5\n| t_K6\n| t_K7\n| t_K8\n| t_K9\n| t_KA\n| t_KB\n| t_KC\n| t_KD\n| t_KE\n| t_KF\n| t_KG\n| t_KH\n| t_KI\n| t_KJ\n| t_KK\n| t_KL\n| t_PE\n| t_PS\n| t_RB\n| t_RC\n| t_RF\n| t_RI\n| t_RS\n| t_RT\n| t_RV\n| t_Ri\n| t_SC\n| t_SH\n| t_SI\n| t_SR\n| t_ST\n| t_Sb\n| t_Sf\n| t_Si\n| t_TE\n| t_TI\n| t_Te\n| t_Ts\n| t_VS\n| t_WP\n| t_WS\n| t_ZH\n| t_ZR\n| t_al\n| t_bc\n| t_cd\n| t_ce\n| t_cl\n| t_cm\n| t_cs\n| t_da\n| t_db\n| t_dl\n| t_fs\n| t_k1\n| t_k2\n| t_k3\n| t_k4\n| t_k5\n| t_k6\n| t_k7\n| t_k8\n| t_k9\n| t_kB\n| t_kD\n| t_kI\n| t_kN\n| t_kP\n| t_kb\n| t_kd\n| t_ke\n| t_kh\n| t_kl\n| t_kr\n| t_ks\n| t_ku\n| t_le\n| t_mb\n| t_md\n| t_me\n| t_mr\n| t_ms\n| t_nd\n| t_op\n| t_se\n| t_so\n| t_sr\n| t_te\n| t_ti\n| t_ts\n| t_u7\n| t_ue\n| t_us\n| t_ut\n| t_vb\n| t_ve\n| t_vi\n| t_vs\n| t_xn\n| t_xs\n| tabline\n| tabpagemax\n| tabstop\n| tagbsearch\n| tagcase\n| tagfunc\n| taglength\n| tagrelative\n| tagstack\n| tags\n| tag\n| tal\n| ta\n| tbidi\n| tbis\n| tbi\n| tbs\n| tb\n| tcldll\n| tc\n| tenc\n| termbidi\n| termencoding\n| termguicolors\n| termwinkey\n| termwinscroll\n| termwinsize\n| termwintype\n| term\n| terse\n| textauto\n| textmode\n| textwidth\n| tfu\n| tf\n| tgc\n| tgst\n| thesaurus\n| tildeop\n| timeoutlen\n| timeout\n| titlelen\n| titleold\n| titlestring\n| title\n| tl\n| tm\n| toolbariconsize\n| toolbar\n| top\n| to\n| tpm\n| tr\n| tsl\n| tsr\n| ts\n| ttimeoutlen\n| ttimeout\n| ttm\n| ttybuiltin\n| ttyfast\n| ttymouse\n| ttym\n| ttyscroll\n| ttytype\n| tty\n| twk\n| twsl\n| tws\n| twt\n| tw\n| tx\n| uc\n| udf\n| udir\n| ul\n| undodir\n| undofile\n| undolevels\n| undoreload\n| updatecount\n| updatetime\n| ur\n| ut\n| varsofttabstop\n| vartabstop\n| vbs\n| vb\n| vdir\n| verbosefile\n| verbose\n| ve\n| vfile\n| viewdir\n| viewoptions\n| vif\n| viminfofile\n| viminfo\n| virtualedit\n| visualbell\n| vi\n| vop\n| vsts\n| vts\n| wak\n| warn\n| wa\n| wb\n| wcm\n| wcr\n| wc\n| wd\n| weirdinvert\n| wfh\n| wfw\n| whichwrap\n| wh\n| wic\n| wig\n| wildcharm\n| wildchar\n| wildignorecase\n| wildignore\n| wildmenu\n| wildmode\n| wildoptions\n| wim\n| winaltkeys\n| wincolor\n| window\n| winfixheight\n| winfixwidth\n| winheight\n| winminheight\n| winminwidth\n| winptydll\n| winwidth\n| wiv\n| wiw\n| wi\n| wmh\n| wmnu\n| wmw\n| wm\n| wop\n| wrapmargin\n| wrapscan\n| wrap\n| writeany\n| writebackup\n| writedelay\n| write\n| ws\n| ww\n) \\b" + }, + "vimPattern": { + "name": "support.function.vimPattern.viml", + "match": "(?x) \\b\n( end\n| skip\n| start\n) \\b" + }, + "vimStdPlugin": { + "name": "support.class.stdplugin.viml", + "match": "(?x) \\b\n( Arguments\n| Break\n| Cfilter\n| Clear\n| Continue\n| DiffOrig\n| Evaluate\n| Finish\n| Gdb\n| Lfilter\n| Man\n| N\n| Next\n| Over\n| P\n| Print\n| Program\n| Run\n| Source\n| Step\n| Stop\n| S\n| TOhtml\n| TermdebugCommand\n| Termdebug\n| Winbar\n| XMLent\n| XMLns\n) \\b" + }, + "vimSynCase": { + "name": "support.function.vimSynCase.viml", + "match": "(?x) \\b\n( ignore\n| match\n) \\b" + }, + "vimSynType": { + "name": "support.function.vimSynType.viml", + "match": "(?x) \\b\n( case\n| clear\n| cluster\n| enable\n| include\n| iskeyword\n| keyword\n| list\n| manual\n| match\n| off\n| on\n| region\n| reset\n| sync\n) \\b" + }, + "vimSyncC": { + "name": "support.function.vimSyncC.viml", + "match": "(?x) \\b\n( ccomment\n| clear\n| fromstart\n) \\b" + }, + "vimSyncLinecont": { + "name": "support.function.vimSyncLinecont.viml", + "match": "(?x) \\b\n( linecont\n) \\b" + }, + "vimSyncMatch": { + "name": "support.function.vimSyncMatch.viml", + "match": "(?x) \\b\n( match\n) \\b" + }, + "vimSyncNone": { + "name": "support.function.vimSyncNone.viml", + "match": "(?x) \\b\n( NONE\n) \\b" + }, + "vimSyncRegion": { + "name": "support.function.vimSyncRegion.viml", + "match": "(?x) \\b\n( region\n) \\b" + }, + "vimUserAttrbCmplt": { + "name": "support.function.vimUserAttrbCmplt.viml", + "match": "(?x) \\b\n( augroup\n| behave\n| buffer\n| color\n| command\n| compiler\n| cscope\n| customlist\n| custom\n| dir\n| environment\n| event\n| expression\n| file_in_path\n| filetype\n| file\n| function\n| help\n| highlight\n| history\n| locale\n| mapping\n| menu\n| option\n| packadd\n| shellcmd\n| sign\n| syntax\n| syntime\n| tag_listfiles\n| tag\n| user\n| var\n) \\b" + }, + "vimUserAttrbKey": { + "name": "support.function.vimUserAttrbKey.viml", + "match": "(?x) \\b\n( bang?\n| bar\n| com\n| complete\n| cou\n| count\n| n\n| nargs\n| ra\n| range\n| re\n| register\n) \\b" + }, + "vimUserCommand": { + "name": "support.function.vimUserCommand.viml", + "match": "(?x) \\b\n( com\n| command\n) \\b" + } + } +} \ No newline at end of file diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/LICENSE.txt pycharm-2020.3/plugins/textmate/lib/bundles/viml/LICENSE.txt --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/LICENSE.txt 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2014-2016 Evan Hahn +Copyright (c) 2016-2020 John Gardner + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/package.json pycharm-2020.3/plugins/textmate/lib/bundles/viml/package.json --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/package.json 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/package.json 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,40 @@ +{ + "name": "language-viml", + "author": "Evan Hahn", + "maintainers": [{ + "name": "John Gardner", + "email": "gardnerjohng@gmail.com", + "url": "https://github.com/Alhadis" + }], + "description": "Vim Script language support for Atom", + "keywords": ["Vim", "VimScript", "VimL", "Vim Script", "Vi"], + "version": "1.2.1", + "repository": { + "type": "git", + "url": "https://github.com/Alhadis/language-viml.git" + }, + "license": "MIT", + "engines": { + "atom": ">0.50.0" + }, + "contributes": { + "languages": [{ + "id": "VimL", + "extensions": [ + ".vim", + ".vimrc", + ".gvimrc", + ".nvimrc", + "_vimrc", + ".vmb", + ".ideavimrc" + ], + "aliases": [ "vim", "viml", "vim script" ] + }], + "grammars": [{ + "language": "VimL", + "scopeName": "source.viml", + "path": "./grammars/viml.json" + }] + } +} diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/basic.vim pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/basic.vim --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/basic.vim 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/basic.vim 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,33 @@ +"==[ DATA TYPES ]=============================================================== + +let string_1 = "C:\\WinNT" +let string_2 = 'C:\WinNT' +let funcref1 = function ("MyFunc") +let List_1 = [ + \ "a", + \ "b", + \ "c"] +let List2 = split ("a b c") +let Dictionary = { + \ 1: 'one', + \ 2: 'two', + \ 3: 'three'} + +let myDict = { + \'data': [0, 1, 2, 3]} + +function myDict.len () dict + return len (self.data) +endfunction myDict.len + +runtime setup.vim +source ~/vimfiles/setup.vim + +0xFF +100.1 +15.45e-2 +2 * 2.0 + +:let l:number = 1 +:let &l:number = 1 +:let @a = "hello!" diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/example-help.txt pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/example-help.txt --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/example-help.txt 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/example-help.txt 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,26 @@ +*example-help.txt* For Vim version 8.1. Last change: 2019 Sep 27 + + + VIM REFERENCE MANUAL by Bram Moolenaar + + +Editing files *edit-files* + +1. Introduction |edit-intro| +2. Editing a file |edit-a-file| +3. The argument list |argument-list| +4. Writing |writing| +5. Writing and quitting |write-quit| +6. Dialogs |edit-dialogs| +7. The current directory |current-directory| +8. Editing binary files |edit-binary| +9. Encryption |encryption| +10. Timestamps |timestamps| +11. File Searching |file-searching| + +============================================================================== +1. Introduction *edit-intro* + +Lorem ipsum dolor sit amet, that's all folks. + +vim:tw=78:ts=8:noet:ft=help:norl: diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/flavours.of.snippet pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/flavours.of.snippet --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/flavours.of.snippet 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/flavours.of.snippet 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,31 @@ +# vim: set ts=4 noet: + +# This is SnipMate's syntax: + +snippet trigger description of snippet + # Not a comment + ${1}: + while ${2} loop + ${0:${VISUAL}} + end loop $1; + + +# And this is UltiSnips's: + +snippet header "description of snippet" +
+ ${1:header content} +
+endsnippet + + +# Finally, this is NeoSnippets: + +snippet function +abbr func endfunc +alias func +regexp "^\s*" +options head + function! ${1:#:func_name}(${2}) abort + ${0:TARGET} + endfunction diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/modeline.md pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/modeline.md --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/modeline.md 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/modeline.md 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,3 @@ +# vim: ft=vim + +I am Vim, hear me roar. diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/neo.snippets pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/neo.snippets --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/neo.snippets 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/neo.snippets 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,4 @@ +delete namespace +options head +snippet namespace +abbr namespace {} diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/solarized.vim pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/solarized.vim --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/solarized.vim 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/solarized.vim 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,1117 @@ +" Name: Solarized vim colorscheme +" Author: Ethan Schoonover +" URL: http://ethanschoonover.com/solarized +" (see this url for latest release & screenshots) +" License: OSI approved MIT license (see end of this file) +" Created: In the middle of the night +" Modified: 2011 May 05 +" +" Usage "{{{ +" +" --------------------------------------------------------------------- +" ABOUT: +" --------------------------------------------------------------------- +" Solarized is a carefully designed selective contrast colorscheme with dual +" light and dark modes that runs in both GUI, 256 and 16 color modes. +" +" See the homepage above for screenshots and details. +" +" --------------------------------------------------------------------- +" OPTIONS: +" --------------------------------------------------------------------- +" See the "solarized.txt" help file included with this colorscheme (in the +" "doc" subdirectory) for information on options, usage, the Toggle Background +" function and more. If you have already installed Solarized, this is available +" from the Solarized menu and command line as ":help solarized" +" +" --------------------------------------------------------------------- +" INSTALLATION: +" --------------------------------------------------------------------- +" Two options for installation: manual or pathogen +" +" MANUAL INSTALLATION OPTION: +" --------------------------------------------------------------------- +" +" 1. Download the solarized distribution (available on the homepage above) +" and unarchive the file. +" 2. Move `solarized.vim` to your `.vim/colors` directory. +" 3. Move each of the files in each subdirectories to the corresponding .vim +" subdirectory (e.g. autoload/togglebg.vim goes into your .vim/autoload +" directory as .vim/autoload/togglebg.vim). +" +" RECOMMENDED PATHOGEN INSTALLATION OPTION: +" --------------------------------------------------------------------- +" +" 1. Download and install Tim Pope's Pathogen from: +" https://github.com/tpope/vim-pathogen +" +" 2. Next, move or clone the `vim-colors-solarized` directory so that it is +" a subdirectory of the `.vim/bundle` directory. +" +" a. **clone with git:** +" +" $ cd ~/.vim/bundle +" $ git clone git://github.com/altercation/vim-colors-solarized.git +" +" b. **or move manually into the pathogen bundle directory:** +" In the parent directory of vim-colors-solarized: +" +" $ mv vim-colors-solarized ~/.vim/bundle/ +" +" MODIFY VIMRC: +" +" After either Option 1 or Option 2 above, put the following two lines in your +" .vimrc: +" +" syntax enable +" set background=dark +" colorscheme solarized +" +" or, for the light background mode of Solarized: +" +" syntax enable +" set background=light +" colorscheme solarized +" +" I like to have a different background in GUI and terminal modes, so I can use +" the following if-then. However, I find vim's background autodetection to be +" pretty good and, at least with MacVim, I can leave this background value +" assignment out entirely and get the same results. +" +" if has('gui_running') +" set background=light +" else +" set background=dark +" endif +" +" See the Solarized homepage at http://ethanschoonover.com/solarized for +" screenshots which will help you select either the light or dark background. +" +" --------------------------------------------------------------------- +" COLOR VALUES +" --------------------------------------------------------------------- +" Download palettes and files from: http://ethanschoonover.com/solarized +" +" L\*a\*b values are canonical (White D65, Reference D50), other values are +" matched in sRGB space. +" +" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB +" --------- ------- ---- ------- ----------- ---------- ----------- ----------- +" base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +" base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +" base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 +" base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 +" base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +" base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +" base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 +" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 +" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +" red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 +" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +" green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 +" +" --------------------------------------------------------------------- +" COLORSCHEME HACKING +" --------------------------------------------------------------------- +" +" Useful commands for testing colorschemes: +" :source $VIMRUNTIME/syntax/hitest.vim +" :help highlight-groups +" :help cterm-colors +" :help group-name +" +" Useful links for developing colorschemes: +" http://www.vim.org/scripts/script.php?script_id=2937 +" http://vimcasts.org/episodes/creating-colorschemes-for-vim/ +" http://www.frexx.de/xterm-256-notes/" +" +" }}} +" Environment Specific Overrides "{{{ +" Allow or disallow certain features based on current terminal emulator or +" environment. + +" Terminals that support italics +let s:terms_italic=[ + \"rxvt", + \"gnome-terminal" + \] +" For reference only, terminals are known to be incomptible. +" Terminals that are in neither list need to be tested. +let s:terms_noitalic=[ + \"iTerm.app", + \"Apple_Terminal" + \] +if has("gui_running") + let s:terminal_italic=1 " TODO: could refactor to not require this at all +else + let s:terminal_italic=0 " terminals will be guilty until proven compatible + for term in s:terms_italic + if $TERM_PROGRAM =~ term + let s:terminal_italic=1 + endif + endfor +endif + +" }}} +" Default option values"{{{ +" --------------------------------------------------------------------- +" s:options_list is used to autogenerate a list of all non-default options +" using "call SolarizedOptions()" or with the "Generate .vimrc commands" +" Solarized menu option. See the "Menus" section below for the function itself. +let s:options_list=[ + \'" this block of commands has been autogenerated by solarized.vim and', + \'" includes the current, non-default Solarized option values.', + \'" To use, place these commands in your .vimrc file (replacing any', + \'" existing colorscheme commands). See also ":help solarized"', + \'', + \'" ------------------------------------------------------------------', + \'" Solarized Colorscheme Config', + \'" ------------------------------------------------------------------', + \] +let s:colorscheme_list=[ + \'syntax enable', + \'set background='.&background, + \'colorscheme solarized', + \] +let s:defaults_list=[ + \'" ------------------------------------------------------------------', + \'', + \'" The following items are available options, but do not need to be', + \'" included in your .vimrc as they are currently set to their defaults.', + \'' + \] +let s:lazycat_list=[ + \'" lazy method of appending this onto your .vimrc ":w! >> ~/.vimrc"', + \'" ------------------------------------------------------------------', + \] + +function! s:SetOption(name,default) + if type(a:default) == type(0) + let l:wrap='' + let l:ewrap='' + else + let l:wrap='"' + let l:ewrap='\"' + endif + if !exists("g:solarized_".a:name) || g:solarized_{a:name}==a:default + exe 'let g:solarized_'.a:name.'='.l:wrap.a:default.l:wrap.'"' + exe 'call add(s:defaults_list, "\" let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.'")' + else + exe 'call add(s:options_list, "let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.' \"default value is '.a:default.'")' + endif +endfunction + +if ($TERM_PROGRAM ==? "apple_terminal" && &t_Co < 256) + let s:solarized_termtrans_default = 1 +else + let s:solarized_termtrans_default = 0 +endif +call s:SetOption("termtrans",s:solarized_termtrans_default) +call s:SetOption("degrade",0) +call s:SetOption("bold",1) +call s:SetOption("underline",1) +call s:SetOption("italic",1) " note that we need to override this later if the terminal doesn't support +call s:SetOption("termcolors",16) +call s:SetOption("contrast","normal") +call s:SetOption("visibility","normal") +call s:SetOption("diffmode","normal") +call s:SetOption("hitrail",0) +call s:SetOption("menu",1) + +"}}} +" Colorscheme initialization "{{{ +" --------------------------------------------------------------------- +hi clear +if exists("syntax_on") + syntax reset +endif +let colors_name = "solarized" + +"}}} +" GUI & CSApprox hexadecimal palettes"{{{ +" --------------------------------------------------------------------- +" +" Set both gui and terminal color values in separate conditional statements +" Due to possibility that CSApprox is running (though I suppose we could just +" leave the hex values out entirely in that case and include only cterm colors) +" We also check to see if user has set solarized (force use of the +" neutral gray monotone palette component) +if (has("gui_running") && g:solarized_degrade == 0) + let s:vmode = "gui" + let s:base03 = "#002b36" + let s:base02 = "#073642" + let s:base01 = "#586e75" + let s:base00 = "#657b83" + let s:base0 = "#839496" + let s:base1 = "#93a1a1" + let s:base2 = "#eee8d5" + let s:base3 = "#fdf6e3" + let s:yellow = "#b58900" + let s:orange = "#cb4b16" + let s:red = "#dc322f" + let s:magenta = "#d33682" + let s:violet = "#6c71c4" + let s:blue = "#268bd2" + let s:cyan = "#2aa198" + "let s:green = "#859900" "original + let s:green = "#719e07" "experimental +elseif (has("gui_running") && g:solarized_degrade == 1) + " These colors are identical to the 256 color mode. They may be viewed + " while in gui mode via "let g:solarized_degrade=1", though this is not + " recommened and is for testing only. + let s:vmode = "gui" + let s:base03 = "#1c1c1c" + let s:base02 = "#262626" + let s:base01 = "#4e4e4e" + let s:base00 = "#585858" + let s:base0 = "#808080" + let s:base1 = "#8a8a8a" + let s:base2 = "#d7d7af" + let s:base3 = "#ffffd7" + let s:yellow = "#af8700" + let s:orange = "#d75f00" + let s:red = "#af0000" + let s:magenta = "#af005f" + let s:violet = "#5f5faf" + let s:blue = "#0087ff" + let s:cyan = "#00afaf" + let s:green = "#5f8700" +elseif g:solarized_termcolors != 256 && &t_Co >= 16 + let s:vmode = "cterm" + let s:base03 = "8" + let s:base02 = "0" + let s:base01 = "10" + let s:base00 = "11" + let s:base0 = "12" + let s:base1 = "14" + let s:base2 = "7" + let s:base3 = "15" + let s:yellow = "3" + let s:orange = "9" + let s:red = "1" + let s:magenta = "5" + let s:violet = "13" + let s:blue = "4" + let s:cyan = "6" + let s:green = "2" +elseif g:solarized_termcolors == 256 + let s:vmode = "cterm" + let s:base03 = "234" + let s:base02 = "235" + let s:base01 = "239" + let s:base00 = "240" + let s:base0 = "244" + let s:base1 = "245" + let s:base2 = "187" + let s:base3 = "230" + let s:yellow = "136" + let s:orange = "166" + let s:red = "124" + let s:magenta = "125" + let s:violet = "61" + let s:blue = "33" + let s:cyan = "37" + let s:green = "64" +else + let s:vmode = "cterm" + let s:bright = "* term=bold cterm=bold" +" let s:base03 = "0".s:bright +" let s:base02 = "0" +" let s:base01 = "2".s:bright +" let s:base00 = "3".s:bright +" let s:base0 = "4".s:bright +" let s:base1 = "6".s:bright +" let s:base2 = "7" +" let s:base3 = "7".s:bright +" let s:yellow = "3" +" let s:orange = "1".s:bright +" let s:red = "1" +" let s:magenta = "5" +" let s:violet = "5".s:bright +" let s:blue = "4" +" let s:cyan = "6" +" let s:green = "2" + let s:base03 = "DarkGray" " 0* + let s:base02 = "Black" " 0 + let s:base01 = "LightGreen" " 2* + let s:base00 = "LightYellow" " 3* + let s:base0 = "LightBlue" " 4* + let s:base1 = "LightCyan" " 6* + let s:base2 = "LightGray" " 7 + let s:base3 = "White" " 7* + let s:yellow = "DarkYellow" " 3 + let s:orange = "LightRed" " 1* + let s:red = "DarkRed" " 1 + let s:magenta = "DarkMagenta" " 5 + let s:violet = "LightMagenta" " 5* + let s:blue = "DarkBlue" " 4 + let s:cyan = "DarkCyan" " 6 + let s:green = "DarkGreen" " 2 + +endif +"}}} +" Formatting options and null values for passthrough effect "{{{ +" --------------------------------------------------------------------- + let s:none = "NONE" + let s:none = "NONE" + let s:t_none = "NONE" + let s:n = "NONE" + let s:c = ",undercurl" + let s:r = ",reverse" + let s:s = ",standout" + let s:ou = "" + let s:ob = "" +"}}} +" Background value based on termtrans setting "{{{ +" --------------------------------------------------------------------- +if (has("gui_running") || g:solarized_termtrans == 0) + let s:back = s:base03 +else + let s:back = "NONE" +endif +"}}} +" Alternate light scheme "{{{ +" --------------------------------------------------------------------- +if &background == "light" + let s:temp03 = s:base03 + let s:temp02 = s:base02 + let s:temp01 = s:base01 + let s:temp00 = s:base00 + let s:base03 = s:base3 + let s:base02 = s:base2 + let s:base01 = s:base1 + let s:base00 = s:base0 + let s:base0 = s:temp00 + let s:base1 = s:temp01 + let s:base2 = s:temp02 + let s:base3 = s:temp03 + if (s:back != "NONE") + let s:back = s:base03 + endif +endif +"}}} +" Optional contrast schemes "{{{ +" --------------------------------------------------------------------- +if g:solarized_contrast == "high" + let s:base01 = s:base00 + let s:base00 = s:base0 + let s:base0 = s:base1 + let s:base1 = s:base2 + let s:base2 = s:base3 + let s:back = s:back +endif +if g:solarized_contrast == "low" + let s:back = s:base02 + let s:ou = ",underline" +endif +"}}} +" Overrides dependent on user specified values and environment "{{{ +" --------------------------------------------------------------------- +if (g:solarized_bold == 0 || &t_Co == 8 ) + let s:b = "" + let s:bb = ",bold" +else + let s:b = ",bold" + let s:bb = "" +endif + +if g:solarized_underline == 0 + let s:u = "" +else + let s:u = ",underline" +endif + +if g:solarized_italic == 0 || s:terminal_italic == 0 + let s:i = "" +else + let s:i = ",italic" +endif +"}}} +" Highlighting primitives"{{{ +" --------------------------------------------------------------------- + +exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'" +exe "let s:bg_back = ' ".s:vmode."bg=".s:back ."'" +exe "let s:bg_base03 = ' ".s:vmode."bg=".s:base03 ."'" +exe "let s:bg_base02 = ' ".s:vmode."bg=".s:base02 ."'" +exe "let s:bg_base01 = ' ".s:vmode."bg=".s:base01 ."'" +exe "let s:bg_base00 = ' ".s:vmode."bg=".s:base00 ."'" +exe "let s:bg_base0 = ' ".s:vmode."bg=".s:base0 ."'" +exe "let s:bg_base1 = ' ".s:vmode."bg=".s:base1 ."'" +exe "let s:bg_base2 = ' ".s:vmode."bg=".s:base2 ."'" +exe "let s:bg_base3 = ' ".s:vmode."bg=".s:base3 ."'" +exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'" +exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'" +exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'" +exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'" +exe "let s:bg_magenta = ' ".s:vmode."bg=".s:magenta."'" +exe "let s:bg_violet = ' ".s:vmode."bg=".s:violet ."'" +exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'" +exe "let s:bg_cyan = ' ".s:vmode."bg=".s:cyan ."'" + +exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'" +exe "let s:fg_back = ' ".s:vmode."fg=".s:back ."'" +exe "let s:fg_base03 = ' ".s:vmode."fg=".s:base03 ."'" +exe "let s:fg_base02 = ' ".s:vmode."fg=".s:base02 ."'" +exe "let s:fg_base01 = ' ".s:vmode."fg=".s:base01 ."'" +exe "let s:fg_base00 = ' ".s:vmode."fg=".s:base00 ."'" +exe "let s:fg_base0 = ' ".s:vmode."fg=".s:base0 ."'" +exe "let s:fg_base1 = ' ".s:vmode."fg=".s:base1 ."'" +exe "let s:fg_base2 = ' ".s:vmode."fg=".s:base2 ."'" +exe "let s:fg_base3 = ' ".s:vmode."fg=".s:base3 ."'" +exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'" +exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'" +exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'" +exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'" +exe "let s:fg_magenta = ' ".s:vmode."fg=".s:magenta."'" +exe "let s:fg_violet = ' ".s:vmode."fg=".s:violet ."'" +exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'" +exe "let s:fg_cyan = ' ".s:vmode."fg=".s:cyan ."'" + +exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE". "'" +exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" +exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" +exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" +exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'" +exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" +exe "let s:fmt_uopt = ' ".s:vmode."=NONE".s:ou. " term=NONE".s:ou."'" +exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c."'" +exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i."'" +exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s."'" +exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r."'" +exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'" +" revbb (reverse bold for bright colors) is only set to actual bold in low +" color terminals (t_co=8, such as OS X Terminal.app) and should only be used +" with colors 8-15. +exe "let s:fmt_revbb = ' ".s:vmode."=NONE".s:r.s:bb. " term=NONE".s:r.s:bb."'" +exe "let s:fmt_revbbu = ' ".s:vmode."=NONE".s:r.s:bb.s:u." term=NONE".s:r.s:bb.s:u."'" + +if has("gui_running") + exe "let s:sp_none = ' guisp=".s:none ."'" + exe "let s:sp_back = ' guisp=".s:back ."'" + exe "let s:sp_base03 = ' guisp=".s:base03 ."'" + exe "let s:sp_base02 = ' guisp=".s:base02 ."'" + exe "let s:sp_base01 = ' guisp=".s:base01 ."'" + exe "let s:sp_base00 = ' guisp=".s:base00 ."'" + exe "let s:sp_base0 = ' guisp=".s:base0 ."'" + exe "let s:sp_base1 = ' guisp=".s:base1 ."'" + exe "let s:sp_base2 = ' guisp=".s:base2 ."'" + exe "let s:sp_base3 = ' guisp=".s:base3 ."'" + exe "let s:sp_green = ' guisp=".s:green ."'" + exe "let s:sp_yellow = ' guisp=".s:yellow ."'" + exe "let s:sp_orange = ' guisp=".s:orange ."'" + exe "let s:sp_red = ' guisp=".s:red ."'" + exe "let s:sp_magenta = ' guisp=".s:magenta."'" + exe "let s:sp_violet = ' guisp=".s:violet ."'" + exe "let s:sp_blue = ' guisp=".s:blue ."'" + exe "let s:sp_cyan = ' guisp=".s:cyan ."'" +else + let s:sp_none = "" + let s:sp_back = "" + let s:sp_base03 = "" + let s:sp_base02 = "" + let s:sp_base01 = "" + let s:sp_base00 = "" + let s:sp_base0 = "" + let s:sp_base1 = "" + let s:sp_base2 = "" + let s:sp_base3 = "" + let s:sp_green = "" + let s:sp_yellow = "" + let s:sp_orange = "" + let s:sp_red = "" + let s:sp_magenta = "" + let s:sp_violet = "" + let s:sp_blue = "" + let s:sp_cyan = "" +endif + +"}}} +" Basic highlighting"{{{ +" --------------------------------------------------------------------- +" note that link syntax to avoid duplicate configuration doesn't work with the +" exe compiled formats + +exe "hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back + +exe "hi! Comment" .s:fmt_ital .s:fg_base01 .s:bg_none +" *Comment any comment + +exe "hi! Constant" .s:fmt_none .s:fg_cyan .s:bg_none +" *Constant any constant +" String a string constant: "this is a string" +" Character a character constant: 'c', '\n' +" Number a number constant: 234, 0xff +" Boolean a boolean constant: TRUE, false +" Float a floating point constant: 2.3e10 + +exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none +" *Identifier any variable name +" Function function name (also: methods for classes) +" +exe "hi! Statement" .s:fmt_none .s:fg_green .s:bg_none +" *Statement any statement +" Conditional if, then, else, endif, switch, etc. +" Repeat for, do, while, etc. +" Label case, default, etc. +" Operator "sizeof", "+", "*", etc. +" Keyword any other keyword +" Exception try, catch, throw + +exe "hi! PreProc" .s:fmt_none .s:fg_orange .s:bg_none +" *PreProc generic Preprocessor +" Include preprocessor #include +" Define preprocessor #define +" Macro same as Define +" PreCondit preprocessor #if, #else, #endif, etc. + +exe "hi! Type" .s:fmt_none .s:fg_yellow .s:bg_none +" *Type int, long, char, etc. +" StorageClass static, register, volatile, etc. +" Structure struct, union, enum, etc. +" Typedef A typedef + +exe "hi! Special" .s:fmt_none .s:fg_red .s:bg_none +" *Special any special symbol +" SpecialChar special character in a constant +" Tag you can use CTRL-] on this +" Delimiter character that needs attention +" SpecialComment special things inside a comment +" Debug debugging statements + +exe "hi! Underlined" .s:fmt_none .s:fg_violet .s:bg_none +" *Underlined text that stands out, HTML links + +exe "hi! Ignore" .s:fmt_none .s:fg_none .s:bg_none +" *Ignore left blank, hidden |hl-Ignore| + +exe "hi! Error" .s:fmt_bold .s:fg_red .s:bg_none +" *Error any erroneous construct + +exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none +" *Todo anything that needs extra attention; mostly the +" keywords TODO FIXME and XXX +" +"}}} +" Extended highlighting "{{{ +" --------------------------------------------------------------------- +if (g:solarized_visibility=="high") + exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none + exe "hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none +elseif (g:solarized_visibility=="low") + exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none + exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none +else + exe "hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02 + exe "hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none +endif +exe "hi! StatusLine" .s:fmt_none .s:fg_base1 .s:bg_base02 .s:fmt_revbb +exe "hi! StatusLineNC" .s:fmt_none .s:fg_base00 .s:bg_base02 .s:fmt_revbb +exe "hi! Visual" .s:fmt_none .s:fg_base01 .s:bg_base03 .s:fmt_revbb +exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none +exe "hi! IncSearch" .s:fmt_stnd .s:fg_orange .s:bg_none +exe "hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none +exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02 +exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none +if ( has("gui_running") || &t_Co > 8 ) + exe "hi! VertSplit" .s:fmt_none .s:fg_base00 .s:bg_base00 +else + exe "hi! VertSplit" .s:fmt_revbb .s:fg_base00 .s:bg_base02 +endif +exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none +exe "hi! VisualNOS" .s:fmt_stnd .s:fg_none .s:bg_base02 .s:fmt_revbb +exe "hi! WarningMsg" .s:fmt_bold .s:fg_red .s:bg_none +exe "hi! WildMenu" .s:fmt_none .s:fg_base2 .s:bg_base02 .s:fmt_revbb +exe "hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_base02 .s:sp_base03 +exe "hi! FoldColumn" .s:fmt_none .s:fg_base0 .s:bg_base02 +if (g:solarized_diffmode=="high") +exe "hi! DiffAdd" .s:fmt_revr .s:fg_green .s:bg_none +exe "hi! DiffChange" .s:fmt_revr .s:fg_yellow .s:bg_none +exe "hi! DiffDelete" .s:fmt_revr .s:fg_red .s:bg_none +exe "hi! DiffText" .s:fmt_revr .s:fg_blue .s:bg_none +elseif (g:solarized_diffmode=="low") +exe "hi! DiffAdd" .s:fmt_undr .s:fg_green .s:bg_none .s:sp_green +exe "hi! DiffChange" .s:fmt_undr .s:fg_yellow .s:bg_none .s:sp_yellow +exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_none +exe "hi! DiffText" .s:fmt_undr .s:fg_blue .s:bg_none .s:sp_blue +else " normal + if has("gui_running") +exe "hi! DiffAdd" .s:fmt_bold .s:fg_green .s:bg_base02 .s:sp_green +exe "hi! DiffChange" .s:fmt_bold .s:fg_yellow .s:bg_base02 .s:sp_yellow +exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_base02 +exe "hi! DiffText" .s:fmt_bold .s:fg_blue .s:bg_base02 .s:sp_blue + else +exe "hi! DiffAdd" .s:fmt_none .s:fg_green .s:bg_base02 .s:sp_green +exe "hi! DiffChange" .s:fmt_none .s:fg_yellow .s:bg_base02 .s:sp_yellow +exe "hi! DiffDelete" .s:fmt_none .s:fg_red .s:bg_base02 +exe "hi! DiffText" .s:fmt_none .s:fg_blue .s:bg_base02 .s:sp_blue + endif +endif +exe "hi! SignColumn" .s:fmt_none .s:fg_base0 +exe "hi! Conceal" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! SpellBad" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_red +exe "hi! SpellCap" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_violet +exe "hi! SpellRare" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_cyan +exe "hi! SpellLocal" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_yellow +exe "hi! Pmenu" .s:fmt_none .s:fg_base0 .s:bg_base02 .s:fmt_revbb +exe "hi! PmenuSel" .s:fmt_none .s:fg_base01 .s:bg_base2 .s:fmt_revbb +exe "hi! PmenuSbar" .s:fmt_none .s:fg_base2 .s:bg_base0 .s:fmt_revbb +exe "hi! PmenuThumb" .s:fmt_none .s:fg_base0 .s:bg_base03 .s:fmt_revbb +exe "hi! TabLine" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 +exe "hi! TabLineFill" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 +exe "hi! TabLineSel" .s:fmt_undr .s:fg_base01 .s:bg_base2 .s:sp_base0 .s:fmt_revbbu +exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02 +exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1 +exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02 +exe "hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0 +hi! link lCursor Cursor +exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01 + +"}}} +" vim syntax highlighting "{{{ +" --------------------------------------------------------------------- +"exe "hi! vimLineComment" . s:fg_base01 .s:bg_none .s:fmt_ital +"hi! link vimComment Comment +"hi! link vimLineComment Comment +hi! link vimVar Identifier +hi! link vimFunc Function +hi! link vimUserFunc Function +hi! link helpSpecial Special +hi! link vimSet Normal +hi! link vimSetEqual Normal +exe "hi! vimCommentString" .s:fmt_none .s:fg_violet .s:bg_none +exe "hi! vimCommand" .s:fmt_none .s:fg_yellow .s:bg_none +exe "hi! vimCmdSep" .s:fmt_bold .s:fg_blue .s:bg_none +exe "hi! helpExample" .s:fmt_none .s:fg_base1 .s:bg_none +exe "hi! helpOption" .s:fmt_none .s:fg_cyan .s:bg_none +exe "hi! helpNote" .s:fmt_none .s:fg_magenta.s:bg_none +exe "hi! helpVim" .s:fmt_none .s:fg_magenta.s:bg_none +exe "hi! helpHyperTextJump" .s:fmt_undr .s:fg_blue .s:bg_none +exe "hi! helpHyperTextEntry".s:fmt_none .s:fg_green .s:bg_none +exe "hi! vimIsCommand" .s:fmt_none .s:fg_base00 .s:bg_none +exe "hi! vimSynMtchOpt" .s:fmt_none .s:fg_yellow .s:bg_none +exe "hi! vimSynType" .s:fmt_none .s:fg_cyan .s:bg_none +exe "hi! vimHiLink" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! vimHiGroup" .s:fmt_none .s:fg_blue .s:bg_none +exe "hi! vimGroup" .s:fmt_undb .s:fg_blue .s:bg_none +"}}} +" diff highlighting "{{{ +" --------------------------------------------------------------------- +hi! link diffAdded Statement +hi! link diffLine Identifier +"}}} +" git & gitcommit highlighting "{{{ +"git +"exe "hi! gitDateHeader" +"exe "hi! gitIdentityHeader" +"exe "hi! gitIdentityKeyword" +"exe "hi! gitNotesHeader" +"exe "hi! gitReflogHeader" +"exe "hi! gitKeyword" +"exe "hi! gitIdentity" +"exe "hi! gitEmailDelimiter" +"exe "hi! gitEmail" +"exe "hi! gitDate" +"exe "hi! gitMode" +"exe "hi! gitHashAbbrev" +"exe "hi! gitHash" +"exe "hi! gitReflogMiddle" +"exe "hi! gitReference" +"exe "hi! gitStage" +"exe "hi! gitType" +"exe "hi! gitDiffAdded" +"exe "hi! gitDiffRemoved" +"gitcommit +"exe "hi! gitcommitSummary" +exe "hi! gitcommitComment" .s:fmt_ital .s:fg_base01 .s:bg_none +hi! link gitcommitUntracked gitcommitComment +hi! link gitcommitDiscarded gitcommitComment +hi! link gitcommitSelected gitcommitComment +exe "hi! gitcommitUnmerged" .s:fmt_bold .s:fg_green .s:bg_none +exe "hi! gitcommitOnBranch" .s:fmt_bold .s:fg_base01 .s:bg_none +exe "hi! gitcommitBranch" .s:fmt_bold .s:fg_magenta .s:bg_none +hi! link gitcommitNoBranch gitcommitBranch +exe "hi! gitcommitDiscardedType".s:fmt_none .s:fg_red .s:bg_none +exe "hi! gitcommitSelectedType" .s:fmt_none .s:fg_green .s:bg_none +"exe "hi! gitcommitUnmergedType" +"exe "hi! gitcommitType" +"exe "hi! gitcommitNoChanges" +"exe "hi! gitcommitHeader" +exe "hi! gitcommitHeader" .s:fmt_none .s:fg_base01 .s:bg_none +exe "hi! gitcommitUntrackedFile".s:fmt_bold .s:fg_cyan .s:bg_none +exe "hi! gitcommitDiscardedFile".s:fmt_bold .s:fg_red .s:bg_none +exe "hi! gitcommitSelectedFile" .s:fmt_bold .s:fg_green .s:bg_none +exe "hi! gitcommitUnmergedFile" .s:fmt_bold .s:fg_yellow .s:bg_none +exe "hi! gitcommitFile" .s:fmt_bold .s:fg_base0 .s:bg_none +hi! link gitcommitDiscardedArrow gitcommitDiscardedFile +hi! link gitcommitSelectedArrow gitcommitSelectedFile +hi! link gitcommitUnmergedArrow gitcommitUnmergedFile +"exe "hi! gitcommitArrow" +"exe "hi! gitcommitOverflow" +"exe "hi! gitcommitBlank" +" }}} +" html highlighting "{{{ +" --------------------------------------------------------------------- +exe "hi! htmlTag" .s:fmt_none .s:fg_base01 .s:bg_none +exe "hi! htmlEndTag" .s:fmt_none .s:fg_base01 .s:bg_none +exe "hi! htmlTagN" .s:fmt_bold .s:fg_base1 .s:bg_none +exe "hi! htmlTagName" .s:fmt_bold .s:fg_blue .s:bg_none +exe "hi! htmlSpecialTagName".s:fmt_ital .s:fg_blue .s:bg_none +exe "hi! htmlArg" .s:fmt_none .s:fg_base00 .s:bg_none +exe "hi! javaScript" .s:fmt_none .s:fg_yellow .s:bg_none +"}}} +" perl highlighting "{{{ +" --------------------------------------------------------------------- +exe "hi! perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none +exe "hi! perlVarPlain" . s:fg_yellow .s:bg_back .s:fmt_none +exe "hi! perlStatementFileDesc". s:fg_cyan.s:bg_back.s:fmt_none + +"}}} +" tex highlighting "{{{ +" --------------------------------------------------------------------- +exe "hi! texStatement" . s:fg_cyan .s:bg_back .s:fmt_none +exe "hi! texMathZoneX" . s:fg_yellow .s:bg_back .s:fmt_none +exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none +exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none +exe "hi! texRefLabel" . s:fg_yellow .s:bg_back .s:fmt_none +"}}} +" ruby highlighting "{{{ +" --------------------------------------------------------------------- +exe "hi! rubyDefine" . s:fg_base1 .s:bg_back .s:fmt_bold +"rubyInclude +"rubySharpBang +"rubyAccess +"rubyPredefinedVariable +"rubyBoolean +"rubyClassVariable +"rubyBeginEnd +"rubyRepeatModifier +"hi! link rubyArrayDelimiter Special " [ , , ] +"rubyCurlyBlock { , , } + +"hi! link rubyClass Keyword +"hi! link rubyModule Keyword +"hi! link rubyKeyword Keyword +"hi! link rubyOperator Operator +"hi! link rubyIdentifier Identifier +"hi! link rubyInstanceVariable Identifier +"hi! link rubyGlobalVariable Identifier +"hi! link rubyClassVariable Identifier +"hi! link rubyConstant Type +"}}} +" haskell syntax highlighting"{{{ +" --------------------------------------------------------------------- +" For use with syntax/haskell.vim : Haskell Syntax File +" http://www.vim.org/scripts/script.php?script_id=3034 +" See also Steffen Siering's github repository: +" http://github.com/urso/dotrc/blob/master/vim/syntax/haskell.vim +" --------------------------------------------------------------------- +" +" Treat True and False specially, see the plugin referenced above +let hs_highlight_boolean=1 +" highlight delims, see the plugin referenced above +let hs_highlight_delimiters=1 + +exe "hi! cPreCondit". s:fg_orange.s:bg_none .s:fmt_none + +exe "hi! VarId" . s:fg_blue .s:bg_none .s:fmt_none +exe "hi! ConId" . s:fg_yellow .s:bg_none .s:fmt_none +exe "hi! hsImport" . s:fg_magenta.s:bg_none .s:fmt_none +exe "hi! hsString" . s:fg_base00 .s:bg_none .s:fmt_none + +exe "hi! hsStructure" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hs_hlFunctionName" . s:fg_blue .s:bg_none +exe "hi! hsStatement" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hsImportLabel" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hs_OpFunctionName" . s:fg_yellow .s:bg_none .s:fmt_none +exe "hi! hs_DeclareFunction" . s:fg_orange .s:bg_none .s:fmt_none +exe "hi! hsVarSym" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hsType" . s:fg_yellow .s:bg_none .s:fmt_none +exe "hi! hsTypedef" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hsModuleName" . s:fg_green .s:bg_none .s:fmt_undr +exe "hi! hsModuleStartLabel" . s:fg_magenta.s:bg_none .s:fmt_none +hi! link hsImportParams Delimiter +hi! link hsDelimTypeExport Delimiter +hi! link hsModuleStartLabel hsStructure +hi! link hsModuleWhereLabel hsModuleStartLabel + +" following is for the haskell-conceal plugin +" the first two items don't have an impact, but better safe +exe "hi! hsNiceOperator" . s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! hsniceoperator" . s:fg_cyan .s:bg_none .s:fmt_none + +"}}} +" pandoc markdown syntax highlighting "{{{ +" --------------------------------------------------------------------- + +"PandocHiLink pandocNormalBlock +exe "hi! pandocTitleBlock" .s:fg_blue .s:bg_none .s:fmt_none +exe "hi! pandocTitleBlockTitle" .s:fg_blue .s:bg_none .s:fmt_bold +exe "hi! pandocTitleComment" .s:fg_blue .s:bg_none .s:fmt_bold +exe "hi! pandocComment" .s:fg_base01 .s:bg_none .s:fmt_ital +exe "hi! pandocVerbatimBlock" .s:fg_yellow .s:bg_none .s:fmt_none +hi! link pandocVerbatimBlockDeep pandocVerbatimBlock +hi! link pandocCodeBlock pandocVerbatimBlock +hi! link pandocCodeBlockDelim pandocVerbatimBlock +exe "hi! pandocBlockQuote" .s:fg_blue .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader1" .s:fg_blue .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader2" .s:fg_cyan .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader3" .s:fg_yellow .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader4" .s:fg_red .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader5" .s:fg_base0 .s:bg_none .s:fmt_none +exe "hi! pandocBlockQuoteLeader6" .s:fg_base01 .s:bg_none .s:fmt_none +exe "hi! pandocListMarker" .s:fg_magenta.s:bg_none .s:fmt_none +exe "hi! pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr + +" Definitions +" --------------------------------------------------------------------- +let s:fg_pdef = s:fg_violet +exe "hi! pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none +exe "hi! pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd +exe "hi! pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold +exe "hi! pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital +exe "hi! pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi +exe "hi! pandocStrongEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_bold +exe "hi! pandocStrongEmphasisNestedDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi +exe "hi! pandocStrongEmphasisEmphasisDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi +exe "hi! pandocStrikeoutDefinition" .s:fg_pdef .s:bg_none .s:fmt_revr +exe "hi! pandocVerbatimInlineDefinition" .s:fg_pdef .s:bg_none .s:fmt_none +exe "hi! pandocSuperscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none +exe "hi! pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none + +" Tables +" --------------------------------------------------------------------- +let s:fg_ptable = s:fg_blue +exe "hi! pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none +exe "hi! pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none +hi! link pandocTableStructureTop pandocTableStructre +hi! link pandocTableStructureEnd pandocTableStructre +exe "hi! pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none +exe "hi! pandocTableZebraDark" .s:fg_ptable.s:bg_base02.s:fmt_none +exe "hi! pandocEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_ital +exe "hi! pandocEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi +exe "hi! pandocStrongEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bold +exe "hi! pandocStrongEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi +exe "hi! pandocStrongEmphasisEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bldi +exe "hi! pandocStrikeoutTable" .s:fg_ptable.s:bg_none .s:fmt_revr +exe "hi! pandocVerbatimInlineTable" .s:fg_ptable.s:bg_none .s:fmt_none +exe "hi! pandocSuperscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none +exe "hi! pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none + +" Headings +" --------------------------------------------------------------------- +let s:fg_phead = s:fg_orange +exe "hi! pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold +exe "hi! pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold +exe "hi! pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi +exe "hi! pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi +exe "hi! pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold +exe "hi! pandocStrongEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi +exe "hi! pandocStrongEmphasisEmphasisHeading".s:fg_phead .s:bg_none.s:fmt_bldi +exe "hi! pandocStrikeoutHeading" .s:fg_phead .s:bg_none.s:fmt_revr +exe "hi! pandocVerbatimInlineHeading" .s:fg_phead .s:bg_none.s:fmt_bold +exe "hi! pandocSuperscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold +exe "hi! pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold + +" Links +" --------------------------------------------------------------------- +exe "hi! pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none +exe "hi! pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr +exe "hi! pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb +exe "hi! pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr +exe "hi! pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi +exe "hi! pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00 +exe "hi! pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00 +exe "hi! pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold +exe "hi! pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb +exe "hi! pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr +exe "hi! pandocFootnoteDefLink" .s:fg_green .s:bg_none .s:fmt_bold +exe "hi! pandocFootnoteInline" .s:fg_green .s:bg_none .s:fmt_undb +exe "hi! pandocFootnote" .s:fg_green .s:bg_none .s:fmt_none +exe "hi! pandocCitationDelim" .s:fg_magenta.s:bg_none .s:fmt_none +exe "hi! pandocCitation" .s:fg_magenta.s:bg_none .s:fmt_none +exe "hi! pandocCitationID" .s:fg_magenta.s:bg_none .s:fmt_undr +exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none + +" Main Styles +" --------------------------------------------------------------------- +exe "hi! pandocStyleDelim" .s:fg_base01 .s:bg_none .s:fmt_none +exe "hi! pandocEmphasis" .s:fg_base0 .s:bg_none .s:fmt_ital +exe "hi! pandocEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi +exe "hi! pandocStrongEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bold +exe "hi! pandocStrongEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi +exe "hi! pandocStrongEmphasisEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bldi +exe "hi! pandocStrikeout" .s:fg_base01 .s:bg_none .s:fmt_revr +exe "hi! pandocVerbatimInline" .s:fg_yellow .s:bg_none .s:fmt_none +exe "hi! pandocSuperscript" .s:fg_violet .s:bg_none .s:fmt_none +exe "hi! pandocSubscript" .s:fg_violet .s:bg_none .s:fmt_none + +exe "hi! pandocRule" .s:fg_blue .s:bg_none .s:fmt_bold +exe "hi! pandocRuleLine" .s:fg_blue .s:bg_none .s:fmt_bold +exe "hi! pandocEscapePair" .s:fg_red .s:bg_none .s:fmt_bold +exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none +exe "hi! pandocNonBreakingSpace" . s:fg_red .s:bg_none .s:fmt_revr +hi! link pandocEscapedCharacter pandocEscapePair +hi! link pandocLineBreak pandocEscapePair + +" Embedded Code +" --------------------------------------------------------------------- +exe "hi! pandocMetadataDelim" .s:fg_base01 .s:bg_none .s:fmt_none +exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_none +exe "hi! pandocMetadataKey" .s:fg_blue .s:bg_none .s:fmt_none +exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_bold +hi! link pandocMetadataTitle pandocMetadata + +"}}} +" Utility autocommand "{{{ +" --------------------------------------------------------------------- +" In cases where Solarized is initialized inside a terminal vim session and +" then transferred to a gui session via the command `:gui`, the gui vim process +" does not re-read the colorscheme (or .vimrc for that matter) so any `has_gui` +" related code that sets gui specific values isn't executed. +" +" Currently, Solarized sets only the cterm or gui values for the colorscheme +" depending on gui or terminal mode. It's possible that, if the following +" autocommand method is deemed excessively poor form, that approach will be +" used again and the autocommand below will be dropped. +" +" However it seems relatively benign in this case to include the autocommand +" here. It fires only in cases where vim is transferring from terminal to gui +" mode (detected with the script scope s:vmode variable). It also allows for +" other potential terminal customizations that might make gui mode suboptimal. +" +autocmd GUIEnter * if (s:vmode != "gui") | exe "colorscheme " . g:colors_name | endif +"}}} +" Highlight Trailing Space {{{ +" Experimental: Different highlight when on cursorline +function! s:SolarizedHiTrail() + if g:solarized_hitrail==0 + hi! clear solarizedTrailingSpace + else + syn match solarizedTrailingSpace "\s*$" + exe "hi! solarizedTrailingSpace " .s:fmt_undr .s:fg_red .s:bg_none .s:sp_red + endif +endfunction +augroup SolarizedHiTrail + autocmd! + if g:solarized_hitrail==1 + autocmd! Syntax * call s:SolarizedHiTrail() + autocmd! ColorScheme * if g:colors_name == "solarized" | call s:SolarizedHiTrail() | else | augroup! s:SolarizedHiTrail | endif + endif +augroup END +" }}} +" Menus "{{{ +" --------------------------------------------------------------------- +" Turn off Solarized menu by including the following assignment in your .vimrc: +" +" let g:solarized_menu=0 + +function! s:SolarizedOptions() + new "new buffer + setf vim "vim filetype + let failed = append(0, s:defaults_list) + let failed = append(0, s:colorscheme_list) + let failed = append(0, s:options_list) + let failed = append(0, s:lazycat_list) + 0 "jump back to the top +endfunction +if !exists(":SolarizedOptions") + command SolarizedOptions :call s:SolarizedOptions() +endif + +function! SolarizedMenu() + if exists("g:loaded_solarized_menu") + try + silent! aunmenu Solarized + endtry + endif + let g:loaded_solarized_menu = 1 + + if g:colors_name == "solarized" && g:solarized_menu != 0 + + amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized + amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized + amenu &Solarized.&Contrast.&High\ Contrast :let g:solarized_contrast="high" \| colorscheme solarized + an &Solarized.&Contrast.-sep- + amenu &Solarized.&Contrast.&Help:\ Contrast :help 'solarized_contrast' + + amenu &Solarized.&Visibility.&Low\ Visibility :let g:solarized_visibility="low" \| colorscheme solarized + amenu &Solarized.&Visibility.&Normal\ Visibility :let g:solarized_visibility="normal" \| colorscheme solarized + amenu &Solarized.&Visibility.&High\ Visibility :let g:solarized_visibility="high" \| colorscheme solarized + an &Solarized.&Visibility.-sep- + amenu &Solarized.&Visibility.&Help:\ Visibility :help 'solarized_visibility' + + amenu &Solarized.&Background.&Toggle\ Background :ToggleBG + amenu &Solarized.&Background.&Dark\ Background :set background=dark \| colorscheme solarized + amenu &Solarized.&Background.&Light\ Background :set background=light \| colorscheme solarized + an &Solarized.&Background.-sep- + amenu &Solarized.&Background.&Help:\ ToggleBG :help togglebg + + if g:solarized_bold==0 | let l:boldswitch="On" | else | let l:boldswitch="Off" | endif + exe "amenu &Solarized.&Styling.&Turn\\ Bold\\ ".l:boldswitch." :let g:solarized_bold=(abs(g:solarized_bold-1)) \\| colorscheme solarized" + if g:solarized_italic==0 | let l:italicswitch="On" | else | let l:italicswitch="Off" | endif + exe "amenu &Solarized.&Styling.&Turn\\ Italic\\ ".l:italicswitch." :let g:solarized_italic=(abs(g:solarized_italic-1)) \\| colorscheme solarized" + if g:solarized_underline==0 | let l:underlineswitch="On" | else | let l:underlineswitch="Off" | endif + exe "amenu &Solarized.&Styling.&Turn\\ Underline\\ ".l:underlineswitch." :let g:solarized_underline=(abs(g:solarized_underline-1)) \\| colorscheme solarized" + + amenu &Solarized.&Diff\ Mode.&Low\ Diff\ Mode :let g:solarized_diffmode="low" \| colorscheme solarized + amenu &Solarized.&Diff\ Mode.&Normal\ Diff\ Mode :let g:solarized_diffmode="normal" \| colorscheme solarized + amenu &Solarized.&Diff\ Mode.&High\ Diff\ Mode :let g:solarized_diffmode="high" \| colorscheme solarized + + if g:solarized_hitrail==0 | let l:hitrailswitch="On" | else | let l:hitrailswitch="Off" | endif + exe "amenu &Solarized.&Experimental.&Turn\\ Highlight\\ Trailing\\ Spaces\\ ".l:hitrailswitch." :let g:solarized_hitrail=(abs(g:solarized_hitrail-1)) \\| colorscheme solarized" + an &Solarized.&Experimental.-sep- + amenu &Solarized.&Experimental.&Help:\ HiTrail :help 'solarized_hitrail' + + an &Solarized.-sep1- + + amenu &Solarized.&Autogenerate\ options :SolarizedOptions + + an &Solarized.-sep2- + + amenu &Solarized.&Help.&Solarized\ Help :help solarized + amenu &Solarized.&Help.&Toggle\ Background\ Help :help togglebg + amenu &Solarized.&Help.&Removing\ This\ Menu :help solarized-menu + + an 9999.77 &Help.&Solarized\ Colorscheme :help solarized + an 9999.78 &Help.&Toggle\ Background :help togglebg + an 9999.79 &Help.-sep3- + + endif +endfunction + +autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarized | else | call SolarizedMenu() | endif + +"}}} +" License "{{{ +" --------------------------------------------------------------------- +" +" Copyright (c) 2011 Ethan Schoonover +" +" Permission is hereby granted, free of charge, to any person obtaining a copy +" of this software and associated documentation files (the "Software"), to deal +" in the Software without restriction, including without limitation the rights +" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +" copies of the Software, and to permit persons to whom the Software is +" furnished to do so, subject to the following conditions: +" +" The above copyright notice and this permission notice shall be included in +" all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +" THE SOFTWARE. +" +" vim:foldmethod=marker:foldlevel=0 +"}}} diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/syntax.vim pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/syntax.vim --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/syntax.vim 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/syntax.vim 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,50 @@ +:syntax case match +:syntax case ignore +:syntax spell notoplevel +:syntax keyword Type int long char +:syntax keyword Type contained int long char +:syntax keyword Type int long contained char +:syntax keyword Type int long char contained=aasf,@a +:syntax match Thing "# [^#]\+ #" contains=@ThingMembers +:syntax cluster ThingMembers contains=ThingMember1,ThingMember2 +:syntax region Comment start="/\*" end="\*/" +:syntax region String start=+"+ end=+"+ skip=+\\"+ +:syntax match Character /'.'/hs=s+1,he=e-1 +:syn region htmlRef start=++ end=++ keepend contains=htmlItem,htmlScript +:syntax match Thing "# [^#]\+ #" contains=@ThingMembers +:syntax cluster ThingMembers contains=ThingMember1,ThingMember2 +:syntax include @Pod :p:h/pod.vim [aa] +:syntax sync maxlines=100 +:syntax sync ccomment maxlines=500 +:syntax sync linebreaks=1 +:syntax sync fromstart +:syntax sync ccomment +:syntax sync ccomment javaComment +:syntax sync minlines=50 +:syntax sync match sync-group-name grouphere group-name +patt " asfasf" ern+ +:syntax sync match sync-group-name groupthere group-name "pattern" +:syntax sync match .. +:syntax sync region .. +:syntax sync linecont pattern +:syntax sync maxlines=100 +:syntax sync clear +:syntax sync clear sync-group-name +:syn match ifstart "\:p:h/pod.vim +:syntax region perlPOD start="^=head" end="^=cut" contains=@Pod diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/textobj-rubyblock.vmb pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/textobj-rubyblock.vmb --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/textobj-rubyblock.vmb 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/textobj-rubyblock.vmb 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,215 @@ +" Vimball Archiver by Charles E. Campbell, Jr., Ph.D. +UseVimball +finish +plugin/textobj/rubyblock.vim [[[1 +58 +if exists('g:loaded_textobj_rubyblock') "{{{1 + finish +endif + +" Interface "{{{1 +call textobj#user#plugin('rubyblock', { +\ '-': { +\ '*sfile*': expand(':p'), +\ 'select-a': 'ar', '*select-a-function*': 's:select_a', +\ 'select-i': 'ir', '*select-i-function*': 's:select_i' +\ } +\ }) + +" Misc. "{{{1 +let s:comment_escape = '\v^[^#]*' +let s:block_openers = '\zs(||||)' +let s:start_pattern = s:comment_escape . s:block_openers +let s:end_pattern = s:comment_escape . '\zs' +let s:skip_pattern = 'getline(".") =~ "\\w\\s\\+if"' + +function! s:select_a() + let s:flags = 'W' + + call searchpair(s:start_pattern,'',s:end_pattern, s:flags, s:skip_pattern) + let end_pos = getpos('.') + + " Jump to match + normal % + let start_pos = getpos('.') + + return ['V', start_pos, end_pos] +endfunction + +function! s:select_i() + let s:flags = 'W' + if expand('') == 'end' + let s:flags = 'cW' + endif + + call searchpair(s:start_pattern,'',s:end_pattern, s:flags, s:skip_pattern) + + " Move up one line, and save position + normal k^ + let end_pos = getpos('.') + + " Move down again, jump to match, then down one line and save position + normal j^%j + let start_pos = getpos('.') + + return ['V', start_pos, end_pos] +endfunction + +" Fin. "{{{1 + +let g:loaded_textobj_rubyblock = 1 + +" __END__ +" vim: foldmethod=marker +doc/textobj-rubyblock.txt [[[1 +151 +*textobj-rubyblock.txt* Text objects for ruby blocks + +Version 0.0.1 + +CONTENTS *textobj-rubyblock-contents* + +Introduction |textobj-rubyblock-introduction| +Interface |textobj-rubyblock-interface| +Mappings |textobj-rubyblock-mappings| +Examples |textobj-rubyblock-examples| +Bugs |textobj-rubyblock-bugs| +Changelog |textobj-rubyblock-changelog| + + +============================================================================== +INTRODUCTION *textobj-rubyblock-introduction* + +The *textobj-rubyblock* plugin provides two new |text-objects| which are +triggered by `ar` and `ir` respectively. These follow Vim convention, so that +`ar` selects _all_ of a ruby block, and `ir` selects the _inner_ portion of a +rubyblock. + +In ruby, a block is always closed with the `end` keyword. Ruby blocks may be +opened using one of several keywords, including `module`, `class`, `def` `if` +and `do`. This example demonstrates a few of these: +> + module Foo + class Bar + def Baz + [1,2,3].each do |i| + i + 1 + end + end + end + end +< +Suppose your cursor was positioned on the word `def` in this snippet. Typing +`var` would enable visual mode selecting _all_ of the method definition. Your +selection would comprise the following lines: +> + def Baz + [1,2,3].each do |i| + i + 1 + end + end +< +Whereas if you typed `vir`, you would select everything _inside_ of the method +definition, which looks like this: +> + [1,2,3].each do |i| + i + 1 + end +< +Note that the `ar` and `ir` text objects always enable _visual line_ mode, +even if you were in visual character or block mode before you triggered the +rubyblock text object. + +Note too that the `ar` and `ir` text objects always position your cursor on +the `end` keyword. If you want to move to the top of the selection, you can do +so with the `o` key. + +# Limitations # + +Some text objects in Vim respond to a count. For example, the `a{` text object +will select _all_ of the current `{}` delimited block, but if you prefix it +with the number 2 (e.g. `v2i{`) then it will select all of the block that +contains the current block. The rubyblock text object does not respond in this +way if you prefix a count. This is due to a limitation in vimscript #2100. + +However, you can achieve a similar effect by repeating the rubyblock +text-object manually. So if you press `var` to select the current ruby block, +you can expand your selection outwards by repeating `ar`, or contract your +selection inwards by repeating `ir`. + + +# Requirements: # + +- Vim 7.2 or later +- |textobj-user| 0.3.7 or later (vimscript#2100) +- |matchit.vim| + +Matchit.vim is distributed with Vim, but is not enabled by default. If you add +the following line to your vimrc file, then it will enable matchit.vim each +time Vim starts up: +> + runtime macros/matchit.vim +< +Latest version: +http://github.com/nelstrom/vim-textobj-rubyblock + + +============================================================================== +INTERFACE *textobj-rubyblock-interface* + +------------------------------------------------------------------------------ +MAPPINGS *textobj-rubyblock-mappings* + +These key mappings are defined in Visual mode and Operator-pending mode. + +(textobj-rubyblock-a) *(textobj-rubyblock-a)* + Select the ruby block including the opening and closing lines. + +(textobj-rubyblock-i) *(textobj-rubyblock-i)* + Select the inner lines of a ruby block. The opening and closing + lines are not included. + +============================================================================== +CUSTOMIZING *textobj-rubyblock-customizing* + + *g:textobj_rubyblock_no_default_key_mappings* + *:TextobjRubyblockDefaultKeyMappings* + + This plugin will define the following key mappings in Visual mode and + Operator-pending mode automatically. If you don't want these key + mappings, define |g:textobj_rubyblock_no_default_key_mappings| before + this plugin is loaded (e.g. in your |vimrc|). You can also use + |:TextobjRubyblockDefaultKeyMappings| to redefine these key mappings. + This command doesn't override existing {lhs}s unless [!] is given. + + {lhs} {rhs} ~ + ----- ---------------------- ~ + ar (textobj-rubyblock-a) + ir (textobj-rubyblock-i) + + Suppose that you didn't like using `ar` and `ir` to trigger the + rubyblock text objects, and instead wanted to map them to `ae` and + `ie`. You could achieve this by placing the following in your vimrc + file: + + let g:textobj_rubyblock_no_default_key_mappings = 1 + xmap ae (textobj-rubyblock-a) + omap ae (textobj-rubyblock-a) + xmap ie (textobj-rubyblock-i) + omap ie (textobj-rubyblock-i) + +============================================================================== +BUGS *textobj-rubyblock-bugs* + +- [count] is just ignored. + +- See |textobj-user-bugs| for further information. + +============================================================================== +CHANGELOG *textobj-rubyblock-changelog* + +0.0.1 2010-12-27 + - First release. + +============================================================================== +vim:tw=78:ts=8:ft=help:norl:fen:fdl=0:fdm=marker: diff -Nru pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/tpope-characterize.vim pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/tpope-characterize.vim --- pycharm-2020.2.5/plugins/textmate/lib/bundles/viml/tests/tpope-characterize.vim 1970-01-01 00:00:00.000000000 +0000 +++ pycharm-2020.3/plugins/textmate/lib/bundles/viml/tests/tpope-characterize.vim 2020-12-01 23:26:21.000000000 +0000 @@ -0,0 +1,46 @@ +" characterize.vim - Unicode character metadata +" Maintainer: Tim Pope +" Version: 1.0 + +if exists("g:loaded_characterize") || v:version < 700 || &cp + finish +endif +let g:loaded_characterize = 1 + +function! s:info(char) + if empty(a:char) + return 'NUL' + endif + let charseq = a:char + let outs = [] + while !empty(charseq) + let nr = charseq ==# "\n" ? 0 : char2nr(charseq) + let char = nr < 32 ? '^'.nr2char(64 + nr) : nr2char(nr) + let charseq = strpart(charseq, nr ? len(nr2char(nr)) : 1) + let out = '<' . (empty(outs) ? '' : ' ') . char . '> ' . nr + if nr < 256 + let out .= printf(', \%03o', nr) + endif + let out .= printf(', U+%04X', nr) + let out .= ' '.characterize#description(nr, '') + for digraph in characterize#digraphs(nr) + let out .= ", \".digraph + endfor + for emoji in characterize#emojis(nr) + let out .= ', '.emoji + endfor + let entity = characterize#html_entity(nr) + if !empty(entity) + let out .= ', '.entity + endif + call add(outs, out) + endwhile + return join(outs, ' ') +endfunction + +nnoremap