Merge 28627198ba into e9008dcbd1

gixy/core/regexp.py

@@ -3,7 +3,11 @@ import logging
 import re
 import random
 import itertools
-from cached_property import cached_property
+
+try:
+    from functools import cached_property
+except ImportError:
+    from cached_property import cached_property
 
 import gixy.core.sre_parse.sre_parse as sre_parse
 

gixy/directives/block.py

@@ -1,4 +1,7 @@
-from cached_property import cached_property
+try:
+    from functools import cached_property
+except ImportError:
+    from cached_property import cached_property
 
 from gixy.directives.directive import Directive
 from gixy.core.variable import Variable

gixy/parser/raw_parser.py

@@ -1,7 +1,11 @@
 import logging
 import codecs
 import six
-from cached_property import cached_property
+
+try:
+    from functools import cached_property
+except ImportError:
+    from cached_property import cached_property
 
 from pyparsing import (
     Literal, Suppress, White, Word, alphanums, Forward, Group, Optional, Combine,

requirements.txt

@@ -1,6 +1,6 @@
 pyparsing>=1.5.5
-cached-property>=1.2.0
+cached-property>=1.2.0;python_version<"3.8"
 argparse>=1.4.0
 six>=1.1.0
 Jinja2>=2.8
-ConfigArgParse>=0.11.0
+ConfigArgParse>=0.11.0

setup.py

@@ -18,7 +18,7 @@ setup(
     url='https://github.com/yandex/gixy',
     install_requires=[
         'pyparsing>=1.5.5',
-        'cached-property>=1.2.0',
+        'cached-property>=1.2.0;python_version<"3.8"',
         'argparse>=1.4.0;python_version<"3.2"',
         'six>=1.1.0',
         'Jinja2>=2.8',