Skip to content

Commit e84d671

Browse files
committed
Quotation cleanups
Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu>
1 parent ff9ef51 commit e84d671

9 files changed

Lines changed: 38 additions & 38 deletions

File tree

.github/maintainer/mkmaintainer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
'labels': ','.join(info.get('labels', [])),
2424
}
2525
)
26-
url = f"https://github.com/{info['repo']}/issues/new?{args}"
27-
fh.write(f"- [{info['link-text']}]({url})\n")
26+
url = f'https://github.com/{info["repo"]}/issues/new?{args}'
27+
fh.write(f'- [{info["link-text"]}]({url})\n')

examples/deepzoom/deepzoom_tile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def _tile_done(self) -> None:
231231
count, total = self._processed, self._dz.tile_count
232232
if count % 100 == 0 or count == total:
233233
print(
234-
"Tiling %s: wrote %d/%d tiles"
234+
'Tiling %s: wrote %d/%d tiles'
235235
% (self._associated or 'slide', count, total),
236236
end='\r',
237237
file=sys.stderr,

openslide/__init__.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,9 @@ def read_region(
457457
if self._image is None:
458458
raise ValueError('Cannot read from a closed slide')
459459
if level != 0:
460-
raise OpenSlideError("Invalid level")
460+
raise OpenSlideError('Invalid level')
461461
if ['fail' for s in size if s < 0]:
462-
raise OpenSlideError(f"Size {size} must be non-negative")
462+
raise OpenSlideError(f'Size {size} must be non-negative')
463463
# Any corner of the requested region may be outside the bounds of
464464
# the image. Create a transparent tile of the correct size and
465465
# paste the valid part of the region into the correct location.
@@ -470,7 +470,7 @@ def read_region(
470470
max(0, min(l + s - 1, limit - 1))
471471
for l, s, limit in zip(location, size, self._image.size)
472472
]
473-
tile = Image.new("RGBA", size, (0,) * 4)
473+
tile = Image.new('RGBA', size, (0,) * 4)
474474
if not [
475475
'fail' for tl, br in zip(image_topleft, image_bottomright) if br - tl < 0
476476
]: # "< 0" not a typo
@@ -500,12 +500,12 @@ def open_slide(filename: lowlevel.Filename) -> OpenSlide | ImageSlide:
500500
if __name__ == '__main__':
501501
import sys
502502

503-
print("OpenSlide vendor:", OpenSlide.detect_format(sys.argv[1]))
504-
print("PIL format:", ImageSlide.detect_format(sys.argv[1]))
503+
print('OpenSlide vendor:', OpenSlide.detect_format(sys.argv[1]))
504+
print('PIL format:', ImageSlide.detect_format(sys.argv[1]))
505505
with open_slide(sys.argv[1]) as _slide:
506-
print("Dimensions:", _slide.dimensions)
507-
print("Levels:", _slide.level_count)
508-
print("Level dimensions:", _slide.level_dimensions)
509-
print("Level downsamples:", _slide.level_downsamples)
510-
print("Properties:", _slide.properties)
511-
print("Associated images:", _slide.associated_images)
506+
print('Dimensions:', _slide.dimensions)
507+
print('Levels:', _slide.level_count)
508+
print('Level dimensions:', _slide.level_dimensions)
509+
print('Level downsamples:', _slide.level_downsamples)
510+
print('Properties:', _slide.properties)
511+
print('Associated images:', _slide.associated_images)

openslide/deepzoom.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ def _get_tile_info(
208208
) -> tuple[tuple[tuple[int, int], int, tuple[int, int]], tuple[int, int]]:
209209
# Check parameters
210210
if dz_level < 0 or dz_level >= self._dz_levels:
211-
raise ValueError("Invalid level")
211+
raise ValueError('Invalid level')
212212
for t, t_lim in zip(t_location, self._t_dimensions[dz_level]):
213213
if t < 0 or t >= t_lim:
214-
raise ValueError("Invalid address")
214+
raise ValueError('Invalid address')
215215

216216
# Get preferred slide level
217217
slide_level = self._slide_from_dz_level[dz_level]

openslide/lowlevel.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ def try_load(names: list[str]) -> CDLL:
8989
except FileNotFoundError as exc:
9090
raise ModuleNotFoundError(
9191
"Couldn't locate OpenSlide DLL. "
92-
"Try `pip install openslide-bin`, "
92+
'Try `pip install openslide-bin`, '
9393
"or if you're using an OpenSlide binary package, "
9494
"ensure you've called os.add_dll_directory(). "
95-
"https://openslide.org/api/python/#installing"
95+
'https://openslide.org/api/python/#installing'
9696
) from exc
9797
elif platform.system() == 'Darwin':
9898
try:
@@ -107,8 +107,8 @@ def try_load(names: list[str]) -> CDLL:
107107
if lib is None:
108108
raise ModuleNotFoundError(
109109
"Couldn't locate OpenSlide dylib. "
110-
"Try `pip install openslide-bin`. "
111-
"https://openslide.org/api/python/#installing"
110+
'Try `pip install openslide-bin`. '
111+
'https://openslide.org/api/python/#installing'
112112
) from exc
113113
return cdll.LoadLibrary(lib)
114114
else:
@@ -117,8 +117,8 @@ def try_load(names: list[str]) -> CDLL:
117117
except OSError as exc:
118118
raise ModuleNotFoundError(
119119
"Couldn't locate OpenSlide shared library. "
120-
"Try `pip install openslide-bin`. "
121-
"https://openslide.org/api/python/#installing"
120+
'Try `pip install openslide-bin`. '
121+
'https://openslide.org/api/python/#installing'
122122
) from exc
123123

124124

@@ -170,11 +170,11 @@ def invalidate(self) -> None:
170170
@classmethod
171171
def from_param(cls, obj: _OpenSlide) -> _OpenSlide:
172172
if obj.__class__ != cls:
173-
raise ValueError("Not an OpenSlide reference")
173+
raise ValueError('Not an OpenSlide reference')
174174
if not obj._as_parameter_:
175-
raise ValueError("Passing undefined slide object")
175+
raise ValueError('Passing undefined slide object')
176176
if not obj._valid:
177-
raise ValueError("Passing closed slide object")
177+
raise ValueError('Passing closed slide object')
178178
return obj
179179

180180

@@ -193,9 +193,9 @@ def __del__(self) -> None:
193193
@classmethod
194194
def from_param(cls, obj: _OpenSlideCache) -> _OpenSlideCache:
195195
if obj.__class__ != cls:
196-
raise ValueError("Not an OpenSlide cache reference")
196+
raise ValueError('Not an OpenSlide cache reference')
197197
if not obj._as_parameter_:
198-
raise ValueError("Passing undefined cache object")
198+
raise ValueError('Passing undefined cache object')
199199
return obj
200200

201201

@@ -247,15 +247,15 @@ def from_param(cls, obj: int) -> c_size_t:
247247

248248

249249
def _load_image(buf: _Buffer, size: tuple[int, int]) -> Image.Image:
250-
'''buf must be a mutable buffer.'''
250+
"""buf must be a mutable buffer."""
251251
_convert.argb2rgba(buf)
252252
return Image.frombuffer('RGBA', size, buf, 'raw', 'RGBA', 0, 1)
253253

254254

255255
# check for errors opening an image file and wrap the resulting handle
256256
def _check_open(result: int | None, _func: Any, _args: Any) -> _OpenSlide:
257257
if result is None:
258-
raise OpenSlideUnsupportedFormatError("Unsupported or missing image file")
258+
raise OpenSlideUnsupportedFormatError('Unsupported or missing image file')
259259
slide = _OpenSlide(c_void_p(result))
260260
err = get_error(slide)
261261
if err is not None:
@@ -303,7 +303,7 @@ def _check_name_list(result: _Pointer[c_char_p], func: Any, args: Any) -> list[s
303303

304304

305305
class _FunctionUnavailable:
306-
'''Standin for a missing optional function. Fails when called.'''
306+
"""Standin for a missing optional function. Fails when called."""
307307

308308
def __init__(self, minimum_version: str):
309309
self._minimum_version = minimum_version
@@ -434,7 +434,7 @@ def read_region(
434434
# OpenSlide would catch this, but not before we tried to allocate
435435
# a negative-size buffer
436436
raise OpenSlideError(
437-
"negative width (%d) or negative height (%d) not allowed" % (w, h)
437+
'negative width (%d) or negative height (%d) not allowed' % (w, h)
438438
)
439439
if w == 0 or h == 0:
440440
# Image.frombuffer() would raise an exception

tests/test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_open_slide(self) -> None:
3434
self.assertTrue(isinstance(osr, ImageSlide))
3535

3636
def test_lowlevel_available(self) -> None:
37-
'''Ensure all exported functions have an 'available' attribute.'''
37+
"""Ensure all exported functions have an 'available' attribute."""
3838
for name in dir(lowlevel):
3939
attr = getattr(lowlevel, name)
4040
# ignore classes and unexported functions

tests/test_deepzoom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_get_tile(self) -> None:
8787

8888
def test_tile_color_profile(self) -> None:
8989
if self.CLASS is OpenSlide and not lowlevel.read_icc_profile.available:
90-
self.skipTest("requires OpenSlide 4.0.0")
90+
self.skipTest('requires OpenSlide 4.0.0')
9191
self.assertEqual(len(self.dz.get_tile(9, (1, 0)).info['icc_profile']), 588)
9292

9393
def test_get_tile_bad_level(self) -> None:

tests/test_imageslide.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def test_read_region_bad_size(self) -> None:
141141
def test_thumbnail(self) -> None:
142142
self.assertEqual(self.osr.get_thumbnail((100, 100)).size, (100, 83))
143143

144-
@unittest.skipUnless(lowlevel.cache_create.available, "requires OpenSlide 4.0.0")
144+
@unittest.skipUnless(lowlevel.cache_create.available, 'requires OpenSlide 4.0.0')
145145
def test_set_cache(self) -> None:
146146
self.osr.set_cache(OpenSlideCache(64 << 10))
147147
self.assertEqual(self.osr.read_region((0, 0), 0, (400, 400)).size, (400, 400))

tests/test_openslide.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
class TestCache(unittest.TestCase):
39-
@unittest.skipUnless(lowlevel.cache_create.available, "requires OpenSlide 4.0.0")
39+
@unittest.skipUnless(lowlevel.cache_create.available, 'requires OpenSlide 4.0.0')
4040
def test_create_cache(self) -> None:
4141
OpenSlideCache(0)
4242
OpenSlideCache(1)
@@ -153,7 +153,7 @@ def test_properties(self) -> None:
153153
)
154154

155155
@unittest.skipUnless(
156-
lowlevel.read_icc_profile.available, "requires OpenSlide 4.0.0"
156+
lowlevel.read_icc_profile.available, 'requires OpenSlide 4.0.0'
157157
)
158158
def test_color_profile(self) -> None:
159159
assert self.osr.color_profile is not None # for type inference
@@ -192,7 +192,7 @@ def _test_read_region_2GB(self) -> None:
192192
def test_thumbnail(self) -> None:
193193
self.assertEqual(self.osr.get_thumbnail((100, 100)).size, (100, 83))
194194

195-
@unittest.skipUnless(lowlevel.cache_create.available, "requires OpenSlide 4.0.0")
195+
@unittest.skipUnless(lowlevel.cache_create.available, 'requires OpenSlide 4.0.0')
196196
def test_set_cache(self) -> None:
197197
self.osr.set_cache(OpenSlideCache(64 << 10))
198198
self.assertEqual(self.osr.read_region((0, 0), 0, (400, 400)).size, (400, 400))
@@ -236,7 +236,7 @@ def test_color_profile(self) -> None:
236236
# Requires DICOM support in OpenSlide. Use associated image ICC support as
237237
# a proxy.
238238
@unittest.skipUnless(
239-
lowlevel.read_associated_image_icc_profile.available, "requires OpenSlide 4.0.0"
239+
lowlevel.read_associated_image_icc_profile.available, 'requires OpenSlide 4.0.0'
240240
)
241241
class TestDicomSlide(_Abstract.SlideTest):
242242
FILENAME = 'boxes_0.dcm'

0 commit comments

Comments
 (0)