Merge pull request google#9 from Holzhauer/master

aliafshar · aliafshar · commit 35a145763d6b · 2015-03-16T10:57:02.000-07:00
checking for lower case "export" in uri (due to changes to google API)
diff --git a/src/gdata/docs/client.py b/src/gdata/docs/client.py
@@ -397,7 +397,7 @@ def download_resource_to_memory(self, entry, extra_params=None, **kwargs):
   def _get_download_uri(self, base_uri, extra_params=None):
     uri = base_uri.replace('&amp;', '&')
     if extra_params is not None:
-      if 'exportFormat' in extra_params and '/Export?' not in uri:
+      if 'exportFormat' in extra_params and '/Export?' not in uri and '/export?' not in uri:
         raise gdata.client.Error, ('This entry type cannot be exported '
                                    'as a different format.')
 
diff --git a/src/gdata/docs/service.py b/src/gdata/docs/service.py
@@ -330,7 +330,7 @@ def Download(self, entry_or_id_or_url, file_path, export_format=None,
         url = entry_or_id_or_url
 
     if export_format is not None:
-      if url.find('/Export?') == -1:
+      if (url.find('/Export?') == -1) and (url.find('/export?') == -1):
         raise gdata.service.Error, ('This entry cannot be exported '
                                     'as a different format')
       url += '&exportFormat=%s' % export_format
