Hello community,
here is the log from the commit of package python-terminado for
openSUSE:Factory checked in at 2017-05-08 19:02:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-terminado (Old)
and /work/SRC/openSUSE:Factory/.python-terminado.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-terminado"
Mon May 8 19:02:26 2017 rev:2 rq:490870 version:0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-terminado/python-terminado.changes
2015-08-21 07:40:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-terminado.new/python-terminado.changes
2017-05-08 19:02:51.861412994 +0200
@@ -1,0 +2,12 @@
+Mon Apr 24 20:55:54 UTC 2017 - toddrme2...@gmail.com
+
+- Fix URL.
+- Implement single-spec version.
+
+-------------------------------------------------------------------
+Sat Apr 8 19:21:31 UTC 2017 - toddrme2...@gmail.com
+
+- Update to 0.6
+ (no upstream changelog)
+
+-------------------------------------------------------------------
Old:
----
terminado-0.5.tar.gz
New:
----
terminado-0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-terminado.spec ++++++
--- /var/tmp/diff_new_pack.0490yP/_old 2017-05-08 19:02:52.773284177 +0200
+++ /var/tmp/diff_new_pack.0490yP/_new 2017-05-08 19:02:52.777283612 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-terminado
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,31 @@
#
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-terminado
-Version: 0.5
+Version: 0.6
Release: 0
Summary: Terminals served to termjs using Tornado websockets
License: BSD-2-Clause
Group: Development/Languages/Python
Url: https://github.com/takluyver/terminado
-Source:
https://pypi.python.org/packages/source/t/terminado/terminado-%{version}.tar.gz
-BuildRequires: python-devel >= 2.7
-BuildRequires: python-nose
-BuildRequires: python-ptyprocess
-BuildRequires: python-tornado
+Source:
https://files.pythonhosted.org/packages/source/t/terminado/terminado-%{version}.tar.gz
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module ptyprocess}
+BuildRequires: %{python_module tornado}
+%if %{with tests}
+BuildRequires: %{python_module nose}
+%endif
Requires: python-ptyprocess
Requires: python-tornado
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
BuildArch: noarch
-%endif
+%python_subpackages
%description
This is a Tornado websocket backend for the term.js Javascript terminal
@@ -49,15 +54,18 @@
%setup -q -n terminado-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%if %{with tests}
%check
-nosetests
+%python_expand nosetests-%{$python_bin_suffix}
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root,-)
%doc README.rst
%{python_sitelib}/*
++++++ terminado-0.5.tar.gz -> terminado-0.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/PKG-INFO new/terminado-0.6/PKG-INFO
--- old/terminado-0.5/PKG-INFO 2015-02-18 23:15:18.000000000 +0100
+++ new/terminado-0.6/PKG-INFO 2016-01-04 15:13:38.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: terminado
-Version: 0.5
+Version: 0.6
Summary: Terminals served to term.js using Tornado websockets
Home-page: https://github.com/takluyver/terminado
Author: Thomas Kluyver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/setup.cfg new/terminado-0.6/setup.cfg
--- old/terminado-0.5/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/terminado-0.6/setup.cfg 2015-12-08 20:25:42.000000000 +0100
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/setup.py new/terminado-0.6/setup.py
--- old/terminado-0.5/setup.py 2015-02-18 23:10:27.000000000 +0100
+++ new/terminado-0.6/setup.py 2016-01-04 15:05:02.000000000 +0100
@@ -4,7 +4,7 @@
readme = f.read()
setup(name="terminado",
- version='0.5',
+ version='0.6',
description="Terminals served to term.js using Tornado websockets",
long_description=readme,
author='Thomas Kluyver',
@@ -22,5 +22,5 @@
"Programming Language :: Python :: 3",
"Topic :: Terminals :: Terminal Emulators/X Terminals",
],
- install_requires=['ptyprocess', 'tornado'],
+ install_requires=['ptyprocess', 'tornado>=4'],
)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/terminado/__init__.py
new/terminado-0.6/terminado/__init__.py
--- old/terminado-0.5/terminado/__init__.py 2015-02-18 23:10:31.000000000
+0100
+++ new/terminado-0.6/terminado/__init__.py 2016-01-04 15:05:02.000000000
+0100
@@ -6,4 +6,4 @@
# Prevent a warning about no attached handlers in Python 2
logging.getLogger(__name__).addHandler(logging.NullHandler())
-__version__ = '0.5'
+__version__ = '0.6'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/terminado/management.py
new/terminado-0.6/terminado/management.py
--- old/terminado-0.5/terminado/management.py 2015-02-18 23:07:06.000000000
+0100
+++ new/terminado-0.6/terminado/management.py 2016-01-04 15:03:54.000000000
+0100
@@ -175,10 +175,9 @@
self.log.info("EOF on FD %d; stopping reading", fd)
del self.ptys_by_fd[fd]
self.ioloop.remove_handler(fd)
- os.close(fd)
-
- # This should reap the child process
- ptywclients.ptyproc.isalive()
+
+ # This closes the fd, and should result in the process being reaped.
+ ptywclients.ptyproc.close()
def pty_read(self, fd, events=None):
"""Called by the event loop when there is pty data ready to read."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminado-0.5/terminado/websocket.py
new/terminado-0.6/terminado/websocket.py
--- old/terminado-0.5/terminado/websocket.py 2015-02-18 02:05:22.000000000
+0100
+++ new/terminado-0.6/terminado/websocket.py 2016-01-04 15:03:54.000000000
+0100
@@ -54,30 +54,11 @@
self.size = (None, None)
self.terminal = None
- self._log = logging.getLogger(__name__)
+ self._logger = logging.getLogger(__name__)
- def origin_check(self):
- """Reject connections from other origin pages.
-
- This is superfluous with Tornado >= 4, as the same check was added to
- Tornado itself. For now, we keep this around for older versions of
- Tornado.
- """
- if "Origin" in self.request.headers:
- origin = self.request.headers.get("Origin")
- else:
- origin = self.request.headers.get("Sec-Websocket-Origin", None)
-
- if not origin:
- return False
-
- host = self.request.headers.get("Host").lower()
- ws_host = urlparse(origin).netloc.lower()
- if host == ws_host:
- return True
- else:
- self._log.error("pyxterm.origin_check: ERROR %s != %s", host,
ws_host)
- return False
+ def origin_check(self, origin=None):
+ """Deprecated: backward-compat for terminado <= 0.5."""
+ return self.check_origin(origin or self.request.headers.get('Origin'))
def open(self, url_component=None):
"""Websocket connection opened.
@@ -85,10 +66,8 @@
Call our terminal manager to get a terminal, and connect to it as a
client.
"""
- if not self.origin_check():
- raise tornado.web.HTTPError(404, "Websocket origin mismatch")
- self._log.info("TermSocket.open: %s", url_component)
+ self._logger.info("TermSocket.open: %s", url_component)
url_component = _cast_unicode(url_component)
self.term_name = url_component or 'tty'
@@ -98,7 +77,7 @@
self.terminal.clients.append(self)
self.send_json_message(["setup", {}])
- self._log.info("TermSocket.open: Opened %s", self.term_name)
+ self._logger.info("TermSocket.open: Opened %s", self.term_name)
def on_pty_read(self, text):
"""Data read from pty; send to frontend"""
@@ -130,7 +109,7 @@
Disconnect from our terminal, and tell the terminal manager we're
disconnecting.
"""
- self._log.info("Websocket closed")
+ self._logger.info("Websocket closed")
if self.terminal:
self.terminal.clients.remove(self)
self.terminal.resize_to_smallest()
