Fix zones1970.tab handling on Ruby 1.8.7.

On Ruby 1.8.7, calling String#split clears the Regexp global variables.

Also remove an unnecessary `|| []` in the assignment of :zones.

Author: philr

lib/tzinfo/data/tzdataparser.rb

@@ -311,7 +311,7 @@ def load_countries
               line.chomp!          
 
               if line =~ /^([A-Z]{2}(?:,[A-Z]{2})*)\t([^\t]+)\t([^\t]+)(\t(.*))?$/
-                codes = $1.split(',')
+                codes = $1
                 location_str = $2
                 zone_name = $3
                 description = $5
@@ -325,6 +325,8 @@ def load_countries
 
                 country_timezone = TZDataCountryTimezone.new(zone, description, location)
 
+                codes = codes.split(',')
+
                 (primary_zones[codes.first] ||= []) << country_timezone
 
                 codes[1..-1].each do |code|

test/tc_country_index.rb

@@ -13,7 +13,7 @@ def countries
         line.chomp!
 
         if line =~ /\A([A-Z]{2}(?:,[A-Z]{2})*)\t(?:([+\-])(\d{2})(\d{2})([+\-])(\d{3})(\d{2})|([+\-])(\d{2})(\d{2})(\d{2})([+\-])(\d{3})(\d{2})(\d{2}))\t([^\t]+)(?:\t([^\t]+))?\z/
-          codes = $1.split(',')
+          codes = $1
 
           if $2
             latitude = dms_to_rational($2, $3, $4)
@@ -27,6 +27,7 @@ def countries
           description = $17
 
           country_timezone = {:zone_identifier => zone_identifier, :latitude => latitude, :longitude => longitude, :description => description}
+          codes = codes.split(',')
 
           (primary_zones[codes.first] ||= []) << country_timezone
 
@@ -36,7 +37,7 @@ def countries
         end
       end
     end
-    
+
     countries = {}
 
     open_file(File.join(DATA_DIR, 'iso3166.tab'), 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
@@ -47,7 +48,7 @@ def countries
           code = $1
           name = $2
           zones = (primary_zones[code] || []) + (secondary_zones[code] || [])
-          countries[code] = {:name => name, :zones => zones || []}
+          countries[code] = {:name => name, :zones => zones}
         end
       end
     end