Sourcery refactored master branch #2

sourcery-ai · 2022-08-17T15:40:09Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-08-17T15:40:11Z

scripts/04_rename_with_slice.py

        print(e)
    else:
-        print("Renamed {} to {}".format(file, new_file_name))
+        print(f"Renamed {file} to {new_file_name}")


Lines 14-14 refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-08-17T15:40:12Z

scripts/05_load_json_without_dupes.py

-    my_dict = dict()
+    my_dict = {}
    for key, values in ordered_pairs:
        if key in my_dict:
-            raise ValueError("Duplicate key: {}".format(key,))
+            raise ValueError(f"Duplicate key: {key}")


Function dict_raise_on_duplicates refactored with the following changes:

Replace dict() with {} (dict-literal)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-08-17T15:40:12Z

scripts/06_execution_time.py

-sample_list = list()
+sample_list = []
 my_list = [random.randint(1, 888898) for num in
           range(1, 1000000) if num % 2 == 0]
-print('Finished in {} seconds.'.format(timer.duration()))
+print(f'Finished in {timer.duration()} seconds.')


Lines 31-34 refactored with the following changes:

Replace list() with [] (list-literal)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-08-17T15:40:12Z

scripts/07_benchmark_permissions_loading_django.py

-    n = 0
-    all_times = list()
-    while n < 10:
+    all_times = []
+    for _ in range(10):
        create_new_db()
        load_new_perms()
-        n += 1


Lines 37-42 refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace list() with [] (list-literal)

Replace while with for (while-to-for)

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-08-17T15:40:12Z

scripts/08_basic_email_web_crawler.py


 # print the number of links in the list
-print("\nFound {} links".format(len(links)))
+print(f"\nFound {len(links)} links")


Lines 19-19 refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-08-17T15:40:14Z

scripts/15_check_my_environment.py

    sys.exit("Configuration error! Unknown environment set. \
              Edit config.py and set appropriate environment")
-print("Config file: {}".format(CONFIGFILE))
+print(f"Config file: {CONFIGFILE}")


Lines 42-42 refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-08-17T15:40:14Z

scripts/20_restore_file_from_git.py

 commit = check_output(["git", "rev-list", "-n", "1", "HEAD", "--", file_name])
 print(str(commit).rstrip())
-call(["git", "checkout", str(commit).rstrip()+"~1", file_name])
+call(["git", "checkout", f"{str(commit).rstrip()}~1", file_name])


Lines 7-7 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-08-17T15:40:14Z

scripts/25_ip2geolocation.py

        reader = csv.reader(f)
-        for row in reader:
-            all_addresses.append(row)
+        all_addresses.extend(iter(reader))


Function get_addresses refactored with the following changes:

Simplify generator expression (simplify-generator)

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2022-08-17T15:40:15Z

scripts/25_ip2geolocation.py

-    counter = 1
    # update header
    header_row = all_the_ip_address.pop(0)
    header_row.extend(['Country', 'City'])
    # get geolocation
-    for line in all_the_ip_address:
+    for counter, line in enumerate(all_the_ip_address, start=1):
        print("Grabbing geo info for row # {0}".format(counter))
        r = requests.get('https://freegeoip.net/json/{0}'.format(line[0]))
        line.extend([str(r.json()['country_name']), str(r.json()['city'])])
        updated_addresses.append(line)
-        counter += 1


Function get_geolocation refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

sourcery-ai · 2022-08-17T15:40:15Z

scripts/30_fullcontact.py

-    else:
-        print('Specify at least 1 argument')
-        sys.exit()
+    print('Specify at least 1 argument')
+    sys.exit()


Function get_arguments refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-08-17T15:40:17Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.85%.

Quality metrics	Before	After	Change
Complexity	3.59 ⭐	2.89 ⭐	-0.70 👍
Method Length	38.00 ⭐	37.64 ⭐	-0.36 👍
Working memory	5.42 ⭐	5.35 ⭐	-0.07 👍
Quality	81.54% ⭐	82.39% ⭐	0.85% 👍

Other metrics	Before	After	Change
Lines	592	575	-17

