@@ -38,7 +38,7 @@ def _build_formatspecs_from_args(args):
3838
3939def _convert_or_fail (infile , outpath , formatspecs , checksum , compression , level ):
4040 try :
41- return N .convert_foreign_to_neo (infile , outpath , formatspecs = formatspecs ,
41+ return N .convert_foreign_to_alt (infile , outpath , formatspecs = formatspecs ,
4242 checksumtypes = (checksum , checksum , checksum ),
4343 compression = compression , compression_level = level )
4444 except RuntimeError as e :
@@ -147,12 +147,12 @@ def _maybe_archive_bytes():
147147 p .error ("--output is required for --create (use '-' to stream)" )
148148 out_bytes = (args .output == '-' )
149149 if out_bytes :
150- data = N .pack_neo (items , None , formatspecs = formatspecs ,
150+ data = N .pack_alt (items , None , formatspecs = formatspecs ,
151151 checksumtypes = (checksum , checksum , checksum ),
152152 compression = compression , compression_level = level )
153153 _stdout_bin ().write (data )
154154 else :
155- N .pack_neo (items , args .output , formatspecs = formatspecs ,
155+ N .pack_alt (items , args .output , formatspecs = formatspecs ,
156156 checksumtypes = (checksum , checksum , checksum ),
157157 compression = compression , compression_level = level )
158158 if args .verbose : sys .stderr .write ("created: %s\n " % args .output )
@@ -174,12 +174,12 @@ def _maybe_archive_bytes():
174174 if not args .output :
175175 p .error ("--output is required for --repack (use '-' to stream)" )
176176 if args .output == '-' :
177- data = N .repack_neo (src , None , formatspecs = formatspecs ,
177+ data = N .repack_alt (src , None , formatspecs = formatspecs ,
178178 checksumtypes = (checksum , checksum , checksum ),
179179 compression = compression , compression_level = level )
180180 _stdout_bin ().write (data )
181181 else :
182- N .repack_neo (src , args .output , formatspecs = formatspecs ,
182+ N .repack_alt (src , args .output , formatspecs = formatspecs ,
183183 checksumtypes = (checksum , checksum , checksum ),
184184 compression = compression , compression_level = level )
185185 if args .verbose : sys .stderr .write ("repacked: %s -> %s\n " % (('<stdin>' if infile0 == '-' else infile0 ), args .output ))
@@ -192,18 +192,18 @@ def _maybe_archive_bytes():
192192 pass
193193 if args .output == '-' :
194194 # stream TAR to stdout
195- arr = N .archive_to_array_neo (src , formatspecs = formatspecs , listonly = False ,
195+ arr = N .archive_to_array_alt (src , formatspecs = formatspecs , listonly = False ,
196196 skipchecksum = args .skipchecksum , uncompress = True )
197197 _emit_tar_stream_from_array (arr , _stdout_bin ())
198198 return 0
199199 outdir = args .output or "."
200- N .unpack_neo (src , outdir , formatspecs = formatspecs , skipchecksum = args .skipchecksum , uncompress = True )
200+ N .unpack_alt (src , outdir , formatspecs = formatspecs , skipchecksum = args .skipchecksum , uncompress = True )
201201 if args .verbose : sys .stderr .write ("extracted → %s\n " % outdir )
202202 return 0
203203
204204 if args .list :
205205 src = _maybe_archive_bytes () or infile0
206- names = N .archivefilelistfiles_neo (src , formatspecs = formatspecs , advanced = args .verbose , include_dirs = True )
206+ names = N .archivefilelistfiles_alt (src , formatspecs = formatspecs , advanced = args .verbose , include_dirs = True )
207207 if not args .verbose :
208208 for n in names : sys .stdout .write (n + "\n " )
209209 else :
@@ -215,7 +215,7 @@ def _maybe_archive_bytes():
215215
216216 if args .validate :
217217 src = _maybe_archive_bytes () or infile0
218- ok , details = N .archivefilevalidate_neo (src , formatspecs = formatspecs , verbose = args .verbose , return_details = True )
218+ ok , details = N .archivefilevalidate_alt (src , formatspecs = formatspecs , verbose = args .verbose , return_details = True )
219219 if not args .verbose :
220220 sys .stdout .write ("valid: %s\n " % ("yes" if ok else "no" ))
221221 else :
0 commit comments