From 5cee4fb783fbc47a48a7c5df33595c1200ee4900 Mon Sep 17 00:00:00 2001
From: Peter Schmidbauer <peter.schmidb@gmail.com>
Date: Fri, 1 Nov 2019 19:57:24 +0100
Subject: [PATCH] run pyupgrade on plugin dir

---
 jrnl/plugins/__init__.py      | 4 ++--
 jrnl/plugins/jrnl_importer.py | 2 +-
 jrnl/plugins/json_exporter.py | 2 +-
 jrnl/plugins/tag_exporter.py  | 2 +-
 jrnl/plugins/text_exporter.py | 4 ++--
 jrnl/plugins/util.py          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jrnl/plugins/__init__.py b/jrnl/plugins/__init__.py
index bb2ea176..8d59b556 100644
--- a/jrnl/plugins/__init__.py
+++ b/jrnl/plugins/__init__.py
@@ -13,8 +13,8 @@ from .template_exporter import __all__ as template_exporters
 __exporters =[JSONExporter, MarkdownExporter, TagExporter, TextExporter, XMLExporter, YAMLExporter] + template_exporters
 __importers =[JRNLImporter]
 
-__exporter_types = dict([(name, plugin) for plugin in __exporters for name in plugin.names])
-__importer_types = dict([(name, plugin) for plugin in __importers for name in plugin.names])
+__exporter_types = {name: plugin for plugin in __exporters for name in plugin.names}
+__importer_types = {name: plugin for plugin in __importers for name in plugin.names}
 
 EXPORT_FORMATS = sorted(__exporter_types.keys())
 IMPORT_FORMATS = sorted(__importer_types.keys())
diff --git a/jrnl/plugins/jrnl_importer.py b/jrnl/plugins/jrnl_importer.py
index 1015c262..e2145232 100644
--- a/jrnl/plugins/jrnl_importer.py
+++ b/jrnl/plugins/jrnl_importer.py
@@ -26,5 +26,5 @@ class JRNLImporter:
                 sys.exit(0)
         journal.import_(other_journal_txt)
         new_cnt = len(journal.entries)
-        print("[{0} imported to {1} journal]".format(new_cnt - old_cnt, journal.name), file=sys.stderr)
+        print("[{} imported to {} journal]".format(new_cnt - old_cnt, journal.name), file=sys.stderr)
         journal.write()
diff --git a/jrnl/plugins/json_exporter.py b/jrnl/plugins/json_exporter.py
index e6591302..e368a300 100644
--- a/jrnl/plugins/json_exporter.py
+++ b/jrnl/plugins/json_exporter.py
@@ -34,7 +34,7 @@ class JSONExporter(TextExporter):
         """Returns a json representation of an entire journal."""
         tags = get_tags_count(journal)
         result = {
-            "tags": dict((tag, count) for count, tag in tags),
+            "tags": {tag: count for count, tag in tags},
             "entries": [cls.entry_to_dict(e) for e in journal.entries]
         }
         return json.dumps(result, indent=2)
diff --git a/jrnl/plugins/tag_exporter.py b/jrnl/plugins/tag_exporter.py
index 269a762d..f5453ced 100644
--- a/jrnl/plugins/tag_exporter.py
+++ b/jrnl/plugins/tag_exporter.py
@@ -25,5 +25,5 @@ class TagExporter(TextExporter):
         elif min(tag_counts)[0] == 0:
             tag_counts = filter(lambda x: x[0] > 1, tag_counts)
             result += '[Removed tags that appear only once.]\n'
-        result += "\n".join("{0:20} : {1}".format(tag, n) for n, tag in sorted(tag_counts, reverse=True))
+        result += "\n".join("{:20} : {}".format(tag, n) for n, tag in sorted(tag_counts, reverse=True))
         return result
diff --git a/jrnl/plugins/text_exporter.py b/jrnl/plugins/text_exporter.py
index c72e8d93..687de750 100644
--- a/jrnl/plugins/text_exporter.py
+++ b/jrnl/plugins/text_exporter.py
@@ -34,7 +34,7 @@ class TextExporter:
 
     @classmethod
     def make_filename(cls, entry):
-        return entry.date.strftime("%Y-%m-%d_{0}.{1}".format(slugify(str(entry.title)), cls.extension))
+        return entry.date.strftime("%Y-%m-%d_{}.{}".format(slugify(str(entry.title)), cls.extension))
 
     @classmethod
     def write_files(cls, journal, path):
@@ -46,7 +46,7 @@ class TextExporter:
                     f.write(cls.export_entry(entry))
             except IOError as e:
                 return "[{2}ERROR{3}: {0} {1}]".format(e.filename, e.strerror, ERROR_COLOR, RESET_COLOR)
-        return "[Journal exported to {0}]".format(path)
+        return "[Journal exported to {}]".format(path)
 
     @classmethod
     def export(cls, journal, output=None):
diff --git a/jrnl/plugins/util.py b/jrnl/plugins/util.py
index 0a642cb2..a056b19a 100644
--- a/jrnl/plugins/util.py
+++ b/jrnl/plugins/util.py
@@ -10,7 +10,7 @@ def get_tags_count(journal):
             for entry in journal.entries
             for tag in set(entry.tags)]
     # To be read: [for entry in journal.entries: for tag in set(entry.tags): tag]
-    tag_counts = set([(tags.count(tag), tag) for tag in tags])
+    tag_counts = {(tags.count(tag), tag) for tag in tags}
     return tag_counts