Hello community,
here is the log from the commit of package python-jsbeautifier for
openSUSE:Factory checked in at 2020-03-04 09:43:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jsbeautifier (Old)
and /work/SRC/openSUSE:Factory/.python-jsbeautifier.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jsbeautifier"
Wed Mar 4 09:43:51 2020 rev:6 rq:781196 version:1.10.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jsbeautifier/python-jsbeautifier.changes
2019-09-13 14:58:59.065278929 +0200
+++
/work/SRC/openSUSE:Factory/.python-jsbeautifier.new.26092/python-jsbeautifier.changes
2020-03-04 09:44:35.406078276 +0100
@@ -1,0 +2,6 @@
+Tue Mar 3 12:05:39 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Update to 1.10.3:
+ * minor fixes
+
+-------------------------------------------------------------------
Old:
----
jsbeautifier-1.10.2.tar.gz
New:
----
jsbeautifier-1.10.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jsbeautifier.spec ++++++
--- /var/tmp/diff_new_pack.SpybrT/_old 2020-03-04 09:44:35.942078597 +0100
+++ /var/tmp/diff_new_pack.SpybrT/_new 2020-03-04 09:44:35.946078599 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-jsbeautifier
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,26 +18,25 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jsbeautifier
-Version: 1.10.2
+Version: 1.10.3
Release: 0
Summary: JavaScript unobfuscator and beautifier
License: MIT
-Group: Development/Languages/Python
-URL: http://jsbeautifier.org
+URL: https://jsbeautifier.org
Source0:
https://files.pythonhosted.org/packages/source/j/jsbeautifier/jsbeautifier-%{version}.tar.gz
# https://github.com/beautify-web/js-beautify/issues/1674
Source1:
https://raw.githubusercontent.com/beautify-web/js-beautify/master/LICENSE
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-EditorConfig >= 0.12.0
+Requires: python-EditorConfig >= 0.12.2
Requires: python-setuptools
-Requires: python-six >= 1.6.1
+Requires: python-six >= 1.13.0
BuildArch: noarch
# SECTION test requirements
-BuildRequires: %{python_module EditorConfig >= 0.12.0}
+BuildRequires: %{python_module EditorConfig >= 0.12.2}
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module six >= 1.6.1}
+BuildRequires: %{python_module six >= 1.13.0}
# /SECTION
%python_subpackages
@@ -56,7 +55,8 @@
%{python_expand %fdupes %{buildroot}%{$python_sitelib}}
%check
-%python_exec setup.py test
+%pytest jsbeautifier/tests/testindentation.py
+%pytest jsbeautifier/tests/generated/tests.py
%files %{python_files}
%license LICENSE
++++++ jsbeautifier-1.10.2.tar.gz -> jsbeautifier-1.10.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/PKG-INFO
new/jsbeautifier-1.10.3/PKG-INFO
--- old/jsbeautifier-1.10.2/PKG-INFO 2019-08-06 20:14:40.000000000 +0200
+++ new/jsbeautifier-1.10.3/PKG-INFO 2020-01-14 20:02:12.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: jsbeautifier
-Version: 1.10.2
+Version: 1.10.3
Summary: JavaScript unobfuscator and beautifier.
Home-page: https://beautifier.io
Author: Liam Newman, Einar Lielmanis, et al.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/jsbeautifier/__init__.py
new/jsbeautifier-1.10.3/jsbeautifier/__init__.py
--- old/jsbeautifier-1.10.2/jsbeautifier/__init__.py 2019-06-06
19:35:11.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier/__init__.py 2020-01-14
20:00:30.000000000 +0100
@@ -129,7 +129,7 @@
import msvcrt
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
else:
- raise 'Pipe to stdin not supported on Windows with Python 2.x
64-bit.'
+ raise Exception('Pipe to stdin not supported on Windows with
Python 2.x 64-bit.')
input_string = stream.read()
@@ -137,7 +137,7 @@
if input_string == '':
raise MissingInputStreamError()
else:
- stream = io.open(file_name, 'rt', newline='')
+ stream = io.open(file_name, 'rt', newline='', encoding='UTF-8')
input_string = stream.read()
return beautify(input_string, opts)
@@ -232,7 +232,7 @@
argv = sys.argv[1:]
try:
- opts, args = getopt.getopt(argv, "f:s:c:e:o:rdEPjabkil:xhtvXnCO:w:",
+ opts, args = getopt.getopt(argv, "f:s:c:e:o:rdEPjab:kil:xhtvXnCO:w:m:",
['file=', 'indent-size=', 'indent-char=',
'eol=', 'outfile=', 'replace', 'disable-preserve-newlines',
'space-in-paren', 'space-in-empty-paren',
'jslint-happy', 'space-after-anon-function',
'brace-style=', 'indent-level=',
'unescape-strings',
@@ -272,15 +272,17 @@
js_options.indent_with_tabs = True
elif opt in ('--disable-preserve-newlines', '-d'):
js_options.preserve_newlines = False
+ elif opt in ('--max-preserve-newlines', '-m'):
+ js_options.max_preserve_newlines = int(arg)
elif opt in ('--space-in-paren', '-P'):
js_options.space_in_paren = True
elif opt in ('--space-in-empty-paren', '-E'):
js_options.space_in_empty_paren = True
elif opt in ('--jslint-happy', '-j'):
js_options.jslint_happy = True
- elif opt in ('--space_after_anon_function', '-a'):
+ elif opt in ('--space-after-anon-function', '-a'):
js_options.space_after_anon_function = True
- elif opt in ('--space_after_named_function'):
+ elif opt in ('--space-after-named-function'):
js_options.space_after_named_function = True
elif opt in ('--eval-code'):
js_options.eval_code = True
@@ -336,7 +338,7 @@
sys.version_info.major == 3 and
sys.version_info.minor <= 4):
if '**' in filepath_param:
- raise 'Recursive globs not supported on Python <= 3.4.'
+ raise Exception('Recursive globs not supported on
Python <= 3.4.')
filepaths.extend(glob.glob(filepath_param))
else:
filepaths.extend(glob.glob(filepath_param, recursive=True))
@@ -390,7 +392,7 @@
import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
else:
- raise 'Pipe to stdout not supported on Windows with
Python 2.x 64-bit.'
+ raise Exception('Pipe to stdout not supported on
Windows with Python 2.x 64-bit.')
stream.write(pretty)
else:
@@ -399,7 +401,7 @@
# python automatically converts newlines in text to "\r\n"
when on windows
# set newline to empty to prevent this
- with io.open(outfile, 'wt', newline='') as f:
+ with io.open(outfile, 'wt', newline='', encoding='UTF-8')
as f:
print('beautified ' + outfile, file=sys.stdout)
try:
f.write(pretty)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/jsbeautifier/__version__.py
new/jsbeautifier-1.10.3/jsbeautifier/__version__.py
--- old/jsbeautifier-1.10.2/jsbeautifier/__version__.py 2019-08-06
20:12:39.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier/__version__.py 2020-01-14
20:00:30.000000000 +0100
@@ -1 +1 @@
-__version__ = '1.10.2'
+__version__ = '1.10.3'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/jsbeautifier/javascript/acorn.py
new/jsbeautifier-1.10.3/jsbeautifier/javascript/acorn.py
--- old/jsbeautifier-1.10.2/jsbeautifier/javascript/acorn.py 2019-06-06
19:35:11.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier/javascript/acorn.py 2020-01-14
20:00:30.000000000 +0100
@@ -20,11 +20,11 @@
# acorn used char codes to squeeze the last bit of performance out
# Beautifier is okay without that, so we're using regex
-# permit $ (36) and @ (64). @ is used in ES7 decorators.
+# permit #(23), $ (36), and @ (64). @ is used in ES7 decorators.
# 65 through 91 are uppercase letters.
# permit _ (95).
# 97 through 123 are lowercase letters.
-_baseASCIIidentifierStartChars = six.u(r"\x24\x40\x41-\x5a\x5f\x61-\x7a")
+_baseASCIIidentifierStartChars = six.u(r"\x23\x24\x40\x41-\x5a\x5f\x61-\x7a")
# inside an identifier @ is not allowed but 0-9 are.
_baseASCIIidentifierChars = six.u(r"\x24\x30-\x39\x41-\x5a\x5f\x61-\x7a")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jsbeautifier-1.10.2/jsbeautifier/javascript/tokenizer.py
new/jsbeautifier-1.10.3/jsbeautifier/javascript/tokenizer.py
--- old/jsbeautifier-1.10.2/jsbeautifier/javascript/tokenizer.py
2019-06-06 19:35:11.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier/javascript/tokenizer.py
2020-01-14 20:00:30.000000000 +0100
@@ -191,13 +191,13 @@
if c is None:
token = self._create_token(TOKEN.EOF, '')
+ token = token or self._read_non_javascript(c)
token = token or self._read_string(c)
token = token or self._read_word(previous_token)
token = token or self._read_singles(c)
token = token or self._read_comment(c)
token = token or self._read_regexp(c, previous_token)
token = token or self._read_xml(c, previous_token)
- token = token or self._read_non_javascript(c)
token = token or self._read_punctuation()
token = token or self._create_token(TOKEN.UNKNOWN, self._input.next())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jsbeautifier-1.10.2/jsbeautifier/tests/generated/tests.py
new/jsbeautifier-1.10.3/jsbeautifier/tests/generated/tests.py
--- old/jsbeautifier-1.10.2/jsbeautifier/tests/generated/tests.py
2019-08-06 20:14:03.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier/tests/generated/tests.py
2020-01-14 20:01:47.000000000 +0100
@@ -212,6 +212,25 @@
#============================================================
+ # Private Class Fields
+ self.reset_options()
+ bt('#foo')
+ bt(
+ 'class X {\n' +
+ ' #foo = null;\n' +
+ ' get foo() {\n' +
+ ' return this.#foo;\n' +
+ ' }\n' +
+ '}')
+ bt(
+ 'class X {#foo=null;}',
+ # -- output --
+ 'class X {\n' +
+ ' #foo = null;\n' +
+ '}')
+
+
+ #============================================================
# ES7 Decorators
self.reset_options()
bt('@foo')
@@ -6230,13 +6249,13 @@
# Issue 508
bt('set["name"]')
bt('get["name"]')
- bt(
+ test_fragment(
'a = {\n' +
' set b(x) {},\n' +
' c: 1,\n' +
' d: function() {}\n' +
'};')
- bt(
+ test_fragment(
'a = {\n' +
' get b() {\n' +
' retun 0;\n' +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/jsbeautifier.egg-info/PKG-INFO
new/jsbeautifier-1.10.3/jsbeautifier.egg-info/PKG-INFO
--- old/jsbeautifier-1.10.2/jsbeautifier.egg-info/PKG-INFO 2019-08-06
20:14:39.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier.egg-info/PKG-INFO 2020-01-14
20:02:11.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: jsbeautifier
-Version: 1.10.2
+Version: 1.10.3
Summary: JavaScript unobfuscator and beautifier.
Home-page: https://beautifier.io
Author: Liam Newman, Einar Lielmanis, et al.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jsbeautifier-1.10.2/jsbeautifier.egg-info/requires.txt
new/jsbeautifier-1.10.3/jsbeautifier.egg-info/requires.txt
--- old/jsbeautifier-1.10.2/jsbeautifier.egg-info/requires.txt 2019-08-06
20:14:39.000000000 +0200
+++ new/jsbeautifier-1.10.3/jsbeautifier.egg-info/requires.txt 2020-01-14
20:02:11.000000000 +0100
@@ -1,2 +1,2 @@
-six>=1.12.0
+six>=1.13.0
editorconfig>=0.12.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jsbeautifier-1.10.2/setup.py
new/jsbeautifier-1.10.3/setup.py
--- old/jsbeautifier-1.10.2/setup.py 2019-08-06 20:12:39.000000000 +0200
+++ new/jsbeautifier-1.10.3/setup.py 2020-01-14 20:00:30.000000000 +0100
@@ -44,7 +44,7 @@
'jsbeautifier.core',
'jsbeautifier.javascript',
'jsbeautifier.unpackers', 'jsbeautifier.unpackers.tests'],
- install_requires=["six>=1.12.0", "editorconfig>=0.12.2"],
+ install_requires=["six>=1.13.0", "editorconfig>=0.12.2"],
license='MIT',
test_suite='pytest.collector',
cmdclass={'test': PyTest},
