Docserver overhaul: Gitiles away from me.

chrome/common/extensions/docs/server2/docs_server_utils.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from base64 import b64encode
 from hashlib import sha1
 import os
 
 def FormatKey(key):
   '''Normalize a key by making sure it has a .html extension, and convert any
@@ skipping 36 matching lines @@
 
 def MarkFirstAndLast(dicts):
   '''Marks the first and last element in a list of dicts.
   '''
   MarkFirst(dicts)
   MarkLast(dicts)
 
 def ToUnicode(data):
   '''Returns the str |data| as a unicode object. It's expected to be utf8, but
   there are also latin-1 encodings in there for some reason. Fall back to that.
+
+  Returns None if given None.

[not at google - send to devlin, 2015/06/04 22:40:45]

I would prefer if call sites checked for this. sensible to assert(data is not
None) though.

[Ken Rockot(use gerrit already), 2015/06/05 00:21:50]

Upon further inspection the bug which was causing Nones to come in here has been
fixed, so I have happily removed this change altogether.

   '''
+  if data is None:
+    return None
   try:
     return unicode(data, 'utf-8')
   except:
     return unicode(data, 'latin-1')