File tree 5 files changed +9
-12
lines changed
Filter options
5 files changed +9
-12
lines changed
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ def normalize_path(path):
31
31
str_path = str (path )
32
32
parent , file_name = os .path .split (str_path )
33
33
if parent :
34
- raise ValueError ('{ !r} must be only a file name'. format ( path ) )
34
+ raise ValueError (f' { path !r} must be only a file name' )
35
35
return file_name
36
36
37
37
@@ -65,7 +65,7 @@ def get_package(package):
65
65
"""
66
66
resolved = resolve (package )
67
67
if wrap_spec (resolved ).submodule_search_locations is None :
68
- raise TypeError ('{ !r} is not a package'. format ( package ) )
68
+ raise TypeError (f' { package !r} is not a package' )
69
69
return resolved
70
70
71
71
Original file line number Diff line number Diff line change @@ -94,16 +94,15 @@ def joinpath(self, child):
94
94
__truediv__ = joinpath
95
95
96
96
def open (self , * args , ** kwargs ):
97
- raise FileNotFoundError ('{ } is not a file'. format ( self ) )
97
+ raise FileNotFoundError (f' { self } is not a file' )
98
98
99
99
@property
100
100
def name (self ):
101
101
return self ._paths [0 ].name
102
102
103
103
def __repr__ (self ):
104
- return 'MultiplexedPath({})' .format (
105
- ', ' .join ("'{}'" .format (path ) for path in self ._paths )
106
- )
104
+ paths = ', ' .join (f"'{ path } '" for path in self ._paths )
105
+ return f'MultiplexedPath({ paths } )'
107
106
108
107
109
108
class NamespaceReader (abc .TraversableResources ):
Original file line number Diff line number Diff line change @@ -68,9 +68,7 @@ def open_binary(package: Package, resource: Resource) -> BinaryIO:
68
68
if data is not None :
69
69
return BytesIO (data )
70
70
71
- raise FileNotFoundError (
72
- '{!r} resource not found in {!r}' .format (resource , spec .name )
73
- )
71
+ raise FileNotFoundError (f'{ resource !r} resource not found in { spec .name !r} ' )
74
72
75
73
76
74
def open_text (
Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ def test_join_path(self):
79
79
def test_repr (self ):
80
80
self .assertEqual (
81
81
repr (MultiplexedPath (self .folder )),
82
- "MultiplexedPath('{}')" . format ( self .folder ) ,
82
+ f "MultiplexedPath('{ self .folder } ')" ,
83
83
)
84
84
85
85
def test_name (self ):
@@ -121,7 +121,7 @@ def test_files(self):
121
121
reader = NamespaceReader (namespacedata01 .__spec__ .submodule_search_locations )
122
122
root = os .path .abspath (os .path .join (__file__ , '..' , 'namespacedata01' ))
123
123
self .assertIsInstance (reader .files (), MultiplexedPath )
124
- self .assertEqual (repr (reader .files ()), "MultiplexedPath('{}')" . format ( root ) )
124
+ self .assertEqual (repr (reader .files ()), f "MultiplexedPath('{ root } ')" )
125
125
126
126
127
127
if __name__ == '__main__' :
Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ def setUp(self):
152
152
data_path = pathlib .Path (self .ZIP_MODULE .__file__ )
153
153
data_dir = data_path .parent
154
154
self .source_zip_path = data_dir / 'ziptestdata.zip'
155
- self .zip_path = pathlib .Path ('{}.zip' . format ( uuid .uuid4 ()) ).absolute ()
155
+ self .zip_path = pathlib .Path (f' { uuid .uuid4 ()} .zip' ).absolute ()
156
156
self .zip_path .write_bytes (self .source_zip_path .read_bytes ())
157
157
sys .path .append (str (self .zip_path ))
158
158
self .data = import_module ('ziptestdata' )
You can’t perform that action at this time.
0 commit comments