Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/requirements-dev.txt b/requirements-dev.txt
- index 8e1f5ad..fa101df 100644
- --- a/requirements-dev.txt
- +++ b/requirements-dev.txt
- @@ -1 +1,3 @@
- +bpython
- pytest==4.3.1
- +yapf
- diff --git a/tools/scrapd-merger.py b/tools/scrapd-merger.py
- index 222a82e..03e0838 100644
- --- a/tools/scrapd-merger.py
- +++ b/tools/scrapd-merger.py
- @@ -12,8 +12,9 @@ $ cat new.json | python scrapd-merger.py old.json -
- """
- import argparse
- -import logging
- import json
- +import logging
- +from pathlib import Path
- import pprint
- import sys
- @@ -27,14 +28,19 @@ def main():
- # Merge the data.
- results = merge(json.loads(args.old.read()), json.loads(args.infile.read()))
- + # Write the data.
- + s_results = json.dumps(results, sort_keys=True, indent=2)
- + args.old.seek(0)
- + args.old.write(s_results)
- +
- # Display the results.
- - print(json.dumps(results, sort_keys=True, indent=2), file=sys.stdout)
- + print(s_results)
- -def get_cli_parser(): # pragma: no cover
- +def get_cli_parser(): # pragma: no cover
- """Get the CLI parser."""
- parser = argparse.ArgumentParser(description='Create beautiful releases on GitHub.')
- - parser.add_argument('old', type=argparse.FileType('rt'))
- + parser.add_argument('old', type=argparse.FileType('r+t'))
- parser.add_argument('infile', type=argparse.FileType('rt'), default=sys.stdin)
- return parser
- @@ -186,4 +192,3 @@ FINAL = """
- }
- ]
- """
- -
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement