Skip to content

Commit e3848b0

Browse files
Zac-HDZac-HD
authored
Merge pull request #3717 from Zac-HD/with-urlopen
2 parents c7a85b8 + 24c71a6 commit e3848b0

File tree

13 files changed

+93
-100
lines changed

13 files changed

+93
-100
lines changed

‎hypothesis-python/RELEASE.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
RELEASE_TYPE: patch
2+
3+
This patch ensures that we always close the download connection in
4+
:class:`~hypothesis.database.GitHubArtifactDatabase`.

‎hypothesis-python/src/hypothesis/database.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,11 +561,11 @@ def _get_bytes(self, url: str) -> Optional[bytes]: # pragma: no cover
561561
"Authorization": f"Bearer {self.token}",
562562
},
563563
)
564+
warning_message = None
564565
response_bytes: Optional[bytes] = None
565566
try:
566-
response = urlopen(request)
567-
response_bytes = response.read()
568-
warning_message = None
567+
with urlopen(request) as response:
568+
response_bytes = response.read()
569569
except HTTPError as e:
570570
if e.code == 401:
571571
warning_message = (

‎hypothesis-python/src/hypothesis/extra/_array_helpers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@ def broadcastable_shapes(
275275
# We are unsure if gufuncs allow frozen dimensions to be optional, but it's
276276
# easy enough to support here - and so we will unless we learn otherwise.
277277
_DIMENSION = r"\w+\??" # Note that \w permits digits too!
278-
_SHAPE = r"\((?:{0}(?:,{0})".format(_DIMENSION) + r"{0,31})?\)"
279-
_ARGUMENT_LIST = "{0}(?:,{0})*".format(_SHAPE)
278+
_SHAPE = rf"\((?:{_DIMENSION}(?:,{_DIMENSION})" + r"{0,31})?\)"
279+
_ARGUMENT_LIST = f"{_SHAPE}(?:,{_SHAPE})*"
280280
_SIGNATURE = rf"^{_ARGUMENT_LIST}->{_SHAPE}$"
281-
_SIGNATURE_MULTIPLE_OUTPUT = r"^{0}->{0}$".format(_ARGUMENT_LIST)
281+
_SIGNATURE_MULTIPLE_OUTPUT = rf"^{_ARGUMENT_LIST}->{_ARGUMENT_LIST}$"
282282

283283

284284
class _GUfuncSig(NamedTuple):

‎hypothesis-python/src/hypothesis/stateful.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,9 @@ class StateMachineMeta(type):
220220
def __setattr__(cls, name, value):
221221
if name == "settings" and isinstance(value, Settings):
222222
raise AttributeError(
223-
(
224-
"Assigning {cls}.settings = {value} does nothing. Assign "
225-
"to {cls}.TestCase.settings, or use @{value} as a decorator "
226-
"on the {cls} class."
227-
).format(cls=cls.__name__, value=value)
223+
f"Assigning {cls.__name__}.settings = {value} does nothing. Assign "
224+
f"to {cls.__name__}.TestCase.settings, or use @{value} as a decorator "
225+
f"on the {cls.__name__} class."
228226
)
229227
return super().__setattr__(name, value)
230228

@@ -908,10 +906,7 @@ def __init__(self, machine):
908906
)
909907

910908
def __repr__(self):
911-
return "{}(machine={}({{...}}))".format(
912-
self.__class__.__name__,
913-
self.machine.__class__.__name__,
914-
)
909+
return f"{self.__class__.__name__}(machine={self.machine.__class__.__name__}({{...}}))"
915910

916911
def do_draw(self, data):
917912
if not any(self.is_valid(rule) for rule in self.rules):

‎hypothesis-python/src/hypothesis/strategies/_internal/flatmapped.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ def calc_is_empty(self, recur):
2323

2424
def __repr__(self):
2525
if not hasattr(self, "_cached_repr"):
26-
self._cached_repr = "{!r}.flatmap({})".format(
27-
self.flatmapped_strategy,
28-
get_pretty_function_description(self.expand),
29-
)
26+
self._cached_repr = f"{self.flatmapped_strategy!r}.flatmap({get_pretty_function_description(self.expand)})"
3027
return self._cached_repr
3128

3229
def do_draw(self, data):

‎hypothesis-python/src/hypothesis/strategies/_internal/strategies.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,10 +810,7 @@ def calc_is_cacheable(self, recur):
810810

811811
def __repr__(self):
812812
if not hasattr(self, "_cached_repr"):
813-
self._cached_repr = "{!r}.map({})".format(
814-
self.mapped_strategy,
815-
get_pretty_function_description(self.pack),
816-
)
813+
self._cached_repr = f"{self.mapped_strategy!r}.map({get_pretty_function_description(self.pack)})"
817814
return self._cached_repr
818815

819816
def do_validate(self):

‎hypothesis-python/src/hypothesis/vendor/tlds-alpha-by-domain.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version 2023062400, Last Updated Sat Jun 24 07:07:01 2023 UTC
1+
# Version 2023081200, Last Updated Sat Aug 12 07:07:01 2023 UTC
22
AAA
33
AARP
44
ABB
@@ -558,7 +558,6 @@ HOSPITAL
558558
HOST
559559
HOSTING
560560
HOT
561-
HOTELES
562561
HOTELS
563562
HOTMAIL
564563
HOUSE
@@ -803,7 +802,6 @@ MTR
803802
MU
804803
MUSEUM
805804
MUSIC
806-
MUTUAL
807805
MV
808806
MW
809807
MX
@@ -844,7 +842,6 @@ NISSAY
844842
NL
845843
NO
846844
NOKIA
847-
NORTHWESTERNMUTUAL
848845
NORTON
849846
NOW
850847
NOWRUZ
@@ -890,7 +887,6 @@ PARS
890887
PARTNERS
891888
PARTS
892889
PARTY
893-
PASSAGENS
894890
PAY
895891
PCCW
896892
PE
@@ -1162,7 +1158,6 @@ THEATRE
11621158
TIAA
11631159
TICKETS
11641160
TIENDA
1165-
TIFFANY
11661161
TIPS
11671162
TIRES
11681163
TIROL
@@ -1253,7 +1248,6 @@ VOTING
12531248
VOTO
12541249
VOYAGE
12551250
VU
1256-
VUELOS
12571251
WALES
12581252
WALMART
12591253
WALTER

‎hypothesis-python/tests/common/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def run():
4848
v = getattr(x, s.name)
4949
# Check if it has a dynamically defined default and if so skip comparison.
5050
if getattr(settings, s.name).show_default:
51-
assert v == s.default, "({!r} == x.{}) != (s.{} == {!r})".format(
52-
v, s.name, s.name, s.default
53-
)
51+
assert (
52+
v == s.default
53+
), f"({v!r} == x.{s.name}) != (s.{s.name} == {s.default!r})"
5454

5555
settings.register_profile(
5656
"default",

‎hypothesis-python/tests/numpy/test_floor_ceil.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ def test_our_floor_and_ceil_avoid_numpy_rounding(value):
4141
f = floor(a)
4242
c = ceil(a)
4343

44-
assert type(f) == int
45-
assert type(c) == int
44+
# Check *exact* type - we don't want to allow a subclass of int here
45+
assert type(f) == int # noqa
46+
assert type(c) == int # noqa
4647

4748
# Using math.floor or math.ceil for these values would give an incorrect result.
4849
with warnings.catch_warnings():

‎requirements/coverage.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
#
55
# ./build.sh upgrade-requirements
66
#
7-
async-timeout==4.0.2
7+
async-timeout==4.0.3
88
# via redis
99
attrs==23.1.0
1010
# via hypothesis (hypothesis-python/setup.py)
1111
black @ git+https://github.com/psf/black.git@eedfc3832290b3a32825b3c0f2dfa3f3d7ee9d1c
1212
# via -r requirements/coverage.in
13-
click==8.1.4
13+
click==8.1.6
1414
# via
1515
# -r requirements/coverage.in
1616
# black
17-
coverage==7.2.7
17+
coverage==7.3.0
1818
# via -r requirements/coverage.in
1919
dpcontracts==0.6.0
2020
# via -r requirements/coverage.in
2121
exceptiongroup==1.1.2 ; python_version < "3.11"
2222
# via
2323
# hypothesis (hypothesis-python/setup.py)
2424
# pytest
25-
execnet==2.0.0
25+
execnet==2.0.2
2626
# via pytest-xdist
27-
fakeredis==2.16.0
27+
fakeredis==2.17.0
2828
# via -r requirements/coverage.in
2929
iniconfig==2.0.0
3030
# via pytest
31-
lark==1.1.5
31+
lark==1.1.7
3232
# via -r requirements/coverage.in
3333
libcst==1.0.1
3434
# via -r requirements/coverage.in
3535
mypy-extensions==1.0.0
3636
# via
3737
# black
3838
# typing-inspect
39-
numpy==1.25.0
39+
numpy==1.25.2
4040
# via
4141
# -r requirements/coverage.in
4242
# pandas
@@ -46,11 +46,11 @@ packaging==23.1
4646
# pytest
4747
pandas==2.0.3
4848
# via -r requirements/coverage.in
49-
pathspec==0.11.1
49+
pathspec==0.11.2
5050
# via black
5151
pexpect==4.8.0
5252
# via -r requirements/test.in
53-
platformdirs==3.8.1
53+
platformdirs==3.10.0
5454
# via black
5555
pluggy==1.2.0
5656
# via pytest
@@ -70,7 +70,7 @@ pytz==2023.3
7070
# via
7171
# -r requirements/coverage.in
7272
# pandas
73-
pyyaml==6.0
73+
pyyaml==6.0.1
7474
# via libcst
7575
redis==4.6.0
7676
# via fakeredis

‎requirements/fuzzing.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
ansi2html==1.8.0
88
# via dash
9-
async-timeout==4.0.2
9+
async-timeout==4.0.3
1010
# via redis
1111
attrs==23.1.0
1212
# via
@@ -17,17 +17,17 @@ black @ git+https://github.com/psf/black.git@eedfc3832290b3a32825b3c0f2dfa3f3d7e
1717
# -r requirements/coverage.in
1818
# hypofuzz
1919
# hypothesis
20-
certifi==2023.5.7
20+
certifi==2023.7.22
2121
# via requests
2222
charset-normalizer==3.2.0
2323
# via requests
24-
click==8.1.4
24+
click==8.1.6
2525
# via
2626
# -r requirements/coverage.in
2727
# black
2828
# flask
2929
# hypothesis
30-
coverage==7.2.7
30+
coverage==7.3.0
3131
# via
3232
# -r requirements/coverage.in
3333
# hypofuzz
@@ -46,15 +46,15 @@ exceptiongroup==1.1.2 ; python_version < "3.11"
4646
# hypothesis
4747
# hypothesis (hypothesis-python/setup.py)
4848
# pytest
49-
execnet==2.0.0
49+
execnet==2.0.2
5050
# via pytest-xdist
51-
fakeredis==2.16.0
51+
fakeredis==2.17.0
5252
# via -r requirements/coverage.in
5353
flask==2.2.5
5454
# via dash
5555
git+https://github.com/Zac-HD/hypofuzz.git
5656
# via -r requirements/fuzzing.in
57-
hypothesis[cli]==6.80.1
57+
hypothesis[cli]==6.82.3
5858
# via hypofuzz
5959
idna==3.4
6060
# via requests
@@ -64,7 +64,7 @@ itsdangerous==2.1.2
6464
# via flask
6565
jinja2==3.1.2
6666
# via flask
67-
lark==1.1.5
67+
lark==1.1.7
6868
# via -r requirements/coverage.in
6969
libcst==1.0.1
7070
# via
@@ -82,9 +82,9 @@ mypy-extensions==1.0.0
8282
# via
8383
# black
8484
# typing-inspect
85-
nest-asyncio==1.5.6
85+
nest-asyncio==1.5.7
8686
# via dash
87-
numpy==1.25.0
87+
numpy==1.25.2
8888
# via
8989
# -r requirements/coverage.in
9090
# pandas
@@ -97,21 +97,21 @@ pandas==2.0.3
9797
# via
9898
# -r requirements/coverage.in
9999
# hypofuzz
100-
pathspec==0.11.1
100+
pathspec==0.11.2
101101
# via black
102102
pexpect==4.8.0
103103
# via -r requirements/test.in
104-
platformdirs==3.8.1
104+
platformdirs==3.10.0
105105
# via black
106-
plotly==5.15.0
106+
plotly==5.16.0
107107
# via dash
108108
pluggy==1.2.0
109109
# via pytest
110110
psutil==5.9.5
111111
# via hypofuzz
112112
ptyprocess==0.7.0
113113
# via pexpect
114-
pygments==2.15.1
114+
pygments==2.16.1
115115
# via rich
116116
pytest==7.4.0
117117
# via
@@ -128,7 +128,7 @@ pytz==2023.3
128128
# via
129129
# -r requirements/coverage.in
130130
# pandas
131-
pyyaml==6.0
131+
pyyaml==6.0.1
132132
# via libcst
133133
redis==4.6.0
134134
# via fakeredis
@@ -138,7 +138,7 @@ requests==2.31.0
138138
# hypofuzz
139139
retrying==1.3.4
140140
# via dash
141-
rich==13.4.2
141+
rich==13.5.2
142142
# via hypothesis
143143
six==1.16.0
144144
# via
@@ -165,7 +165,7 @@ typing-inspect==0.9.0
165165
# via libcst
166166
tzdata==2023.3
167167
# via pandas
168-
urllib3==2.0.3
168+
urllib3==2.0.4
169169
# via requests
170170
werkzeug==2.2.3
171171
# via

‎requirements/test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exceptiongroup==1.1.2 ; python_version < "3.11"
1010
# via
1111
# hypothesis (hypothesis-python/setup.py)
1212
# pytest
13-
execnet==2.0.0
13+
execnet==2.0.2
1414
# via pytest-xdist
1515
iniconfig==2.0.0
1616
# via pytest

0 commit comments

Comments
 (0)