Python3 Compatiable

Author: ralic

gdrivefs/account_info.py

@@ -9,10 +9,10 @@
 class AccountInfo(LiveReaderBase):
     """Encapsulates our account info."""
 
-    __map = {'root_id': u'rootFolderId',
-             'largest_change_id': (u'largestChangeId', int),
-             'quota_bytes_total': (u'quotaBytesTotal', int),
-             'quota_bytes_used': (u'quotaBytesUsed', int)}
+    __map = {'root_id': 'rootFolderId',
+             'largest_change_id': ('largestChangeId', int),
+             'quota_bytes_total': ('quotaBytesTotal', int),
+             'quota_bytes_used': ('quotaBytesUsed', int)}
 
     def get_data(self):
         gd = get_gdrive()
@@ -33,5 +33,5 @@ def __getattr__(self, key):
 
     @property
     def keys(self):
-        return AccountInfo.__map.keys()
+        return list(AccountInfo.__map.keys())
 

gdrivefs/auto_auth.py

@@ -2,21 +2,21 @@
 import threading
 import webbrowser
 import time
-import urlparse
+import urllib.parse
 
-import SocketServer
-import BaseHTTPServer
-import cStringIO
+import socketserver
+import http.server
+import io
 
 import gdrivefs.oauth_authorize
 import gdrivefs.conf
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class _HTTPRequest(BaseHTTPServer.BaseHTTPRequestHandler):
+class _HTTPRequest(http.server.BaseHTTPRequestHandler):
     def __init__(self, request_text):
-        self.rfile = cStringIO.StringIO(request_text)
+        self.rfile = io.StringIO(request_text)
         self.raw_requestline = self.rfile.readline()
         self.error_code = self.error_message = None
         self.parse_request()
@@ -77,7 +77,7 @@ def __thread(self):
         monitor = self
 
         # Embedding this because it's so trivial.
-        class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
+        class Handler(http.server.BaseHTTPRequestHandler):
             def do_GET(self):
 
                 # We have the first line of the response with the authorization code
@@ -92,8 +92,8 @@ def do_GET(self):
                 # line and another for a subsequent blank line to terminate the block
                 # and conform with the RFC.
                 hr = _HTTPRequest(self.requestline + "\n\n")
-                u = urlparse.urlparse(hr.path)
-                arguments = urlparse.parse_qs(u.query)
+                u = urllib.parse.urlparse(hr.path)
+                arguments = urllib.parse.parse_qs(u.query)
 
                 # It's not an authorization response. Bail with the same error
                 # the library would normally send for unhandled requests.
@@ -130,9 +130,9 @@ def log_message(self, format, *args):
                 pass
 
 
-        class Server(SocketServer.TCPServer):
+        class Server(socketserver.TCPServer):
             def server_activate(self, *args, **kwargs):
-                r = SocketServer.TCPServer.server_activate(self, *args, **kwargs)
+                r = socketserver.TCPServer.server_activate(self, *args, **kwargs)
 
                 # Sniff the port, now that we're running.
                 monitor._port = self.server_address[1]

gdrivefs/cache_agent.py

@@ -96,10 +96,10 @@ def __cleanup(self):
             cache_dict = self.registry.list_raw(self.resource_name)
 
             total_keys = [ (key, value_tuple[1]) for key, value_tuple \
-                                in cache_dict.iteritems() ]
+                                in cache_dict.items() ]
 
             cleanup_keys = [ key for key, value_tuple \
-                                in cache_dict.iteritems() \
+                                in cache_dict.items() \
                                 if (datetime.datetime.now() - value_tuple[1]).seconds > \
                                         self.max_age ]
 

gdrivefs/chunked_download.py

@@ -71,7 +71,7 @@ def next_chunk(self, num_retries=0):
                 self._progress, self._progress + self._chunksize)
             }
 
-        for retry_num in xrange(num_retries + 1):
+        for retry_num in range(num_retries + 1):
             _logger.debug("Attempting to read chunk. ATTEMPT=(%d)/(%d)", 
                           retry_num + 1, num_retries + 1)
 

gdrivefs/conf.py

@@ -26,8 +26,8 @@ class Conf(object):
     file_chunk_size_kb                  = 1024
     file_download_temp_max_age_s        = 86400
     change_check_frequency_s            = 3
-    hidden_flags_list_local             = [u'trashed', u'restricted']
-    hidden_flags_list_remote            = [u'trashed']
+    hidden_flags_list_local             = ['trashed', 'restricted']
+    hidden_flags_list_remote            = ['trashed']
     cache_cleanup_check_frequency_s     = 60
     cache_entries_max_age               = 8 * 60 * 60
     cache_status_post_frequency_s       = 10
@@ -37,7 +37,7 @@ class Conf(object):
 
     google_discovery_service_url        = DISCOVERY_URI
     default_buffer_read_blocksize       = 65536
-    directory_mimetype                  = u'application/vnd.google-apps.folder'
+    directory_mimetype                  = 'application/vnd.google-apps.folder'
     default_perm_folder                 = '777'
     default_perm_file_editable          = '666'
     default_perm_file_noneditable       = '444'

gdrivefs/drive.py

@@ -4,7 +4,7 @@
 import random
 import json
 import time
-import httplib
+import http.client
 import ssl
 import tempfile
 import pprint
@@ -54,7 +54,7 @@ def wrapper(*args, **kwargs):
         for n in range(0, 5):
             try:
                 return f(*args, **kwargs)
