From e6300357102de370d3b8252fbe4b178c5fc674dd Mon Sep 17 00:00:00 2001 From: souzatharsis Date: Mon, 12 Jul 2021 23:28:31 -0400 Subject: [PATCH] Fixed bug to allow for searching players with special characters in their username --- docs/build/doctrees/environment.pickle | Bin 67986 -> 68244 bytes docs/build/doctrees/pyETT.doctree | Bin 112864 -> 113256 bytes docs/build/html/.buildinfo | 2 +- docs/build/html/_modules/index.html | 2 +- .../html/_static/documentation_options.js | 2 +- docs/build/html/genindex.html | 2 +- docs/build/html/index.html | 2 +- docs/build/html/modules.html | 2 +- docs/build/html/py-modindex.html | 2 +- docs/build/html/pyETT.html | 4 ++-- docs/build/html/pyETT_demo.html | 2 +- docs/build/html/search.html | 2 +- docs/source/conf.py | 2 +- pyETT/ett.py | 5 ++++- pyETT/ett_parser.py | 4 ++++ setup.py | 2 +- 16 files changed, 21 insertions(+), 14 deletions(-) diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle index 88392cdd3553768a5b102f50b8387ddba58f8d6e..64462242468b9d27704703de86473653bd33c45b 100644 GIT binary patch delta 13336 zcmcgz3s_V~mi8iaBQ%2YP!Oa66^H^p2rA$!Dr;=p_|8szU;{1mwduxws2EM70s?cR z#?uq`o5>hwl5bz1V|2;7Yt|XW$86T@_~}l*m~qDq#&;$g^PFMUnS6Ur)$QAtw$WTo z#?P<%p8uRWRdwprId!Wp`ykT)gUG0+s2`Z4k4C*I2v2stC0sBHPeNCAG91hvi9lC& zQZ)X&`^1ic`15Sx{OEYeV9d*PS?yMf+nSs2hu2D$m&Pwvc_8P^h>&GXPwjK z@k>z*^-KDCXN}ixbt7VP)L1wBr5KOX>vCA?t&Yx#lVb)h6Hi7A81PrK-Y=W=<$S|f z@pO>7v|Bu-P^KAgirot3syZxoDb&e(d&Dyeb@|XDI8<6DoP^t@#X>jyxGXDSXklRy z{%4&kvU)slyv#Uouh<0{Wwu1G6m4@<+r2f`8o&4{>Jh(yi1N`o_V^hTlxLtWQ~69G z7NqitLIQM^j}->P@5;ZID;fq47~rj9y%yu}Ie)uO#ja5#NTX#-MPwb3B0bJ(m7Z9*Ff*;Fuk*%Y6={&&=Jr(DJl1+Y_(Oag zQfC#%htz>pvxbLYNw{pX=BWKqOr_p1Uu?#wZ|sZkhG_(@NMUi3k1dKFiW;95H7L8< zFR!a@ii$=pDyTh0$0kLGM~e=%3Ky%$XVQ(&A(m#MdE#b;GrMn~$rE2tSbaI-&i)uI zHkH%#iA7Yf>39R5v`xq9aMN)}iyD+wOc|Vxe_$%a{*AE}1tdMXvBzbFAI*uK-PaSp zd4!d84HlQx;qi;7;m({zvG1W`@qH>T!<@NNS`YPvN8z`rO`RL_ShdwJjelve5#lRG zJjYCTmc**W|G=Mcv!@~Ct2@+OQ54ZT5dOKM)%SJZeu#IF7C)lmcUYK``3&-IST!^! zkBwZAtKg;&RpApKo~42-;crnJS|jMOA#SPNUxg$notIWYvn&~&cDOwjyWQfkIURCV zOO4d-y2s{ahenbVEo!hYVO%#+iwc`s$9HMJBslqW>Re{N*x63BU6s>i@mOW+P1Dk6 z7Kcwm>HMrv>y>IzqaJy1;ZN40!mifwomvkYf+J1I26Y}IU=m+57A?J&?e~r;FVuc( zw5U;!J!rp`T2%Ct$N1_EjR4;u0LXcaZBzRT-Rhv=>l3seDUG2O!tHs*X~^Jnv%7zb z48=`)$gZ0v2YOZw@zvSo$Qayae7}E9_bUoNJ#9=yzj-Z~KjwzMOgu_PI|Z(V1wtnr zT(~}gZJ8*8vCJV&-lupikOLtbyx0Yfw?PWjuws74|5&{shgF}lNTwSE)O^G(#COqhK2 z9#he;ORD#sV!}++5q!bbp2m~l%5%f#urw62)LRueCEy-+Ps?Crn=D^x42`0_TGWKM z$yZub^pnFs=XU)T_drRodezAJ%yqJaaw5-+(z*@mhO4W_gqkp2i<|FKEKMtHOIT7{L*AINQ?mYZA=Y^MTg!!b)|SD~7ruvjxllgHA}{Y2A&gI)P%Ri zaV;wPSs=%_J-^LlhnP+yGHq9(k>1T88a z=!*}Fw57(f`b2Z-4sE(4!ti4!RS!Fye=!B_N>9a^;4@y#vz3kLENL}v3 zqsl>ECvF6YIt4FREgkmnSXhYtVN6U!kP(a*@Ps%M1ZH^a;O$aR%x5KcSV%tvk+|0@rEZfCaEO97p?8jRr zMbY&xT`P%!2Ib3N)*9=Bq{scE%ci=-LIvDj0n2nlSIt)8FqB)(SiT}=!y)Tbe7b2} zsymELNfW?$H5vYO-AHh)D?-Lk*HsQ;jNy3630G{xAgeY7@hP>-vD{s2!?L%QlvUJO zu>AWvQukrqT&}JNCfrOyb%WsSN)5*QfRE-C!7RpMgRRb{l6DL(^-iAlWk@xqc!t=GD)}QmQ9?J@w64 zS{?I*e}uyhs`iOv4VGr-3M^lDuHh=4f;9~}Ft&kM9Sy{~+OUGNO5ot_R9LZL5rTim z%H9ntP}?)EJRfsWv@^LV9sqcy2$5g@b)Y%7sV?hPGZ$HJ@zk-KMp-DX&f>1LZtyby z3EmyHvDs^9lh@9cL_2G)jkVV1MOTRD&KJ?p$o0V=TxB|TEOQ8^xJSiK)uZz<`Uupz z$EoN}IN&Z;(Z}G5d%TK14#PdAD*6Ph_LQjTE;!)HQqia2oJU>%EJS(BRQ$KWs*4mjrl76Wq4(yddyc)N1lq`17B}c z+u#~Jxk;_>CfXn!-7OXlY#OAhcL!~e4(B(GRAC>>vWW&UXym(0aN*{Wh9LI24mNKt zRRLe=;1`?ARY0!}bd9+x;GPbqHWsRYuXW&VtWdQsz?sIeDmoJWuW?L5uu(nDdnt_H zq85sQsn6%bo-OL3#ldS^)YF;(*SE}9DNe*X6IFBy(uMKf2ES_5snGfSbd^jx{OS23 z6`hH7MuYTXoG;kHZ0w*Ez0T{XW*1Gn@SBRjS+h#>Xf_Nii0>80;S2;XK(jlHSs7(U%>)bD_aU=oFMysh0VFtroyE)#+TSYI>e>M z`I-&lZch#2Qf!0ES?g?|;jlO@uWcP(2U+cGQA>vCTC0P9vm<^2u5ASoclGd-Z6!m# zpgw#_#aC4PUJtjojUM_LKIe&Q9%R0dQl$n^_-mBf`aG}Q0XhyQ8JN?u)&uFZ~2O&iA3Ho z_`T04oQ7dd)399L^c0qV(==B&1^?4DdJtV$piq7^B($c)76iUq5xc>&b5bf zV?-a*!4WA9o@g<^krsWNpHK2}VjYL9_H-EA5{sNfuHppYC*XXG+)NkIT@c@z#rda* zJ_Tj16Na)T&Js-p8h;{uCM7|_t|(a98V}=7!~`09n}puRz83IG?+{G|Rw|S$rE}JK zVo`ytG{$P$r3>h}NX&~cqb)rXGe~t^A$x0+NAxZ+slb{=a!oz_+pZMe@k_+MM0KHe zR~*MK6LuLA+D38u3ei_kCZE$iME4+_Go;R0kN25u$kzzHhE`68J#Bh8*EWP(`zGNx zxwUtXH_GRPQ=u4{>F*fM z^?gNb45|ekqM;w>EM=T7lqbeQmB0jD#G&P4ef zioLuC6n4dIJs7s<3tdpMeR?#VTj2`a4O_QQKAq6{oJAr(&)``Ri2pAbk4 z08CLbQ50l+VhZP{1`x&{5un6$&dyW-BL{L6U=#;(31D}qc^nuU0GP%CqL`N#a`prU z_}K8Vf0Gn`G3QTK0LnQiQK|rxWe}LA0F+n|n5h6qc$KFVfC3mw%uxV}U0Phk!A&;IDkN_0#G18piKcN5+Kl_ z02BrgkO*K0*DvA|0(%1hTMhdHlt~26e>s4N`#JDK1^5vM4iLbOS6=17PXhp{#O)M( z@Y0k)f4~Jr@7O27xX*}@X4byZdg{ksDG@f5CFP(bu|KA|cd7Usi@jBnzQ(@JMxSYl zx8U`CH5L3@P07GNkuJ0~G&-vMY(x^j#be)42XN|^l%RYo?U8XWL_2@MLJJTrKol+aZftRIeOA^ncO5(G0Md$a@Gw@j8v4ECL?PoOjw^7ffdj66up=2f)>y0G2_i7Gu-@N)HmLFX$&SEnEWcp8(i8ZsWM+0R->~DQ9;JiVO*eM=;o^CFh4^L#oS06%d{>Q%xg(#sH~&bDkpvNJSI^kn76>WYdO;ywN)_h zAo)O>HCA`E%T|RuCdO_S%x@7}$JKGGn5QEOW3Q*Np_@+$<}C z1ZBAJgX@MFH*(l!J76Iu%gx&jyKkg%CYu7|Gq%vSScS7MNkyD>_F?Pdm7E&Fdb{N!ei+;!R6`^-x>d~h=-lC;3At697%bLb?N z(WRJWfj^Q!zwHLgtyC@(G;Ip+V2DZa%Jw%;B0FTaTpwnYk)_CKo^Mj83)j5npAn?zMsVr6;3W|)i!CBnro6PL(Pj%gA? z_`S#;FM{%@LXnipWO5d{{8$z-bEFGLH;Pmw2@8dz9i^_du* z8!*Ne(_yS1Pm1v`UuvwbDyPMT4#Jp6P3MrAg9mb>vN`fA(zV^ZAeH+Xa_AIBoLAy0)r%wFpGhvF=n+1qTQ0d=>D|2MXMVSAX+RE z2)@ly?U2PBo0*f7%s8>}C=^ciK41}NoM7WHRqy@&{kye5 z%W=->Q@`uhd-dv7)vNdZ;(03U2!w^Vg+H}O_hR_Z1fi_!72%z1p$tyuCd0G2qY*fn zn-qzc_a^KL#mnmAMUf$9E1a0NvOL^ks~5L;WL=}Z-enb=J#w_u?sC{njiSwoOjFCe z6)TMOVx!$7hcm__N7UKPc1Ks$1JR*wg>iZwnti_fVtDDe9kQZQ0WRr%x;Zp?rNd7z zM~{{MyWh|p{lzo;rS6bn!;q_}2#@-Ef=iCA7n?*h+E!-~o8c$rMZyhuzq~A}7n>dQ z6v)NUQ=S3s74uW1*BB(7o=krrE> z)m1Ond!)Z$AL*}fp<-MF`}=otRl!AZFRw)%PH6AGgvgS<2t}QbQ+&KtIrAS=0CMg%M)O;*& zm(MQ+{4#-GirB>^72{PZL4w15I{0wd$Q!+OkIx{&EEr#p#Eh85bPe4IiojrVKJ;i7 z&iT-z$s!+b@z)&h);-4ituY73`>ioe8E?(k9FG!lu=#b)%E+fU%fnelWjC4XHkj6n zig(SL(cur3l{y~4kx*Kl;=Vzuld%O)97+csQ;Lbi982Dk*pz7=Y*k21ryS& zV`>snEXUNktX9!!v|5^-9`N*=g{)x|wSZIA@sZvXg%7LC;=K&&!hB7H?AfUSSOzA3 z&RlIeN!er=OQpm3@4oXHp0CMZ9+0C=wmK{=RDC>VD^GDb${{w04qWeEPs+h4XA@8~ zCDhp)F(^)BlgVLP?=Ur)mDqHIx`VJ+tCG3TXmN^-imIJMGtM0lGH(fKLv{THuRv-a zP;y`ZiF9ZnK}INyo>N*$L6;sN!h-lZ{tGUMRQ37|qI6u<`f4y*v2BeG zlX>*G8DbE_DSrMrX<{?sehyUOmhQbRy`buN3IAa-50tG^@X2b*K$UXrLR+)bWVM={ z7Q4-(Ekgk!K9z~&v-{m(sUQhA;o$|jZnnw#lD8ljHE3o($vZ9>6>hDLZ_=sEr!jNv z=+Iib!{ijXOBX0d7uiq5UHWh^6H#3HyM;M{E?pdq8m&8g^6IBt3|0% zYGxvrHia##=3vZK99OR|2y|RiFlw}u_BpOG7!`x&VqlTDj~YRB#(Q+_Q_8(3Wli01 z`<3&8Ayf{QeK);TURV7?H=Iu)X2~SsS1@DAh8R`@`A!2bESceEyG$7O*UyJKG2br3CwBh{ z|GBq8QtmG4GwNJ)ryKw12#wOmcRo59%6vW_giSJr(JjMo0M z?jxq6Z`Q3;k6M})>bF3LvOeLf$1=4Q^RX;mF^7i-yLM#VqTaf@q8G#R(J zrj%#g%3#b@9QSrjRba*~3r0=q+NRz?$D$)mn(b|8C>>EIZ z5{-aEi&lp(HthrGV66ksJz5n?Y}muGfY_||J@Fi9ml)a(ici{jaO`La56;U0_HX2d zH}i{&UpDhg3k3(J8It*OJ&34snh8b;)1@5K_Nywon2Np|X21I-1<2>4A*3nxm!p@v zYQ0bIwWnG?0iWObfca(JkCzhMa!g*cZwzJ1KChh%&^oBn{=N3@U@F{FK=`ye_8`M2 zcb0p8piCRed4$|Mq6uy-OI<`~8~jhNLyGZLK{ofe^3d+wbMt;7s=dUCZsy|7poEjojW@i zMg2Q>Rxm0Cb*}GNGH9}B%^-c;CA?zaOT}u|S!&Vh@WuERVf?q5PPug<390|kxrkClpgei7D%5$N$v8KQ)q`AvAm_R z)^7E^W6FW=)piPRL0(;M%3EagFnpt0XL0fewe)iHEm&JuI`#>SzH}NJNKfKF^%WI8 zg;^pUL1>8taH6iv{S^EE9Y&8L?UcTY6zBMTcEP)MI^eW=B=2a-3urbJGeFki0&(E$ zV)Z2%_U2yn`iq>6AUPW^(_}~Ur$Za(s`1cKDmD$>e^!HYpQhMWZq_)OANIz>_AiN5dwkpNu+WUJ<*15NP4 z8cj|!i<8o5xY^Wf6gRq9{`exej|H%k#jlgCm3=IF`&jTgU1~Oj;7ff<1>tD`M@0lX zr=EoO9Aje^=`i^i|0aYs7isuYP~Kdo;ZH+LbE$?u14}k%!aL2QHP~6W-8@ahzYFEg z91VXC8k|}k=i#`sLL>hGt~)1b_zN(`^?-)&0h23F!(V}et^y5z9lHJ6e+*%p3N`W@ zFnyDD&b`<_BXz0O)FL{HXRn_9m`CzC78G;Qvn zW6CxBUDoD>%}KF7-61+SyLpBN2-iWY)`iE(M7_Z)^Y9-{9hpX%j8() z{IZaJfW&O|Zz08Fx4oVYPwig(=BQaTIqL9zeKLZ0%ha#RnB}Zd_EP%l!lyCDXV574 z){aK}e&_g(Ws$V$qNZHz-#-`!M!VugQp2R9RVlz6BwI><+#p_ zJ15VcGbB9&7j~5=G8JcuCxRiG1dr@VhPGWgn7?}@7r#qlA}CHpaVq9F>vxU>=it!p z$=tN_#Gi*VyDK>V0r4N8shLo`CxK%Z2)h7__B_D(9^!jI-jm1qE5u)c$?ds`4!g^S zUvIIYt`mG6Ztj`Rn|)0D$Jneej>&HjPvpq1G&s>7;We?B@Lp_}iRf_N_cOviQ!rhk z*^b|-@KHV|$>-dcZS6W3-I2)sd7A{cxj#uz(-FsY-66ppbS3H6!MctZh`%1oJKZJO zU0^q+7sjeE3s5%U+1PG8^x9*Rl-_xS62TFwaD*fn zvp*IaWXE!Y^GTksYU}Nc;-eH2UZ}ytS*>Ox6_Kn6s`giMhn5guqJv4h(n))Q3-48x z;ir&j3aTmPO{Wq+RR^=580Ef8|B0Bb9Uf^oE?_B+RW0PGd?_^yxlH1+ys~WK*e6^$ z_z%Tny#P~`PaIV!X*?HC@B&O+ELL;z8ZW@a zYrULQ!^MxQz)4&(=(4)VVQxhO?R1DVs7+{dL%^Z}Z}L7HRDdcXwrErVs)h*IRe%a0 z0vlC;iXQ^aD)6qGBQ6!8VuwvOs{mCy1X@&p${hmRRDfz70<9`Q#SQ_t3Q)B}V5bUD zokL)EB!0@qT}YJ)+&!_;E8w8H~d_)xn zk$+X2P>Dg{hblm|1%V%_096zO{!Im_jv(-y3Qz$-;HN4;RRe(+yg(6_42HbuMI@>g z*rZDZs9bd58SX9Ec6fT!m$)A2F8c=j@^Chu3qCwN4r%C-oXpTD4CXK*Ut!-vwX&|> z%5LdB(%+!^NIiUfWKukp47`J)g^HJ3kPosjysHb=rFHH2sVi2P+4beij(i~xY!@?; z9=Mn>BM(*TC+Ul^c*ZNY07fI;Xqk;hkHmzf`pGC9t_rPACW1d+Oh+AGTpWWmy{9mm zHC~`!veyG+u8%^nzNZlBlRXoVzT8uU^jc3I(&$T5kyc+S%VS;sLw_3e#~A2%QOq_6 zW#IqP{|0rnT^qfEwR=bZKDG;I?L5*loTL632F22oSfkNmvvA93Mm_pVG$WEwtu}fO zjZD)O{asXCbuBB3Sc4!KlA!c*dK}|M35M|k_RWHw&XMqrGq#+;g@R!^!J+IcX*T-* zawL8ZeFX0eu)t6)80Nr>m&e4i?(+o0V(bp4tLc2uC4!*_?p{vgoKY}rhMX&TZq~R( zFt}+fujYEOxz1s!#S;b-?-UF#kvM`6%za^~P|%Sp)UWmfO*$zU-k^?&nkINVZM8JC zD5^)lDHtL`ut~J9iK71%lt9mwQUkLgD#S2?+QscK^-){b?>_2|hXp^0>x#d9 zF#4spLxqE3LfO$Zk-}KF99l0nc=U1lWDH5T(dcqmvFg$~$kdNPXr$37ZmAQS=nF|) z+_riv9bZ_3T>TVm5V;<|5a)*)hECO2QE&-uz{h2_dOY?s!GrpTyaM%p0M^k+i}Y5M z#8Vg1YB!qkV{*F#^NMw|>o@szb2TY~7X5SHURKdmFFI=NCI=qaS+D2yzeZu+(TjqR zm#1KF>)#_yev6tl{vZ8ck3JhEq?IzC`kT%mW}4q14Cdtj^4*ia}&GgHmXg rc89UfA>s#;MsX89RkYgeUa`iTT!Wvr1mW{o_1y=1^>Oq-v=H_Gd>m2J diff --git a/docs/build/doctrees/pyETT.doctree b/docs/build/doctrees/pyETT.doctree index d9b6c2f7dd1b2c333bf3f63faa8d983674cffd28..cca85da26d9fc77b2e4d14cfa5268e7ba5636e26 100644 GIT binary patch delta 15461 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 Pl3SpumDktQLx1>RpytUl delta 15299 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 diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo index 330ab4d..97b689d 100644 --- a/docs/build/html/.buildinfo +++ b/docs/build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 132f96269b84295c115c2f79b9c8abea +config: 807abf75b139d4943d6573c6932e5000 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/build/html/_modules/index.html b/docs/build/html/_modules/index.html index 7d16d8c..486f480 100644 --- a/docs/build/html/_modules/index.html +++ b/docs/build/html/_modules/index.html @@ -7,7 +7,7 @@ - Overview: module code — pyETT 0.2.4 documentation + Overview: module code — pyETT 0.2.5 documentation diff --git a/docs/build/html/_static/documentation_options.js b/docs/build/html/_static/documentation_options.js index df15935..2216f34 100644 --- a/docs/build/html/_static/documentation_options.js +++ b/docs/build/html/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.2.4', + VERSION: '0.2.5', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html index 269b9fe..1af8693 100644 --- a/docs/build/html/genindex.html +++ b/docs/build/html/genindex.html @@ -7,7 +7,7 @@ - Index — pyETT 0.2.4 documentation + Index — pyETT 0.2.5 documentation diff --git a/docs/build/html/index.html b/docs/build/html/index.html index 67f2d55..688a1a4 100644 --- a/docs/build/html/index.html +++ b/docs/build/html/index.html @@ -7,7 +7,7 @@ - Welcome to pyETT’s documentation! — pyETT 0.2.4 documentation + Welcome to pyETT’s documentation! — pyETT 0.2.5 documentation diff --git a/docs/build/html/modules.html b/docs/build/html/modules.html index 5099b17..7ee552a 100644 --- a/docs/build/html/modules.html +++ b/docs/build/html/modules.html @@ -7,7 +7,7 @@ - pyETT — pyETT 0.2.4 documentation + pyETT — pyETT 0.2.5 documentation diff --git a/docs/build/html/py-modindex.html b/docs/build/html/py-modindex.html index 4cb877d..c3a0474 100644 --- a/docs/build/html/py-modindex.html +++ b/docs/build/html/py-modindex.html @@ -7,7 +7,7 @@ - Python Module Index — pyETT 0.2.4 documentation + Python Module Index — pyETT 0.2.5 documentation diff --git a/docs/build/html/pyETT.html b/docs/build/html/pyETT.html index 6e2a466..d66847f 100644 --- a/docs/build/html/pyETT.html +++ b/docs/build/html/pyETT.html @@ -7,7 +7,7 @@ - pyETT package — pyETT 0.2.4 documentation + pyETT package — pyETT 0.2.5 documentation @@ -258,7 +258,7 @@

Submodules
-get_leaderboard(num_players=10) → List[pyETT.ett.Player][source]
+get_leaderboard(num_players: int = 10) → List[pyETT.ett.Player][source]

Returns a list of players from the leaderboard.

Parameters
diff --git a/docs/build/html/pyETT_demo.html b/docs/build/html/pyETT_demo.html index 46978f9..b12fa73 100644 --- a/docs/build/html/pyETT_demo.html +++ b/docs/build/html/pyETT_demo.html @@ -7,7 +7,7 @@ - Getting Started — pyETT 0.2.4 documentation + Getting Started — pyETT 0.2.5 documentation diff --git a/docs/build/html/search.html b/docs/build/html/search.html index 56b6c8e..41129b4 100644 --- a/docs/build/html/search.html +++ b/docs/build/html/search.html @@ -7,7 +7,7 @@ - Search — pyETT 0.2.4 documentation + Search — pyETT 0.2.5 documentation diff --git a/docs/source/conf.py b/docs/source/conf.py index 194b2a2..ad8b230 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -23,7 +23,7 @@ author = "Tharsis T. P. Souza" # The full version, including alpha/beta/rc tags -release = "0.2.4" +release = "0.2.5" # -- General configuration --------------------------------------------------- diff --git a/pyETT/ett.py b/pyETT/ett.py index 7bb6c3c..d46c479 100644 --- a/pyETT/ett.py +++ b/pyETT/ett.py @@ -187,6 +187,9 @@ def __init__(self, match_id, match): self.home_score = match["home-score"] self.away_score = match["away-score"] self.elo_change = match["elo-change"] + self.home_elo_avg = match["home-elo-avg"] + self.away_elo_avg = match["away-elo-avg"] + home_player_index = 0 if match["players"][0]["team"] == Player.HOME else 1 self.home_player = Player( @@ -275,7 +278,7 @@ def user_search_dataframe( ] ).dropna(how="all", axis="columns") - def get_leaderboard(self, num_players=10) -> List[Player]: + def get_leaderboard(self, num_players: int = 10) -> List[Player]: """Returns a list of players from the leaderboard. Args: diff --git a/pyETT/ett_parser.py b/pyETT/ett_parser.py index 114c62c..762a79d 100644 --- a/pyETT/ett_parser.py +++ b/pyETT/ett_parser.py @@ -6,6 +6,7 @@ import sys import aiohttp import asyncio +import urllib.parse import pandas as pd import nest_asyncio # type: ignore @@ -137,6 +138,8 @@ def request_matchup(user_id1, user_id2): for match_data in res: match = match_data["attributes"] + match["home-elo-avg"] = match.pop("home-elo") + match["away-elo-avg"] = match.pop("away-elo") match["winning-team"] = match.pop("winner") match["losing-team"] = 1 - match["winning-team"] @@ -213,6 +216,7 @@ def request_leaderboard_official_tournament(): def user_search(username) -> List: + username = urllib.parse.quote(username) async def request_user(session, url): async with session.get(url) as resp: user_page = await resp.json() diff --git a/setup.py b/setup.py index cccc606..294a765 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name="pyETT", - version="0.2.4", + version="0.2.5", description="Python library for Eleven VR Table Tennis data", long_description=readme, long_description_content_type="text/markdown",