@@ -55,7 +55,7 @@ def _get_pandoc_urls(version="latest"):
5555 raise RuntimeError ("Invalid pandoc version {}." .format (version ))
5656 return
5757 # read the HTML content
58- response = urlopen ("https://github.com/jgm/pandoc/releases/expanded_assets/" + version )
58+ response = urlopen (f "https://github.com/jgm/pandoc/releases/expanded_assets/{ version } " )
5959 content = response .read ()
6060 # regex for the binaries
6161 uname = platform .uname ()[4 ]
@@ -73,19 +73,19 @@ def _get_pandoc_urls(version="latest"):
7373 }
7474 # parse pandoc_urls from list to dict
7575 # py26 don't like dict comprehension. Use this one instead when py26 support is dropped
76- pandoc_urls = {ext2platform [url_frag [- 3 :]]: ("https://github.com" + url_frag ) for url_frag in pandoc_urls_list }
76+ pandoc_urls = {ext2platform [url_frag [- 3 :]]: (f "https://github.com{ url_frag } " ) for url_frag in pandoc_urls_list }
7777 return pandoc_urls , version
7878
7979
8080def _make_executable (path ):
8181 mode = os .stat (path ).st_mode
8282 mode |= (mode & 0o444 ) >> 2 # copy R bits to X
83- logger .info ("Making %s executeable..." % ( path ) )
83+ logger .info (f "Making { path } executeable..." )
8484 os .chmod (path , mode )
8585
8686
8787def _handle_linux (filename , targetfolder ):
88- logger .info ("Unpacking %s to tempfolder..." % ( filename ) )
88+ logger .info (f "Unpacking { filename } to tempfolder..." )
8989
9090 tempfolder = tempfile .mkdtemp ()
9191 cur_wd = os .getcwd ()
@@ -103,29 +103,29 @@ def _handle_linux(filename, targetfolder):
103103 exe = "pandoc"
104104 src = os .path .join (tempfolder , "usr" , "bin" , exe )
105105 dst = os .path .join (targetfolder , exe )
106- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
106+ logger .info (f "Copying { exe } to { targetfolder } ..." )
107107 shutil .copyfile (src , dst )
108108 _make_executable (dst )
109109 exe = "pandoc-citeproc"
110110 src = os .path .join (tempfolder , "usr" , "bin" , exe )
111111 dst = os .path .join (targetfolder , exe )
112- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
112+ logger .info (f "Copying { exe } to { targetfolder } ..." )
113113 try :
114114 shutil .copyfile (src , dst )
115115 _make_executable (dst )
116116 except FileNotFoundError :
117117 logger .exception ("Didn't copy pandoc-citeproc" )
118118 src = os .path .join (tempfolder , "usr" , "share" , "doc" , "pandoc" , "copyright" )
119119 dst = os .path .join (targetfolder , "copyright.pandoc" )
120- logger .info ("Copying copyright to %s ..." % ( targetfolder ) )
120+ logger .info (f "Copying copyright to { targetfolder } ..." )
121121 shutil .copyfile (src , dst )
122122 finally :
123123 os .chdir (cur_wd )
124124 shutil .rmtree (tempfolder )
125125
126126
127127def _handle_darwin (filename , targetfolder ):
128- logger .info ("Unpacking %s to tempfolder..." % ( filename ) )
128+ logger .info (f "Unpacking { filename } to tempfolder..." )
129129
130130 tempfolder = tempfile .mkdtemp ()
131131
@@ -144,14 +144,14 @@ def _handle_darwin(filename, targetfolder):
144144 exe = "pandoc"
145145 src = os .path .join (pkgutilfolder , "usr" , "local" , "bin" , exe )
146146 dst = os .path .join (targetfolder , exe )
147- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
147+ logger .info (f "Copying { exe } to { targetfolder } ..." )
148148 shutil .copyfile (src , dst )
149149 _make_executable (dst )
150150
151151 exe = "pandoc-citeproc"
152152 src = os .path .join (pkgutilfolder , "usr" , "local" , "bin" , exe )
153153 dst = os .path .join (targetfolder , exe )
154- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
154+ logger .info (f "Copying { exe } to { targetfolder } ..." )
155155 try :
156156 shutil .copyfile (src , dst )
157157 _make_executable (dst )
@@ -164,7 +164,7 @@ def _handle_darwin(filename, targetfolder):
164164
165165
166166def _handle_win32 (filename , targetfolder ):
167- logger .info ("Unpacking %s to tempfolder..." % ( filename ) )
167+ logger .info (f "Unpacking { filename } to tempfolder..." )
168168
169169 tempfolder = tempfile .mkdtemp ()
170170
@@ -177,13 +177,13 @@ def _handle_win32(filename, targetfolder):
177177 exe = "pandoc.exe"
178178 src = os .path .join (tempfolder , "Pandoc" , exe )
179179 dst = os .path .join (targetfolder , exe )
180- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
180+ logger .info (f "Copying { exe } to { targetfolder } ..." )
181181 shutil .copyfile (src , dst )
182182
183183 exe = "pandoc-citeproc.exe"
184184 src = os .path .join (tempfolder , "Pandoc" , exe )
185185 dst = os .path .join (targetfolder , exe )
186- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
186+ logger .info (f "Copying { exe } to { targetfolder } ..." )
187187 try :
188188 shutil .copyfile (src , dst )
189189 except FileNotFoundError :
@@ -192,7 +192,7 @@ def _handle_win32(filename, targetfolder):
192192 exe = "COPYRIGHT.txt"
193193 src = os .path .join (tempfolder , "Pandoc" , exe )
194194 dst = os .path .join (targetfolder , exe )
195- logger .info ("Copying %s to %s ..." % ( exe , targetfolder ) )
195+ logger .info (f "Copying { exe } to { targetfolder } ..." )
196196 shutil .copyfile (src , dst )
197197
198198 # remove temporary dir
@@ -250,9 +250,9 @@ def download_pandoc(url:Union[str, None]=None,
250250 filename = os .path .join (os .path .expanduser (download_folder ), filename )
251251
252252 if os .path .isfile (filename ):
253- logger .info ("Using already downloaded file %s" % ( filename ) )
253+ logger .info (f "Using already downloaded file { filename } " )
254254 else :
255- logger .info ("Downloading pandoc from %s ..." % url )
255+ logger .info (f "Downloading pandoc from { url } ..." )
256256 # https://stackoverflow.com/questions/30627937/tracebaclk-attributeerroraddinfourl-instance-has-no-attribute-exit
257257 response = urlopen (url )
258258 with open (filename , 'wb' ) as out_file :
0 commit comments