@@ -116,7 +116,7 @@ class Config(object):

                 if 'AWS_CREDENTIAL_FILE' in os.environ:

                     self.env_config()

             if len(self.access_key)==0:

-                self.role_config()  

+                self.role_config()

     def role_config(self):

         conn = httplib.HTTPConnection(host='169.254.169.254',timeout=2)

@@ -124,7 +124,7 @@ class Config(object):

             conn.request('GET', "/latest/meta-data/iam/security-credentials/")

             resp = conn.getresponse()

             files = resp.read()

-            if resp.status == 200 and len(files)>1:               

+            if resp.status == 200 and len(files)>1:

                 conn.request('GET', "/latest/meta-data/iam/security-credentials/%s"%files)

                 resp=conn.getresponse()

                 if resp.status == 200:

@@ -167,7 +167,7 @@ class Config(object):

                     elif data["orig_key"]=="AWSSecretKey":

                         data["key"] = "secret_key"

                     else:

-                        del data["key"]                    

+                        del data["key"]

                     if "key" in data:

                         Config().update_option(data["key"], data["value"])

                         if data["key"] in ("access_key", "secret_key", "gpg_passphrase"):

@@ -175,8 +175,6 @@ class Config(object):

                         else:

                             print_value = data["value"]

                         debug("env_Config: %s->%s" % (data["key"], print_value))

-                

-        

     def option_list(self):

         retval = []

@@ -159,7 +159,7 @@ def _get_filelist_from_file(cfg, local_path):

             except IOError, e:

                 warning(u"--files-from input file %s could not be opened for reading (%s), skipping." % (fname, e.strerror))

                 continue

-                

+

         for line in f:

             line = line.strip()

             line = os.path.normpath(os.path.join(local_path, line))

@@ -636,7 +636,7 @@ def cmd_info(args):

                 output(u"   policy: %s" % policy)

             except:

                 output(u"   policy: none")

-            

+

             for grant in acl_grant_list:

                 output(u"   ACL:       %s: %s" % (grant['grantee'], grant['permission']))

             if acl.isAnonRead():

@@ -876,9 +876,7 @@ def cmd_sync_remote2local(args):

                     os.umask(original_umask);

                     mode = 0777 - original_umask;

                     debug(u"mode=%s" % oct(mode))

-                    

                     os.chmod(dst_file, mode);

-                    

                     debug(u"renamed chkptfname=%s to dst_file=%s" % (unicodise(chkptfname), unicodise(dst_file)))

                     if response.has_key('s3cmd-attrs') and cfg.preserve_attrs:

                         attrs = response['s3cmd-attrs']

@@ -890,8 +888,8 @@ def cmd_sync_remote2local(args):

                             os.utime(dst_file, (atime, mtime))

                         ## FIXME: uid/gid / uname/gname handling comes here! TODO

                 except OSError, e:

-                    try: 

-                        dst_stream.close() 

+                    try:

+                        dst_stream.close()

                         os.remove(chkptfname)

                     except: pass

                     if e.errno == errno.EEXIST:

@@ -905,14 +903,14 @@ def cmd_sync_remote2local(args):

                         continue

                     raise e

                 except KeyboardInterrupt:

-                    try: 

+                    try:

                         dst_stream.close()

                         os.remove(chkptfname)

                     except: pass

                     warning(u"Exiting after keyboard interrupt")

                     return

                 except Exception, e:

-                    try: 

+                    try:

                         dst_stream.close()

                         os.remove(chkptfname)

                     except: pass

@@ -921,7 +919,7 @@ def cmd_sync_remote2local(args):

                 # We have to keep repeating this call because

                 # Python 2.4 doesn't support try/except/finally

                 # construction :-(

-                try: 

+                try:

                     dst_stream.close()

                     os.remove(chkptfname)

                 except: pass