1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/1cb94990d839/ changeset: r5370:1cb94990d839 user: jgoecks date: 2011-04-12 23:26:06 summary: Make changes in ddea56886275 compatible with python 2.4 affected #: 1 file (298 bytes) --- a/lib/galaxy/datatypes/util/gff_util.py Tue Apr 12 14:40:59 2011 -0400 +++ b/lib/galaxy/datatypes/util/gff_util.py Tue Apr 12 17:26:06 2011 -0400 @@ -149,8 +149,9 @@ self.seed_interval = GenomicIntervalReader.next( self ) except ParseError, e: handle_parse_error( e ) - finally: - raw_size += len( self.current_line ) + # TODO: When no longer supporting python 2.4 use finally: + #finally: + raw_size += len( self.current_line ) # If header or comment, clear seed interval and return it. if isinstance( self.seed_interval, ( Header, Comment ) ): @@ -170,16 +171,20 @@ while True: try: interval = GenomicIntervalReader.next( self ) + raw_size += len( self.current_line ) except StopIteration, e: # No more intervals to read, but last feature needs to be # returned. interval = None + raw_size += len( self.current_line ) break except ParseError, e: handle_parse_error( e ) + raw_size += len( self.current_line ) continue - finally: - raw_size += len( self.current_line ) + # TODO: When no longer supporting python 2.4 use finally: + #finally: + #raw_size += len( self.current_line ) # If interval not associated with feature, break. group = interval.attributes.get( 'group', None ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.