Merge branch 'main' into fix/npm-dep

beautifier · Mar 29, 2022 · 2734177 · 2734177
2 parents 24a4a9d + 66a95b0
commit 2734177
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,10 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu, windows, macos ]
-        python-version: [2.7, 3.7, 3.8, 3.9, '3.10']
+        python-version: [3.7, 3.8, 3.9, '3.10']
         include:
-          - python-version: 2.7 
-            node-version: 12
           - python-version: 3.7 
             node-version: 12
           - python-version: 3.8 

diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ $(BUILD_DIR)/virtualenv: | $(BUILD_DIR)
 	virtualenv --version || pip install virtualenv
 	virtualenv build/python-dev
 	virtualenv build/python-rel
-	$(SCRIPT_DIR)/python-dev3 pip install black==21.12b0
+	$(SCRIPT_DIR)/python-dev3 pip install black
 	@touch $(BUILD_DIR)/virtualenv
 
 

diff --git a/python/jsbeautifier/javascript/beautifier.py b/python/jsbeautifier/javascript/beautifier.py
@@ -1462,16 +1462,12 @@ def handle_operator(self, current_token):
             elif self._flags.last_token.type == TOKEN.OPERATOR:
                 # a++ + ++b
                 # a - -b
-                space_before = (
-                    current_token.text
-                    in [
-                        "--",
-                        "-",
-                        "++",
-                        "+",
-                    ]
-                    and self._flags.last_token.text in ["--", "-", "++", "+"]
-                )
+                space_before = current_token.text in [
+                    "--",
+                    "-",
+                    "++",
+                    "+",
+                ] and self._flags.last_token.text in ["--", "-", "++", "+"]
                 # + and - are not unary when preceeded by -- or ++ operator
                 # a-- + b
                 # a * +b

diff --git a/python/jsbeautifier/unpackers/packer.py b/python/jsbeautifier/unpackers/packer.py
@@ -157,5 +157,5 @@ def _dictunbaser(self, string):
         """Decodes a  value to an integer."""
         ret = 0
         for index, cipher in enumerate(string[::-1]):
-            ret += (self.base ** index) * self.dictionary[cipher]
+            ret += (self.base**index) * self.dictionary[cipher]
         return ret
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ['py27', 'py36', 'py37', 'py38']
+target-version = ['py33', 'py36', 'py37', 'py38']
 exclude = '''
 /(
     \.eggs