Merge branch 'develop' of https://github.com/CenterForOpenScience/waterbutler into feature/folder-file-ops-revamp

Author: AddisonSchiller

CHANGELOG

@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.34.1 (2017-10-18)
+===================
+- Fix: Don't crash when a file on Google Drive is missing an md5 in its metadata.  This occurs
+for non-exportable files like Google Maps, Google Forms, etc.
+
 0.34.0 (2017-09-29)
 ===================
 - ANNOUNCEMENT!  Sadly, the WaterButler v0 API is now *undeprecated*.  We've discovered that the

waterbutler/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.34.0'
+__version__ = '0.34.1'
 __import__('pkg_resources').declare_namespace(__name__)

waterbutler/providers/googledrive/metadata.py

@@ -120,7 +120,7 @@ def extra(self):
         else:
             if not hasattr(ret, 'hashes'):
                 ret['hashes'] = {}
-            ret['hashes']['md5'] = self.raw['md5Checksum']
+            ret['hashes']['md5'] = self.raw.get('md5Checksum')  # no md5 for non-exportable file
 
         return ret