-            except (ssl.SSLError, httplib.BadStatusLine) as e:
+            except (ssl.SSLError, http.client.BadStatusLine) as e:
                 # These happen sporadically. Use backoff.
                 _logger.exception("There was a transient connection "
                                   "error (%s). Trying again [%s]: %s",
@@ -178,8 +178,8 @@ def __init__(self):
         self.__auth = GdriveAuth()
 
     def __assert_response_kind(self, response, expected_kind):
-        actual_kind = response[u'kind']
-        if actual_kind != unicode(expected_kind):
+        actual_kind = response['kind']
+        if actual_kind != str(expected_kind):
             raise ValueError("Received response of type [%s] instead of "
                              "[%s]." % (actual_kind, expected_kind))
 
@@ -209,31 +209,31 @@ def list_changes(self, start_change_id=None, page_token=None):
 
         self.__assert_response_kind(response, 'drive#changeList')
 
-        items = response[u'items']
+        items = response['items']
 
         if items:
             _logger.debug("We received (%d) changes to apply.", len(items))
 
-        largest_change_id = int(response[u'largestChangeId'])
-        next_page_token = response.get(u'nextPageToken')
+        largest_change_id = int(response['largestChangeId'])
+        next_page_token = response.get('nextPageToken')
 
         changes = []
         last_change_id = None
         for item in items:
-            change_id = int(item[u'id'])
-            entry_id = item[u'fileId']
+            change_id = int(item['id'])
+            entry_id = item['fileId']
 
-            if item[u'deleted']:
+            if item['deleted']:
                 was_deleted = True
                 entry = None
 
                 _logger.debug("CHANGE: [%s] (DELETED)", entry_id)
             else:
                 was_deleted = False
-                entry = item[u'file']
+                entry = item['file']
 
                 _logger.debug("CHANGE: [%s] [%s] (UPDATED)", 
-                              entry_id, entry[u'title'])
+                              entry_id, entry['title'])
 
             if was_deleted:
                 normalized_entry = None
@@ -260,7 +260,7 @@ def get_parents_containing_id(self, child_id, max_results=None):
         response = client.parents().list(fileId=child_id).execute()
         self.__assert_response_kind(response, 'drive#parentList')
 
-        return [ entry[u'id'] for entry in response[u'items'] ]
+        return [ entry['id'] for entry in response['items'] ]
 
     @_marshall
     def get_children_under_parent_id(self,
@@ -298,7 +298,7 @@ def get_children_under_parent_id(self,
 
         self.__assert_response_kind(response, 'drive#childList')
 
-        return [ entry[u'id'] for entry in response[u'items'] ]
+        return [ entry['id'] for entry in response['items'] ]
 
     @_marshall
     def get_entries(self, entry_ids):
@@ -373,24 +373,24 @@ def list_files(self, query_contains_string=None, query_is_string=None,
             self.__assert_response_kind(result, 'drive#fileList')
 
             _logger.debug("(%d) entries were presented for page-number "
-                          "(%d).", len(result[u'items']), page_num)
+                          "(%d).", len(result['items']), page_num)
 
-            for entry_raw in result[u'items']:
+            for entry_raw in result['items']:
                 entry = \
                     gdrivefs.normal_entry.NormalEntry(
                         'list_files', 
                         entry_raw)
 
                 entries.append(entry)
 
-            if u'nextPageToken' not in result:
+            if 'nextPageToken' not in result:
                 _logger.debug("No more pages in file listing.")
                 break
 
             _logger.debug("Next page-token in file-listing is [%s].", 
-                          result[u'nextPageToken'])
+                          result['nextPageToken'])
 
-            page_token = result[u'nextPageToken']
+            page_token = result['nextPageToken']
             page_num += 1
 
         return entries
@@ -427,7 +427,7 @@ def download_to_local(self, output_file_path, normalized_entry,
             message = ("Entry with ID [%s] can not be exported to type [%s]. "
                        "The available types are: %s" % 
                        (normalized_entry.id, mime_type, 
-                        ', '.join(normalized_entry.download_links.keys())))
+                        ', '.join(list(normalized_entry.download_links.keys()))))
 
             _logger.warning(message)
             raise gdrivefs.errors.ExportFormatError(message)

gdrivefs/fsutility.py

@@ -39,7 +39,7 @@ def wrapper(*args, **kwargs):
 
             if args or kwargs:
                 condensed = {}
-                for i in xrange(len(args)):
+                for i in range(len(args)):
                     # Skip the 'self' argument.
                     if i == 0:
                         continue
@@ -49,16 +49,16 @@ def wrapper(*args, **kwargs):
 
                     condensed[argument_names[i - 1]] = args[i]
 
-                for k, v in kwargs.iteritems():
+                for k, v in kwargs.items():
                     condensed[k] = v
 
                 values_nice = [("%s= [%s]" % (k, v)) for k, v \
-                                                     in condensed.iteritems() \
+                                                     in condensed.items() \
                                                      if k not in excluded]
 
                 if otherdata_cb:
                     data = otherdata_cb(*args, **kwargs)
-                    for k, v in data.iteritems():
+                    for k, v in data.items():
                         values_nice[k] = v
 
                 if values_nice:

gdrivefs/gdfuse.py

@@ -781,7 +781,7 @@ def destroy(self, path):
     def listxattr(self, raw_path):
         (entry, path, filename) = get_entry_or_raise(raw_path)
 
-        return entry.xattr_data.keys()
+        return list(entry.xattr_data.keys())
 
     @dec_hint(['path', 'name', 'position'])
     def getxattr(self, raw_path, name, position=0):