opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix convert_newlines and sep2tabs to return '0' lines in the event of an empty file, instead of blowing up.

Browse Source
This commit is contained in:
Dannon Baker
2012-08-13 12:59:17 -04:00
parent 11349f28b5
commit e0d6ddc0e0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/sniff.py
+8 -6
View File
@@ -91,15 +91,16 @@ def convert_newlines( fname, in_place=True ):
"""
fd, temp_name = tempfile.mkstemp()
fp = os.fdopen( fd, "wt" )
for i, line in enumerate( file( fname, "U" ) ):
i = 0
for i, line in enumerate( file( fname, "U" ), 1 ):
fp.write( "%s\n" % line.rstrip( "\r\n" ) )
fp.close()
if in_place:
shutil.move( temp_name, fname )
# Return number of lines in file.
return ( i + 1, None )
return ( i, None )
else:
return ( i + 1, temp_name )
return ( i, temp_name )
def sep2tabs( fname, in_place=True, patt="\\s+" ):
"""
@@ -115,7 +116,8 @@ def sep2tabs( fname, in_place=True, patt="\\s+" ):
regexp = re.compile( patt )
fd, temp_name = tempfile.mkstemp()
fp = os.fdopen( fd, "wt" )
for i, line in enumerate( file( fname ) ):
i = 0
for i, line in enumerate( file( fname ), 1):
line = line.rstrip( '\r\n' )
elems = regexp.split( line )
fp.write( "%s\n" % '\t'.join( elems ) )
@@ -123,9 +125,9 @@ def sep2tabs( fname, in_place=True, patt="\\s+" ):
if in_place:
shutil.move( temp_name, fname )
# Return number of lines in file.
return ( i + 1, None )
return ( i, None )
else:
return ( i + 1, temp_name )
return ( i, temp_name )
def convert_newlines_sep2tabs( fname, in_place=True, patt="\\s+" ):
"""