Changed files	Quality Before	Quality After	Quality Change
scripts/04_rename_with_slice.py	77.85% ⭐	77.70% ⭐	-0.15% 👎
scripts/05_load_json_without_dupes.py	86.59% ⭐	89.54% ⭐	2.95% 👍
scripts/06_execution_time.py	89.48% ⭐	89.56% ⭐	0.08% 👍
scripts/07_benchmark_permissions_loading_django.py	92.94% ⭐	93.02% ⭐	0.08% 👍
scripts/08_basic_email_web_crawler.py	86.02% ⭐	86.02% ⭐	0.00%
scripts/09_basic_link_web_crawler.py	88.87% ⭐	88.87% ⭐	0.00%
scripts/10_find_files_recursively.py	78.35% ⭐	80.68% ⭐	2.33% 👍
scripts/11_optimize_images_with_wand.py	81.19% ⭐	81.03% ⭐	-0.16% 👎
scripts/12_csv_split.py	76.23% ⭐	77.74% ⭐	1.51% 👍
scripts/13_random_name_generator.py	89.63% ⭐	90.24% ⭐	0.61% 👍
scripts/15_check_my_environment.py	91.61% ⭐	92.48% ⭐	0.87% 👍
scripts/20_restore_file_from_git.py	85.09% ⭐	84.93% ⭐	-0.16% 👎
scripts/25_ip2geolocation.py	83.17% ⭐	84.61% ⭐	1.44% 👍
scripts/30_fullcontact.py	91.58% ⭐	92.73% ⭐	1.15% 👍
scripts/31_youtube_sentiment.py	74.17% 🙂	75.25% ⭐	1.08% 👍
scripts/34_git_all_repos.py	73.07% 🙂	72.93% 🙂	-0.14% 👎

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
scripts/11_optimize_images_with_wand.py	get_image_file_names	7 ⭐	78 🙂	10 😞	65.25% 🙂	Extract out complex expressions
scripts/12_csv_split.py	parse_file	1 ⭐	148 😞	8 🙂	66.40% 🙂	Try splitting into smaller methods

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

sourcery-ai · 2022-08-17T15:40:19Z

scripts/30_fullcontact.py

-    if r.status_code == 200:
-        return r.text
-    else:
-        return "Sorry, no results found."
+    return r.text if r.status_code == 200 else "Sorry, no results found."


Function call_api refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-08-17T15:40:19Z

scripts/31_youtube_sentiment.py

-    else:
-        print('Specify at least 1 argument')
-        sys.exit()
+    print('Specify at least 1 argument')
+    sys.exit()


Function get_arguments refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-08-17T15:40:19Z

scripts/31_youtube_sentiment.py

-    html = requests.get('https://plus.googleapis.com/u/0/_/widget/render/comments?first_party_property=YOUTUBE&href=' + url)
+    html = requests.get(
+        f'https://plus.googleapis.com/u/0/_/widget/render/comments?first_party_property=YOUTUBE&href={url}'
+    )
+


Function get_comments refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-08-17T15:40:19Z

scripts/31_youtube_sentiment.py

-        else:
-            for word in comment.split(' '):
-                if word in negative_words:
-                    negative += 1
-                if word in positive_words:
-                    positive += 1
+        for word in comment.split(' '):
+            if word in negative_words:
+                negative += 1
+            if word in positive_words:
+                positive += 1


Function calculate_sentiment refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-08-17T15:40:19Z

scripts/31_youtube_sentiment.py

-    url = get_arguments()
-    if url:
+    if url := get_arguments():


Function main refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-08-17T15:40:19Z

scripts/34_git_all_repos.py

+    url = 'https://api.github.com/{0}/{1}/repos?per_page=100&page={2}'
    while True:
-        url = 'https://api.github.com/{0}/{1}/repos?per_page=100&page={2}'
        r = requests.get(url.format(group, name, page))
        if r.status_code == 200:
            rdata = r.json()
-            for repo in rdata:
-                repo_urls.append(repo['clone_url'])
+            repo_urls.extend(repo['clone_url'] for repo in rdata)


Function get_total_repos refactored with the following changes:

Hoist statements out of for/while loops (hoist-statement-from-loop)

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2022-08-17T15:40:20Z

scripts/34_git_all_repos.py

-    count = 1
    print('Cloning...')
-    for repo in all_repos:
-        os.system('Git clone ' + repo)
+    for count, repo in enumerate(all_repos, start=1):
+        os.system(f'Git clone {repo}')
        print('Completed repo #{0} of {1}'.format(count, len(all_repos)))
-        count += 1


Function clone_repos refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-08-17T15:40:20Z

scripts/34_git_all_repos.py

-        total = get_total_repos(sys.argv[1], sys.argv[2])
-        if total:
+        if total := get_total_repos(sys.argv[1], sys.argv[2]):


Lines 37-38 refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

'Refactored by Sourcery'

d5ab1ca

sourcery-ai bot requested a review from ekmixon August 17, 2022 15:40

sourcery-ai bot commented Aug 17, 2022

View reviewed changes

Sourcery refactored master branch #2

Are you sure you want to change the base?

Sourcery refactored master branch #2

Uh oh!

Conversation

sourcery-ai bot commented Aug 17, 2022

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot commented Aug 17, 2022

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant