diff --git a/gdrivefs/gdfs/gdfuse.py b/gdrivefs/gdfs/gdfuse.py index 4bd7f0e..d78ef36 100644 --- a/gdrivefs/gdfs/gdfuse.py +++ b/gdrivefs/gdfs/gdfuse.py @@ -852,6 +852,10 @@ def mount(auth_storage_filepath, mountpoint, debug=None, nothreads=None, else: v = True + # ignore the "user" option so we can put in fstab easily + if k == "user": + continue + # We have a list of provided options. See which match against our # application options. diff --git a/gdrivefs/gdfs/opened_file.py b/gdrivefs/gdfs/opened_file.py index 1a05f7c..67c0a41 100644 --- a/gdrivefs/gdfs/opened_file.py +++ b/gdrivefs/gdfs/opened_file.py @@ -197,7 +197,7 @@ def __init__(self, entry_id, path, filename, is_hidden, mime_type): self.__is_loaded = False self.__is_dirty = False - temp_filename = self.__entry_id.encode('ASCII') + temp_filename = self.__entry_id.encode('utf8') om = get_om() self.__temp_filepath = os.path.join(om.temp_path, temp_filename) diff --git a/gdrivefs/gdtool/normal_entry.py b/gdrivefs/gdtool/normal_entry.py index 11a4527..60486df 100644 --- a/gdrivefs/gdtool/normal_entry.py +++ b/gdrivefs/gdtool/normal_entry.py @@ -213,7 +213,7 @@ def __convert(self, data): return data def get_data(self): - original = dict([(key.encode('ASCII'), value) + original = dict([(key.encode('utf8'), value) for key, value in self.__raw_data.iteritems()])