merge from branch tom.brown.code-tempfile_kmlparser_utf8_fixes

* kmlparser was attempting to decode a unicode string
* close the fd returned by tempfile.mkstemp so windows can delete it when the test finishes

kmlparser.py

@@ -90,7 +90,7 @@ def ParsePlacemark(self, node):
   def ExtractText(self, node):
     for child in node.childNodes:
       if child.nodeType == child.TEXT_NODE:
-	return child.wholeText.decode('utf-8')
+        return child.wholeText  # is a unicode string
     return ""
 
   def ExtractCoordinates(self, node):

test/testtransitfeed.py

@@ -1039,7 +1039,9 @@ class TempFileTestCaseBase(unittest.TestCase):
   file name and removes the file if it exists when the test is done.
   """
   def setUp(self):
-    (_, self.tempfilepath) = tempfile.mkstemp(".zip")
+    (fd, self.tempfilepath) = tempfile.mkstemp(".zip")
+    # Open file handle causes an exception during remove in Windows
+    os.close(fd)
 
   def tearDown(self):
     if os.path.exists(self.tempfilepath):

transitfeed.py

@@ -2416,7 +2416,6 @@ def _LoadStopTimes(self):
                                    departure_time, stop_headsign,
                                    pickup_type, drop_off_type,
                                    shape_dist_traveled)))
-
       self._problems.SetContext(None)
 
     for trip_id, sequence in stoptimes.iteritems():
@@ -2458,6 +2457,10 @@ def Load(self):
     self._LoadFares()
     self._LoadFareRules()
 
+    if self._zip:
+      self._zip.close()
+      self._zip = None
+
     if self._extra_validation:
       self._schedule.Validate(self._problems, validate_children=False)