From 3414f36f67ee7f425f5bdd90c534da6ec9e3fb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sun, 3 Dec 2017 17:18:38 +0100
Subject: Increase requirement to >=Py3.6

---
 archivist/cli.py        |  9 ++++-----
 archivist/server/tag.py | 10 ++++++----
 setup.py                |  4 ++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/archivist/cli.py b/archivist/cli.py
index 5478de5..7bdf213 100644
--- a/archivist/cli.py
+++ b/archivist/cli.py
@@ -22,7 +22,6 @@ def enable_debug():
 def cli(debug):
     if debug or 'DEBUG' in os.environ: enable_debug()
 
-
 class ServerCommand(ProxyCommand):
     def _get_proxy(self):
         from .server import server_group
@@ -127,7 +126,7 @@ def edit_prefix(name, implies, description):
     try:
         prefix = Prefix.get(name = name)
     except Prefix.DoesNotExist:
-        raise click.UsageError("Prefix '%s' does not exist." % name)
+        raise click.UsageError(f"Prefix '{name}' does not exist.")
 
     with db.atomic():
         add_implications(prefix.default_tag, implies)
@@ -224,7 +223,7 @@ def store_doc(id, path, parents):
     try:
         d = Document.get(id = id)
     except Document.DoesNotExist:
-        print("Document with ID #%s does not exist" % id)
+        print("Document with ID #{id} does not exist")
         return
 
     if path in (b'-', '-'):
@@ -237,7 +236,7 @@ def store_doc(id, path, parents):
         if parents:
             p.parent.mkdir(parents=True)
         elif not p.parent.exists():
-            raise click.UsageError("Directory %s does not exist (use option '-p'?)." % p.parent)
+            raise click.UsageError(f"Directory {p.parent} does not exist (use option '-p'?).")
 
         with p.open(mode='wb') as f:
             f.write(d.content.blob)
@@ -251,7 +250,7 @@ def open_doc(id):
     try:
         d = Document.get(id = id)
     except Document.DoesNotExist:
-        print("Document with ID #%s does not exist" % id)
+        print(f"Document with ID #{id} does not exist")
         return
 
     with tempfile.TemporaryDirectory() as tmpdir:
diff --git a/archivist/server/tag.py b/archivist/server/tag.py
index 8142cd1..4573c55 100644
--- a/archivist/server/tag.py
+++ b/archivist/server/tag.py
@@ -1,6 +1,8 @@
 from flask import request
 from flask_restplus import Resource, fields, Namespace
 
+from http import HTTPStatus
+
 from .. import model as m
 from .. import bl
 
@@ -21,13 +23,13 @@ class TagList(Resource):
         return list(m.Tag.select().where(~m.Tag.default).dicts().iterator())
 
     @api.expect(tag, validate=True)
-    @api.response(201, "Tag created")
-    @api.response(409, "Tag already exists")
+    @api.response(HTTPStatus.CREATED, "Tag created")
+    @api.response(HTTPStatus.CONFLICT, "Tag already exists")
     def put(self):
         """Create a new tag."""
         data = request.get_json()
         tag, created = bl.PrefixTag(**data).create()
         if created:
-            return '',201
+            return '', HTTPStatus.CREATED
         else:
-            return '',409
+            return '', HTTPStatus.CONFLICT
diff --git a/setup.py b/setup.py
index 8c7fa35..3e57c9e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,10 @@ from distutils import log
 
 from setuptools.command.develop import develop as _develop
 
+import sys
+if sys.version_info < (3,6):
+    sys.exit('Sorry, Python < 3.6 is not supported')
+
 class develop(_develop):
     def install_for_development(self):
         self.run_command('build_clib')
-- 
cgit v1.2.3