Sourcery refactored master branch #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-16
to
+25
| print("WARNING: '"+logPath+"'' doesn't exist. Attempting to create it now.") | ||
| print(f"WARNING: '{logPath}'' doesn't exist. Attempting to create it now.") | ||
| if not os.path.exists(logdir): | ||
| os.makedirs(logdir) | ||
| try: | ||
| with open(logPath) as file: | ||
| pass | ||
| except IOError as e: | ||
| print("ERROR: Unable to verify '"+logPath+"'' exists. Verify path exists and permission settings. Exiting") | ||
| print( | ||
| f"ERROR: Unable to verify '{logPath}'' exists. Verify path exists and permission settings. Exiting" | ||
| ) |
Author
There was a problem hiding this comment.
Lines 16-23 refactored with the following changes:
- Use f-string instead of string concatenation [×4] (
use-fstring-for-concatenation)
Comment on lines
-114
to
+117
| logger.debug("Deleting ElasticSearch index: " + decoded_index + " from " + server) | ||
| url = "http://" + server + ":9200/" + decoded_index + "?pretty" | ||
| logger.debug(f"Deleting ElasticSearch index: {decoded_index} from {server}") | ||
| url = f"http://{server}:9200/{decoded_index}?pretty" |
Author
There was a problem hiding this comment.
Function es_del_index refactored with the following changes:
- Use f-string instead of string concatenation [×7] (
use-fstring-for-concatenation)
Comment on lines
-120
to
+124
| logger.debug("List all ElasticSearch indices from " + server) | ||
| logger.debug(f"List all ElasticSearch indices from {server}") | ||
| #curl -XGET 'localhost:9200/_cat/indices?v&pretty' | ||
| url = "http://" + server + ":9200/_cat/indices?v&pretty" | ||
| url = f"http://{server}:9200/_cat/indices?v&pretty" |
Author
There was a problem hiding this comment.
Function es_list_index refactored with the following changes:
- Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation)
Comment on lines
-126
to
+128
| logger.debug("Executing ElasticSearch command: {}".format(args)) | ||
| logger.debug(f"Executing ElasticSearch command: {args}") |
Author
There was a problem hiding this comment.
Function es_main refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-144
to
+146
| logger.info("Creating TimeSketch user: {}".format(username)) | ||
| logger.info(f"Creating TimeSketch user: {username}") |
Author
There was a problem hiding this comment.
Function create_ts_user refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-255
to
+257
| logger.info("Locally moving file at {} to {}".format(src, dest)) | ||
| logger.info(f"Locally moving file at {src} to {dest}") |
Author
There was a problem hiding this comment.
Function mv_local refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-305
to
+310
| cdqr_exec = "/usr/local/bin/cdqr.py" | ||
| logger.debug("Data Processing: {}".format(args)) | ||
| logger.debug(f"Data Processing: {args}") | ||
| if args.cdqr: | ||
| logger.debug("Attempting to process data with CDQR: {}".format(args.cdqr)) | ||
| logger.debug(f"Attempting to process data with CDQR: {args.cdqr}") | ||
| cdqr_exec = "/usr/local/bin/cdqr.py" |
Author
There was a problem hiding this comment.
Function dp_main refactored with the following changes:
- Move assignments closer to their usage (
move-assign) - Replace call to format with f-string [×3] (
use-fstring-for-formatting)
| usage = "rc_client.py <server IP address or routable domain name> <commands to send to rc_server.py>" | ||
| version = "Skadi Automation Client Version: 1.0.0" | ||
| print("Starting "+version) | ||
| print(f"Starting {version}") |
Author
There was a problem hiding this comment.
Function main refactored with the following changes:
- Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation) - Simplify conditional into switch-like form [×3] (
switch)
Comment on lines
-29
to
-30
| # missing associated documentation comment in .proto file | ||
| pass |
Author
There was a problem hiding this comment.
Function RCServicer.ExecuteRC refactored with the following changes:
- Remove redundant pass statement (
remove-redundant-pass)
This removes the following comments ( why? ):
# missing associated documentation comment in .proto file
| def main(): | ||
| version = "Skadi Automation Server Version: 1.0.0" | ||
| print("Starting "+version) | ||
| print(f"Starting {version}") |
Author
There was a problem hiding this comment.
Function main refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored 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
masterbranch, then run:Help us improve this pull request!