@@ -159,11 +159,11 @@ class ACL(object):

         grantee.name = name

         grantee.permission = permission

-        if  name.find('@') > -1:

+        if  '@' in name:

             grantee.name = grantee.name.lower()

             grantee.xsi_type = "AmazonCustomerByEmail"

             grantee.tag = "EmailAddress"

-        elif name.find('http://acs.amazonaws.com/groups/') > -1:

+        elif 'http://acs.amazonaws.com/groups/' in name:

             grantee.xsi_type = "Group"

             grantee.tag = "URI"

         else:

@@ -388,7 +388,7 @@ def fetch_remote_list(args, require_attribs = False, recursive = None, uri_param

                 'dev' : None,

                 'inode' : None,

             }

-            if rem_list[key]['md5'].find("-") > 0: # always get it for multipart uploads

+            if '-' in rem_list[key]['md5']: # always get it for multipart uploads

                 _get_remote_attribs(S3Uri(object_uri_str), rem_list[key])

             md5 = rem_list[key]['md5']

             rem_list.record_md5(key, md5)

@@ -478,7 +478,7 @@ def compare_filelists(src_list, dst_list, src_remote, dst_remote, delay_updates

         compare_md5 = 'md5' in cfg.sync_checks

         # Multipart-uploaded files don't have a valid md5 sum - it ends with "...-nn"

         if compare_md5:

-            if (src_remote == True and src_list[file]['md5'].find("-") >= 0) or (dst_remote == True and dst_list[file]['md5'].find("-") >= 0):

+            if (src_remote == True and '-' in src_list[file]['md5']) or (dst_remote == True and '-' in dst_list[file]['md5']):

                 compare_md5 = False

                 info(u"disabled md5 check for %s" % file)

         if attribs_match and compare_md5:

@@ -61,7 +61,7 @@ try:

             return magic_.file(file)

 except ImportError, e:

-    if str(e).find("magic") >= 0:

+    if 'magic' in str(e):

         magic_message = "Module python-magic is not available."

     else:

         magic_message = "Module python-magic can't be used (%s)." % e.message

@@ -439,7 +439,7 @@ class S3(object):

         return (request, body)

     def add_encoding(self, filename, content_type):

-        if content_type.find("charset=") != -1:

+        if 'charset=' in content_type:

            return False

         exts = self.config.add_encoding_exts.split(',')

         if exts[0]=='':

@@ -1174,7 +1174,7 @@ class S3(object):

             except KeyError:

                 pass

-        response["md5match"] = md5_hash.find(response["md5"]) >= 0

+        response["md5match"] = response["md5"] in md5_hash

         response["elapsed"] = timestamp_end - timestamp_start

         response["size"] = current_position

         response["speed"] = response["elapsed"] and float(response["size"]) / response["elapsed"] or float(-1)

@@ -90,7 +90,7 @@ if not os.path.isdir('testsuite/crappy-file-name'):

 def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [], must_find_re = [], must_not_find_re = []):

     def command_output():

         print "----"

-        print " ".join([arg.find(" ")>=0 and "'%s'" % arg or arg for arg in cmd_args])

+        print " ".join([" " in arg and "'%s'" % arg or arg for arg in cmd_args])

         print "----"

         print stdout

         print "----"

@@ -245,7 +245,7 @@ while argv:

             print "Bucket prefix option must explicitly supply a bucket name prefix"

             sys.exit(0)

         continue

-    if arg.find("..") >= 0:

+    if ".." in arg:

         range_idx = arg.find("..")

         range_start = arg[:range_idx] or 0

         range_end = arg[range_idx+2:] or 999

@@ -175,7 +175,7 @@ def subcmd_bucket_list(s3, uri):

     for object in response["list"]:

         md5 = object['ETag'].strip('"\'')

         if cfg.list_md5:

-            if md5.find('-') >= 0: # need to get md5 from the object

+            if '-' in md5.find('-'): # need to get md5 from the object

                 object_uri = uri.compose_uri(bucket, object["Key"])

                 info_response = s3.object_info(S3Uri(object_uri))

                 try: