fix some codacy issues

Author: timgrossmann

instapy/browser.py

@@ -76,7 +76,7 @@ def set_selenium_local_session(proxy_address,
 
         # converts to custom browser
         # browser = convert_selenium_browser(browser)
-    
+
         # authenticate with popup alert window
         if (proxy_username and proxy_password):
             proxy_authentication(browser,
@@ -255,6 +255,7 @@ def retry(max_retry_count = 3, start_page = None):
     def real_decorator(org_func):
         def wrapper(*args, **kwargs):
             browser = None
+            _start_page = start_page
 
             # try to find instance of a browser in the arguments
             # all webdriver classes (chrome, firefox, ...) inherit from Remote class
@@ -281,7 +282,7 @@ def wrapper(*args, **kwargs):
 
             # get current page if none is given
             if not start_page:
-                start_page = browser.current_url
+                _start_page = browser.current_url
 
             rv = None
             retry_count = 0
@@ -300,9 +301,9 @@ def wrapper(*args, **kwargs):
                     rv = None
 
                     # refresh page
-                    browser.get(start_page)
+                    browser.get(_start_page)
 
-            return rv;
+            return rv
         return wrapper
     return real_decorator
 
@@ -347,7 +348,7 @@ def wait_for_valid_authorization(self, username, logger):
                 break
 
         # return to original page
-        web_address_navigator(self, current_url) 
+        web_address_navigator(self, current_url)
 
 
 

instapy/commenters_util.py

@@ -173,7 +173,6 @@ def extract_information(browser, username, daysold, max_pic):
                         click_element(browser, one_pic_elem)
                     except Exception:
                         print("Error: cant click on the photo..")
-                        pass
 
                     sleep(1.5)
 
@@ -408,9 +407,4 @@ def get_photo_urls_from_profile(browser, username, links_to_return_amount=1,
           min(links_to_return_amount, len(links)), " links: ",
           links[:links_to_return_amount])
     sleep(1)
-    return links[:links_to_return_amount]
-    # except:
-    # Code below is unreachable - perhaps get rid of?
-    print("Error: Couldnt get pictures links.")
-    return []
-
+    return links[:links_to_return_amount]

instapy/like_util.py

@@ -413,7 +413,7 @@ def get_links_for_username(browser,
         return False
 
     # if private user, we can get links only if we following
-    following_status, follow_button = get_following_status(
+    following_status, _ = get_following_status(
         browser, "profile", username, person, None, logger, logfolder)
 
     #if following_status is None:
@@ -509,7 +509,7 @@ def check_link(browser, post_link, dont_like, mandatory_words,
     # navigate to it again
     web_address_navigator(browser, post_link)
 
-    """Check if the Post is Valid/Exists"""
+    # Check if the Post is Valid/Exists
     try:
         post_page = browser.execute_script(
             "return window._sharedData.entry_data.PostPage")
@@ -530,8 +530,7 @@ def check_link(browser, post_link, dont_like, mandatory_words,
             'Unavailable Page: {}'.format(post_link.encode('utf-8')))
         return True, None, None, 'Unavailable Page', "Failure"
 
-    """Gets the description of the post's link and checks for the dont_like
-    tags"""
+    # Gets the description of the post's link and checks for the dont_like tags
     graphql = 'graphql' in post_page[0]
     if graphql:
         media = post_page[0]['graphql']['shortcode_media']
@@ -579,14 +578,14 @@ def check_link(browser, post_link, dont_like, mandatory_words,
     if owner_comments == '':
         owner_comments = None
 
-    """Append owner comments to description as it might contain further tags"""
+    # Append owner comments to description as it might contain further tags
     if image_text is None:
         image_text = owner_comments
 
     elif owner_comments:
         image_text = image_text + '\n' + owner_comments
 
-    """If the image still has no description gets the first comment"""
+    # If the image still has no description gets the first comment
     if image_text is None:
         if graphql:
             media_edge_string = get_media_edge_comment_string(media)
@@ -604,16 +603,14 @@ def check_link(browser, post_link, dont_like, mandatory_words,
     logger.info('Link: {}'.format(post_link.encode('utf-8')))
     logger.info('Description: {}'.format(image_text.encode('utf-8')))
 
-    """Check if mandatory character set, before adding the location to the
-    text"""
+    # Check if mandatory character set, before adding the location to the text
     if mandatory_language:
         if not check_character_set(image_text):
             return True, user_name, is_video, 'Mandatory language not ' \
                                               'fulfilled', "Not mandatory " \
                                                            "language"
 
-    """Append location to image_text so we can search through both in one
-    go."""
+    # Append location to image_text so we can search through both in one go
     if location_name:
         logger.info('Location: {}'.format(location_name.encode('utf-8')))
         image_text = image_text + '\n' + location_name

instapy/login_util.py

@@ -234,7 +234,7 @@ def login_user(browser,
      .perform())
 
     # update server calls for both 'click' and 'send_keys' actions
-    for i in range(2):
+    for _ in range(2):
         update_activity()
 
     sleep(1)

instapy/relationship_tools.py

@@ -302,7 +302,7 @@ def get_following(browser,
     web_address_navigator(browser, user_link)
 
     # Get following count
-    followers_count, following_count = get_relationship_counts(browser,
+    _, following_count = get_relationship_counts(browser,
                                                                username,
                                                                logger)
 
@@ -362,7 +362,7 @@ def get_following(browser,
         )
         web_address_navigator(browser, url)
 
-        """ Get stored graphql queries data to be used """
+        # Get stored graphql queries data to be used
         try:
             filename = '{}graphql_queries.json'.format(logfolder)
             query_date = datetime.today().strftime('%d-%m-%Y')
@@ -372,7 +372,8 @@ def get_following(browser,
                         json.dump({username: {query_date: {"sc_rolled": 0}}},
                                   graphql_queries_file)
                         graphql_queries_file.close()
-            """ Loads the existing graphql queries data """
+
+            # Loads the existing graphql queries data
             with open(filename) as graphql_queries_file:
                 graphql_queries = json.load(graphql_queries_file)
                 stored_usernames = list(
@@ -553,7 +554,7 @@ def get_unfollowers(browser,
             "~leaving out of an invalid value")
         return [], []
 
-    elif username is None or type(username) != str:
+    elif username is None or not isinstance(username, str):
         logger.info(
             "Please enter a username to pick Unfollowers  ~leaving out of an "
             "invalid value")
@@ -630,7 +631,7 @@ def get_nonfollowers(browser,
                      logfolder):
     """ Finds Nonfollowers of a given user """
 
-    if username is None or type(username) != str:
+    if username is None or not isinstance(username, str):
         logger.info(
             "Please enter a username to pick Nonfollowers  ~leaving out of "
             "an invalid value")

instapy/text_analytics.py

@@ -51,14 +51,15 @@ def text_analysis(text, text_type, logger):
             (YANDEX_CONFIG["match_language"] is not True and
              (not MEANINGCLOUD_CONFIG or MEANINGCLOUD_CONFIG[
                  "enabled"] is not True))):
-        """ No analysis will be held """
+
+        # No analysis will be held
         print('')
         logger.info(
             "{} text: \"{}\"".format(text_type_c, text.encode("utf-8")))
         return None
 
     if YANDEX_CONFIG["match_language"] is True:
-        """ Language detection & match will take place """
+        # Language detection & match will take place
         if has_any_letters(emojiless_text):
             language_of_text = detect_language(emojiless_text)
         else:
@@ -84,7 +85,7 @@ def text_analysis(text, text_type, logger):
             return False
 
     if MEANINGCLOUD_CONFIG["enabled"] is True:
-        """ Text language normalization for accuracy & efficiency """
+        # Text language normalization for accuracy & efficiency
         if not language_of_text:
             if has_any_letters(emojiless_text):
                 language_of_text = detect_language(emojiless_text)
@@ -113,7 +114,7 @@ def text_analysis(text, text_type, logger):
             text = translate_text(translation_direction, text)
             language_of_text = "en"
 
-        """ Sentiment Analysis """
+        # Sentiment Analysis
         sentiment = sentiment_analysis(text, language_of_text, logger)
 
         if sentiment is None:
@@ -250,7 +251,7 @@ def sentiment_analysis(text, language_of_text, logger):
 
     except (ValueError, ConnectionError) as exc:
         print('')
-        logger.exception("{}\t~{}\n{}\n"
+        logger.exception("{}\t~{}\n"
                          .format(MEANINGCLOUD_FAILURE_MSG,
                                  str(exc).encode("utf-8")))
         return None

instapy/unfollow_util.py

@@ -210,22 +210,22 @@ def unfollow(browser,
     """ Unfollows the given amount of users"""
 
     if (customList is not None and
-            type(customList) in [tuple, list] and
+            isinstance(customList, (tuple, list)) and
             len(customList) == 3 and
             customList[0] is True and
-            type(customList[1]) in [list, tuple, set] and
+            isinstance(customList[1], (list, tuple, set)) and
             len(customList[1]) > 0 and
             customList[2] in ["all", "nonfollowers"]):
         customList_data = customList[1]
-        if type(customList_data) != list:
+        if not isinstance(customList_data, list):
             customList_data = list(customList_data)
         unfollow_track = customList[2]
         customList = True
     else:
         customList = False
 
     if (InstapyFollowed is not None and
-            type(InstapyFollowed) in [tuple, list] and
+            isinstance(InstapyFollowed, (tuple, list)) and
             len(InstapyFollowed) == 2 and
             InstapyFollowed[0] is True and
             InstapyFollowed[1] in ["all", "nonfollowers"]):
@@ -243,7 +243,7 @@ def unfollow(browser,
     web_address_navigator(browser, user_link)
 
     # check how many poeple we are following
-    allfollowers, allfollowing = get_relationship_counts(browser, username,
+    _, allfollowing = get_relationship_counts(browser, username,
                                                          logger)
 
     if allfollowing is None:
@@ -276,7 +276,8 @@ def unfollow(browser,
 
         elif nonFollowers is True:
             logger.info("Unfollowing the users who do not follow back\n")
-            """  Unfollow only the users who do not follow you back """
+
+            # Unfollow only the users who do not follow you back
             unfollow_list = get_nonfollowers(browser,
                                              username,
                                              relationship_data,
@@ -416,7 +417,7 @@ def unfollow(browser,
                         # now it is time to unfollow since
                         # time filter pass, user is now eligble to unfollow
                         if followedback_status is not True:
-                            
+
                             user_link = "https://www.instagram.com/{}/".format(person)
                             web_address_navigator(browser, user_link)
                             valid_page = is_page_available(browser, logger)
@@ -1035,7 +1036,7 @@ def get_given_user_followers(browser,
         return [], []
 
     # check how many people are following this user.
-    allfollowers, allfollowing = get_relationship_counts(browser, user_name,
+    allfollowers, _ = get_relationship_counts(browser, user_name,
                                                          logger)
 
     # skip early for no followers
@@ -1302,7 +1303,8 @@ def unfollow_user(browser, track, username, person, person_id, button,
         return False, "jumped"
 
     if track in ["profile", "post"]:
-        """ Method of unfollowing from a user's profile page or post page """
+        # Method of unfollowing from a user's profile page or post page
+
         if track == "profile":
             user_link = "https://www.instagram.com/{}/".format(person)
             web_address_navigator(browser, user_link)
@@ -1363,7 +1365,8 @@ def unfollow_user(browser, track, username, person, person_id, button,
                         person))
                 return False, "unexpected failure"
     elif track == "dialog":
-        """  Method of unfollowing from a dialog box """
+        # Method of unfollowing from a dialog box
+
         click_element(browser, button)
         sleep(4)  # TODO: use explicit wait here
         confirm_unfollow(browser)
@@ -1404,8 +1407,6 @@ def confirm_unfollow(browser):
 
             elif isinstance(exc, NoSuchElementException):
                 sleep(1)
-                pass
-
 
 def post_unfollow_cleanup(state, username, person, relationship_data,
                           person_id, logger, logfolder):
@@ -1626,7 +1627,7 @@ def set_followback_in_pool(username, person, person_id, logtime, logger, logfold
         '{0}{1}_followedPool.csv'.format(logfolder, username), person, logger)
 
     # return the username with new timestamp
-    log_followed_pool(username, person, logger, logfolder, logtime, person_id, "true")
+    log_followed_pool(username, person, logger, logfolder, logtime, person_id)
 
 
 def refresh_follow_time_in_pool(username, person, person_id, extra_secs, logger, logfolder):
@@ -1638,5 +1639,5 @@ def refresh_follow_time_in_pool(username, person, person_id, extra_secs, logger,
         '{0}{1}_followedPool.csv'.format(logfolder, username), person, logger)
 
     # return the username with new timestamp
-    log_followed_pool(username, person, logger, logfolder, logtime, person_id, "unknown")
+    log_followed_pool(username, person, logger, logfolder, logtime, person_id)