Hello community,
here is the log from the commit of package python-python-ptrace for
openSUSE:Factory checked in at 2019-09-11 10:36:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-ptrace (Old)
and /work/SRC/openSUSE:Factory/.python-python-ptrace.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-ptrace"
Wed Sep 11 10:36:03 2019 rev:4 rq:729809 version:0.9.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-python-ptrace/python-python-ptrace.changes
2017-09-22 21:34:00.883802985 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-ptrace.new.7948/python-python-ptrace.changes
2019-09-11 10:36:05.591284034 +0200
@@ -1,0 +2,7 @@
+Tue Sep 10 11:05:34 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.9.4:
+ * Issue #36: Fix detaching from process object created without
is_attached=True
+ * The project now requires the six module.
+
+-------------------------------------------------------------------
Old:
----
python-ptrace-0.9.3.tar.gz
New:
----
python-ptrace-0.9.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-ptrace.spec ++++++
--- /var/tmp/diff_new_pack.kWRpPO/_old 2019-09-11 10:36:06.047283901 +0200
+++ /var/tmp/diff_new_pack.kWRpPO/_new 2019-09-11 10:36:06.051283900 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-python-ptrace
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,25 +12,26 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define pkg_name python-ptrace
Name: python-%{pkg_name}
-Version: 0.9.3
+Version: 0.9.4
Release: 0
Summary: Python binding for ptrace
-License: GPL-2.0
+License: GPL-2.0-only
Group: Development/Languages/Python
-Url: http://python-ptrace.readthedocs.io/
+URL: https://github.com/vstinner/python-ptrace
Source:
https://github.com/haypo/%{pkg_name}/archive/%{version}.tar.gz#!./%{pkg_name}-%{version}.tar.gz
-BuildRequires: %{python_module base}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module six}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
+Requires: python-six
Requires(post): update-alternatives
Requires(postun): update-alternatives
%python_subpackages
@@ -66,7 +67,7 @@
%python_uninstall_alternative gdb.py
%files %{python_files}
-%doc COPYING
+%license COPYING
%doc README.rst
%doc doc/* examples
%python_alternative %{_bindir}/gdb.py
++++++ python-ptrace-0.9.3.tar.gz -> python-ptrace-0.9.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/.travis.yml
new/python-ptrace-0.9.4/.travis.yml
--- old/python-ptrace-0.9.3/.travis.yml 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/.travis.yml 2019-07-30 17:30:46.000000000 +0200
@@ -4,6 +4,10 @@
- TOXENV=py2
- TOXENV=py3
install: pip install -U tox
+# SYS_PTRACE capability is not available in default containers,
+# use sudo to work around the issue:
+# https://github.com/travis-ci/travis-ci/issues/9033
+sudo: required
script: tox
notifications:
email:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/MANIFEST.in
new/python-ptrace-0.9.4/MANIFEST.in
--- old/python-ptrace-0.9.3/MANIFEST.in 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/MANIFEST.in 2019-07-30 17:30:46.000000000 +0200
@@ -6,6 +6,8 @@
include README.cptrace
include TODO
include tox.ini
+include SYSCALL_PROTOTYPES.codegen.py
+
include cptrace/Makefile
include cptrace/cptrace.c
include cptrace/version.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/README.rst
new/python-ptrace-0.9.4/README.rst
--- old/python-ptrace-0.9.3/README.rst 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/README.rst 2019-07-30 17:30:46.000000000 +0200
@@ -2,13 +2,19 @@
python-ptrace
=============
+.. image:: http://unmaintained.tech/badge.svg
+ :target: http://unmaintained.tech/
+ :alt: No Maintenance Intended
+
.. image:: https://img.shields.io/pypi/v/python-ptrace.svg
:alt: Latest release on the Python Cheeseshop (PyPI)
:target: https://pypi.python.org/pypi/python-ptrace
-.. image:: https://travis-ci.org/haypo/python-ptrace.svg?branch=master
+.. image:: https://travis-ci.org/vstinner/python-ptrace.svg?branch=master
:alt: Build status of python-ptrace on Travis CI
- :target: https://travis-ci.org/haypo/python-ptrace
+ :target: https://travis-ci.org/vstinner/python-ptrace
+
+**This project is no longer maintained and is looking for a new maintainer.**
python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to
trace processes) written in Python.
@@ -16,7 +22,7 @@
* `python-ptrace documentation
<http://python-ptrace.readthedocs.io/>`_
* `python-ptrace at GitHub
- <https://github.com/haypo/python-ptrace>`_
+ <https://github.com/vstinner/python-ptrace>`_
* `python-ptrace at the Python Cheeseshop (PyPI)
<https://pypi.python.org/pypi/python-ptrace>`_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/doc/changelog.rst
new/python-ptrace-0.9.4/doc/changelog.rst
--- old/python-ptrace-0.9.3/doc/changelog.rst 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/doc/changelog.rst 2019-07-30 17:30:46.000000000
+0200
@@ -3,6 +3,13 @@
Changelog
=========
+python-ptrace 0.9.4 (2019-07-30)
+--------------------------------
+
+* Issue #36: Fix detaching from process object created without is_attached=True
+* The project now requires the six module.
+* Project moved to: https://github.com/vstinner/python-ptrace
+
python-ptrace 0.9.3 (2017-09-19)
--------------------------------
@@ -110,7 +117,7 @@
* Create follow, showfollow, resetfollow, xray commands in gdb.py. Patch
written by Dimitris Glynos
-* Project website moved to http://bitbucket.org/haypo/python-ptrace/
+* Project website moved to: ``http://bitbucket.org/haypo/python-ptrace/``
* Replace types (u)intXX_t by c_(u)intXX
* Create MemoryMapping.search() method and MemoryMapping now keeps a weak
reference to the process
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/doc/conf.py
new/python-ptrace-0.9.4/doc/conf.py
--- old/python-ptrace-0.9.3/doc/conf.py 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/doc/conf.py 2019-07-30 17:30:46.000000000 +0200
@@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
-version = release = '0.9.3'
+version = release = '0.9.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/doc/gdb.rst
new/python-ptrace-0.9.4/doc/gdb.rst
--- old/python-ptrace-0.9.3/doc/gdb.rst 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/doc/gdb.rst 2019-07-30 17:30:46.000000000 +0200
@@ -86,7 +86,7 @@
Process ID: 16182
Process command line: [['/bin/ls']
Process|environment: ['TERM=xterm', 'SHELL=/bin/bash', (...)]]
- Process working directory: /home/haypo/prog/fusil/ptrace/trunk
+ Process working directory: /home/vstinner/prog/fusil/ptrace/trunk
(gdb) stack
STACK: 0xbfc58000..0xbfc6e000
STACK -8: 0x00000000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/doc/index.rst
new/python-ptrace-0.9.4/doc/index.rst
--- old/python-ptrace-0.9.3/doc/index.rst 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/doc/index.rst 2019-07-30 17:30:46.000000000
+0200
@@ -2,13 +2,19 @@
python-ptrace
=============
+.. image:: http://unmaintained.tech/badge.svg
+ :target: http://unmaintained.tech/
+ :alt: No Maintenance Intended
+
+**This project is no longer maintained and is looking for a new maintainer.**
+
python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to
trace processes) written in Python.
* `python-ptrace documentation
<http://python-ptrace.readthedocs.io/>`_
* `python-ptrace at GitHub
- <https://github.com/haypo/python-ptrace>`_
+ <https://github.com/vstinner/python-ptrace>`_
* `python-ptrace at the Python Cheeseshop (PyPI)
<https://pypi.python.org/pypi/python-ptrace>`_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/doc/install.rst
new/python-ptrace-0.9.4/doc/install.rst
--- old/python-ptrace-0.9.3/doc/install.rst 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/doc/install.rst 2019-07-30 17:30:46.000000000
+0200
@@ -27,10 +27,10 @@
Download the development version using Git::
- git clone https://github.com/haypo/python-ptrace.git
+ git clone https://github.com/vstinner/python-ptrace.git
`Browse python-ptrace source code
-<https://github.com/haypo/python-ptrace>`_.
+<https://github.com/vstinner/python-ptrace>`_.
python-ptrace dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/gdb.py
new/python-ptrace-0.9.4/gdb.py
--- old/python-ptrace-0.9.3/gdb.py 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/gdb.py 2019-07-30 17:30:46.000000000 +0200
@@ -18,7 +18,7 @@
from ptrace.tools import inverseDict
from ptrace.func_call import FunctionCallOptions
from ptrace.signames import signalName, SIGNAMES
-from ptrace.six import PY3, binary_type
+from six import PY3, binary_type
from signal import SIGTRAP, SIGINT
from ptrace.terminal import enableEchoMode, terminalWidth
from errno import ESRCH
@@ -534,7 +534,7 @@
if not key.startswith("$"):
return 'Register name (%s) have to start with "$"' % key
key = key[1:]
- except ValueError as err:
+ except ValueError:
return "Invalid command: %r" % command
try:
value = self.parseInteger(value)
@@ -594,7 +594,7 @@
self.process.waitSignals(SIGTRAP)
if breakpoint:
breakpoint.desinstall(set_ip=True)
- except:
+ except: # noqa: E722
if breakpoint:
breakpoint.desinstall()
raise
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/debugger/backtrace.py
new/python-ptrace-0.9.4/ptrace/debugger/backtrace.py
--- old/python-ptrace-0.9.3/ptrace/debugger/backtrace.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/debugger/backtrace.py 2019-07-30
17:30:46.000000000 +0200
@@ -1,7 +1,7 @@
from ptrace.ctypes_tools import formatAddress, formatWordHex
from ptrace.cpu_info import CPU_WORD_SIZE, CPU_MAX_UINT
from ptrace import PtraceError
-from ptrace.six.moves import xrange
+from six.moves import xrange
class BacktraceFrame(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/debugger/breakpoint.py
new/python-ptrace-0.9.4/ptrace/debugger/breakpoint.py
--- old/python-ptrace-0.9.3/ptrace/debugger/breakpoint.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/debugger/breakpoint.py 2019-07-30
17:30:46.000000000 +0200
@@ -4,7 +4,7 @@
from weakref import ref
from ptrace.cpu_info import CPU_POWERPC, CPU_WORD_SIZE
from ptrace.ctypes_tools import word2bytes
-from ptrace.six import b
+from six import b
class Breakpoint(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/debugger/child.py
new/python-ptrace-0.9.4/ptrace/debugger/child.py
--- old/python-ptrace-0.9.3/ptrace/debugger/child.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/debugger/child.py 2019-07-30
17:30:46.000000000 +0200
@@ -17,7 +17,7 @@
try:
MAXFD = sysconf("SC_OPEN_MAX")
-except:
+except Exception:
MAXFD = 256
@@ -104,7 +104,7 @@
pass
try:
_execChild(arguments, no_stdout, env)
- except:
+ except: # noqa: E722
exc_type, exc_value, tb = exc_info()
# Save the traceback and attach it to the exception object
exc_lines = format_exception(exc_type, exc_value, tb)
@@ -120,7 +120,7 @@
dup2(null.fileno(), 1)
dup2(1, 2)
null.close()
- except IOError as err:
+ except IOError:
close(2)
close(1)
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/debugger/debugger.py
new/python-ptrace-0.9.4/ptrace/debugger/debugger.py
--- old/python-ptrace-0.9.3/ptrace/debugger/debugger.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/debugger/debugger.py 2019-07-30
17:30:46.000000000 +0200
@@ -91,7 +91,7 @@
% pid)
except ProcessSignal as event:
event.display()
- except:
+ except: # noqa: E722
process.is_attached = False
process.detach()
raise
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/debugger/process.py
new/python-ptrace-0.9.4/ptrace/debugger/process.py
--- old/python-ptrace-0.9.3/ptrace/debugger/process.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/debugger/process.py 2019-07-30
17:30:46.000000000 +0200
@@ -28,7 +28,7 @@
from ptrace.debugger.memory_mapping import readProcessMappings
from ptrace.binding.cpu import CPU_INSTR_POINTER, CPU_STACK_POINTER,
CPU_FRAME_POINTER, CPU_SUB_REGISTERS
from ptrace.debugger.syscall_state import SyscallState
-from ptrace.six import b
+from six import b
if HAS_PTRACE_SINGLESTEP:
from ptrace.binding import ptrace_singlestep
@@ -292,12 +292,8 @@
return
self.is_attached = False
if self.running:
- if self.was_attached:
- info("Detach %s" % self)
- ptrace_detach(self.pid)
- elif self.is_stopped:
- info("Continue process %s execution" % self.pid)
- self.cont()
+ info("Detach %s" % self)
+ ptrace_detach(self.pid)
self.debugger.deleteProcess(process=self)
def _notRunning(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/disasm.py
new/python-ptrace-0.9.4/ptrace/disasm.py
--- old/python-ptrace-0.9.3/ptrace/disasm.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/ptrace/disasm.py 2019-07-30 17:30:46.000000000
+0200
@@ -15,7 +15,7 @@
else:
raise ImportError("CPU not supported")
DISTORM3 = True
- except ImportError as err:
+ except ImportError:
DISTORM3 = False
from ptrace.pydistorm import Decode
if CPU_X86_64:
@@ -71,6 +71,6 @@
raise PtraceError("Unable to disassemble %r" % code)
HAS_DISASSEMBLER = True
-except (ImportError, OSError) as err:
+except (ImportError, OSError):
# OSError if libdistorm64.so doesn't exist
HAS_DISASSEMBLER = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/error.py
new/python-ptrace-0.9.4/ptrace/error.py
--- old/python-ptrace-0.9.3/ptrace/error.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/ptrace/error.py 2019-07-30 17:30:46.000000000
+0200
@@ -19,7 +19,7 @@
for line in trace.split("\n"):
log_func(line.rstrip())
return
- except:
+ except Exception:
pass
log_func("Unable to get backtrace")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/pydistorm.py
new/python-ptrace-0.9.4/ptrace/pydistorm.py
--- old/python-ptrace-0.9.3/ptrace/pydistorm.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/ptrace/pydistorm.py 2019-07-30 17:30:46.000000000
+0200
@@ -9,7 +9,7 @@
"""
from ctypes import cdll, c_long, c_ulong, c_int, c_uint, c_char, POINTER,
Structure, addressof, byref, c_void_p, create_string_buffer, sizeof, cast
-from ptrace.six import binary_type
+from six import binary_type, integer_types
# Define (u)int32_t and (u)int64_t types
int32_t = c_int
@@ -81,7 +81,7 @@
Errors: TypeError, IndexError, MemoryError, ValueError
"""
# Check arguments
- if not isinstance(codeOffset, (int, long)):
+ if not isinstance(codeOffset, integer_types):
raise TypeError("codeOffset have to be an integer")
if not isinstance(code, binary_type):
raise TypeError("code have to be a %s, not %s"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/six.py
new/python-ptrace-0.9.4/ptrace/six.py
--- old/python-ptrace-0.9.3/ptrace/six.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/ptrace/six.py 1970-01-01 01:00:00.000000000
+0100
@@ -1,602 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2013 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <[email protected]>"
-__version__ = "1.4.1"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
- string_types = str,
- integer_types = int,
- class_types = type,
- text_type = str
- binary_type = bytes
-
- MAXSIZE = sys.maxsize
-else:
- string_types = basestring,
- integer_types = (int, long)
- class_types = (type, types.ClassType)
- text_type = unicode
- binary_type = str
-
- if sys.platform.startswith("java"):
- # Jython always uses 32 bits.
- MAXSIZE = int((1 << 31) - 1)
- else:
- # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
- class X(object):
-
- def __len__(self):
- return 1 << 31
- try:
- len(X())
- except OverflowError:
- # 32-bit
- MAXSIZE = int((1 << 31) - 1)
- else:
- # 64-bit
- MAXSIZE = int((1 << 63) - 1)
- del X
-
-
-def _add_doc(func, doc):
- """Add documentation to a function."""
- func.__doc__ = doc
-
-
-def _import_module(name):
- """Import module, returning the module after the last dot."""
- __import__(name)
- return sys.modules[name]
-
-
-class _LazyDescr(object):
-
- def __init__(self, name):
- self.name = name
-
- def __get__(self, obj, tp):
- result = self._resolve()
- setattr(obj, self.name, result)
- # This is a bit ugly, but it avoids running this again.
- delattr(tp, self.name)
- return result
-
-
-class MovedModule(_LazyDescr):
-
- def __init__(self, name, old, new=None):
- super(MovedModule, self).__init__(name)
- if PY3:
- if new is None:
- new = name
- self.mod = new
- else:
- self.mod = old
-
- def _resolve(self):
- return _import_module(self.mod)
-
-
-class MovedAttribute(_LazyDescr):
-
- def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
- super(MovedAttribute, self).__init__(name)
- if PY3:
- if new_mod is None:
- new_mod = name
- self.mod = new_mod
- if new_attr is None:
- if old_attr is None:
- new_attr = name
- else:
- new_attr = old_attr
- self.attr = new_attr
- else:
- self.mod = old_mod
- if old_attr is None:
- old_attr = name
- self.attr = old_attr
-
- def _resolve(self):
- module = _import_module(self.mod)
- return getattr(module, self.attr)
-
-
-class _MovedItems(types.ModuleType):
- """Lazy loading of moved objects"""
-
-
-_moved_attributes = [
- MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
- MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
- MovedAttribute("filterfalse", "itertools", "itertools",
- "ifilterfalse", "filterfalse"),
- MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
- MovedAttribute("map", "itertools", "builtins", "imap", "map"),
- MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
- MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
- MovedAttribute("reduce", "__builtin__", "functools"),
- MovedAttribute("StringIO", "StringIO", "io"),
- MovedAttribute("UserString", "UserString", "collections"),
- MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
- MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
- MovedAttribute("zip_longest", "itertools", "itertools",
- "izip_longest", "zip_longest"),
-
- MovedModule("builtins", "__builtin__"),
- MovedModule("configparser", "ConfigParser"),
- MovedModule("copyreg", "copy_reg"),
- MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
- MovedModule("http_cookies", "Cookie", "http.cookies"),
- MovedModule("html_entities", "htmlentitydefs", "html.entities"),
- MovedModule("html_parser", "HTMLParser", "html.parser"),
- MovedModule("http_client", "httplib", "http.client"),
- MovedModule("email_mime_multipart", "email.MIMEMultipart",
- "email.mime.multipart"),
- MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
- MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
- MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
- MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
- MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
- MovedModule("cPickle", "cPickle", "pickle"),
- MovedModule("queue", "Queue"),
- MovedModule("reprlib", "repr"),
- MovedModule("socketserver", "SocketServer"),
- MovedModule("tkinter", "Tkinter"),
- MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
- MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
- MovedModule("tkinter_scrolledtext", "ScrolledText",
- "tkinter.scrolledtext"),
- MovedModule("tkinter_simpledialog", "SimpleDialog",
- "tkinter.simpledialog"),
- MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
- MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
- MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
- MovedModule("tkinter_colorchooser", "tkColorChooser",
- "tkinter.colorchooser"),
- MovedModule("tkinter_commondialog", "tkCommonDialog",
- "tkinter.commondialog"),
- MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
- MovedModule("tkinter_font", "tkFont", "tkinter.font"),
- MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
- MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
- "tkinter.simpledialog"),
- MovedModule("urllib_parse", __name__ +
- ".moves.urllib_parse", "urllib.parse"),
- MovedModule("urllib_error", __name__ +
- ".moves.urllib_error", "urllib.error"),
- MovedModule("urllib", __name__ + ".moves.urllib",
- __name__ + ".moves.urllib"),
- MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
- MovedModule("winreg", "_winreg"),
-]
-for attr in _moved_attributes:
- setattr(_MovedItems, attr.name, attr)
-del attr
-
-moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
-
-
-class Module_six_moves_urllib_parse(types.ModuleType):
- """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
- MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
- MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
- MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
- MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
- MovedAttribute("urljoin", "urlparse", "urllib.parse"),
- MovedAttribute("urlparse", "urlparse", "urllib.parse"),
- MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
- MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
- MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
- MovedAttribute("quote", "urllib", "urllib.parse"),
- MovedAttribute("quote_plus", "urllib", "urllib.parse"),
- MovedAttribute("unquote", "urllib", "urllib.parse"),
- MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
- MovedAttribute("urlencode", "urllib", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
- setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-sys.modules[__name__ + ".moves.urllib_parse"] = Module_six_moves_urllib_parse(
- __name__ + ".moves.urllib_parse")
-sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse(
- __name__ + ".moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(types.ModuleType):
- """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
- MovedAttribute("URLError", "urllib2", "urllib.error"),
- MovedAttribute("HTTPError", "urllib2", "urllib.error"),
- MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
- setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-sys.modules[__name__ + ".moves.urllib_error"] = Module_six_moves_urllib_error(
- __name__ + ".moves.urllib_error")
-sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error(
- __name__ + ".moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(types.ModuleType):
- """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
- MovedAttribute("urlopen", "urllib2", "urllib.request"),
- MovedAttribute("install_opener", "urllib2", "urllib.request"),
- MovedAttribute("build_opener", "urllib2", "urllib.request"),
- MovedAttribute("pathname2url", "urllib", "urllib.request"),
- MovedAttribute("url2pathname", "urllib", "urllib.request"),
- MovedAttribute("getproxies", "urllib", "urllib.request"),
- MovedAttribute("Request", "urllib2", "urllib.request"),
- MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
- MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
- MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
- MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
- MovedAttribute("HTTPPasswordMgrWithDefaultRealm",
- "urllib2", "urllib.request"),
- MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
- MovedAttribute("FileHandler", "urllib2", "urllib.request"),
- MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
- MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
- MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
- MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
- MovedAttribute("urlretrieve", "urllib", "urllib.request"),
- MovedAttribute("urlcleanup", "urllib", "urllib.request"),
- MovedAttribute("URLopener", "urllib", "urllib.request"),
- MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
- setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-sys.modules[__name__ + ".moves.urllib_request"] =
Module_six_moves_urllib_request(
- __name__ + ".moves.urllib_request")
-sys.modules[__name__ + ".moves.urllib.request"] =
Module_six_moves_urllib_request(
- __name__ + ".moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(types.ModuleType):
- """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
- MovedAttribute("addbase", "urllib", "urllib.response"),
- MovedAttribute("addclosehook", "urllib", "urllib.response"),
- MovedAttribute("addinfo", "urllib", "urllib.response"),
- MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
- setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-sys.modules[__name__ + ".moves.urllib_response"] =
Module_six_moves_urllib_response(
- __name__ + ".moves.urllib_response")
-sys.modules[__name__ + ".moves.urllib.response"] =
Module_six_moves_urllib_response(
- __name__ + ".moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(types.ModuleType):
- """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
- MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
- setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-sys.modules[__name__ + ".moves.urllib_robotparser"] =
Module_six_moves_urllib_robotparser(
- __name__ + ".moves.urllib_robotparser")
-sys.modules[__name__ + ".moves.urllib.robotparser"] =
Module_six_moves_urllib_robotparser(
- __name__ + ".moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
- """Create a six.moves.urllib namespace that resembles the Python 3
namespace"""
- parse = sys.modules[__name__ + ".moves.urllib_parse"]
- error = sys.modules[__name__ + ".moves.urllib_error"]
- request = sys.modules[__name__ + ".moves.urllib_request"]
- response = sys.modules[__name__ + ".moves.urllib_response"]
- robotparser = sys.modules[__name__ + ".moves.urllib_robotparser"]
-
-
-sys.modules[
- __name__ + ".moves.urllib"] = Module_six_moves_urllib(__name__ +
".moves.urllib")
-
-
-def add_move(move):
- """Add an item to six.moves."""
- setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
- """Remove item from six.moves."""
- try:
- delattr(_MovedItems, name)
- except AttributeError:
- try:
- del moves.__dict__[name]
- except KeyError:
- raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
- _meth_func = "__func__"
- _meth_self = "__self__"
-
- _func_closure = "__closure__"
- _func_code = "__code__"
- _func_defaults = "__defaults__"
- _func_globals = "__globals__"
-
- _iterkeys = "keys"
- _itervalues = "values"
- _iteritems = "items"
- _iterlists = "lists"
-else:
- _meth_func = "im_func"
- _meth_self = "im_self"
-
- _func_closure = "func_closure"
- _func_code = "func_code"
- _func_defaults = "func_defaults"
- _func_globals = "func_globals"
-
- _iterkeys = "iterkeys"
- _itervalues = "itervalues"
- _iteritems = "iteritems"
- _iterlists = "iterlists"
-
-
-try:
- advance_iterator = next
-except NameError:
- def advance_iterator(it):
- return it.next()
-next = advance_iterator
-
-
-try:
- callable = callable
-except NameError:
- def callable(obj):
- return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
- def get_unbound_function(unbound):
- return unbound
-
- create_bound_method = types.MethodType
-
- Iterator = object
-else:
- def get_unbound_function(unbound):
- return unbound.im_func
-
- def create_bound_method(func, obj):
- return types.MethodType(func, obj, obj.__class__)
-
- class Iterator(object):
-
- def next(self):
- return type(self).__next__(self)
-
- callable = callable
-_add_doc(get_unbound_function,
- """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-def iterkeys(d, **kw):
- """Return an iterator over the keys of a dictionary."""
- return iter(getattr(d, _iterkeys)(**kw))
-
-
-def itervalues(d, **kw):
- """Return an iterator over the values of a dictionary."""
- return iter(getattr(d, _itervalues)(**kw))
-
-
-def iteritems(d, **kw):
- """Return an iterator over the (key, value) pairs of a dictionary."""
- return iter(getattr(d, _iteritems)(**kw))
-
-
-def iterlists(d, **kw):
- """Return an iterator over the (key, [values]) pairs of a dictionary."""
- return iter(getattr(d, _iterlists)(**kw))
-
-
-if PY3:
- def b(s):
- return s.encode("latin-1")
-
- def u(s):
- return s
- unichr = chr
- if sys.version_info[1] <= 1:
- def int2byte(i):
- return bytes((i,))
- else:
- # This is about 2x faster than the implementation above on 3.2+
- int2byte = operator.methodcaller("to_bytes", 1, "big")
- byte2int = operator.itemgetter(0)
- indexbytes = operator.getitem
- iterbytes = iter
- import io
- StringIO = io.StringIO
- BytesIO = io.BytesIO
-else:
- def b(s):
- return s
-
- def u(s):
- return unicode(s, "unicode_escape")
- unichr = unichr
- int2byte = chr
-
- def byte2int(bs):
- return ord(bs[0])
-
- def indexbytes(buf, i):
- return ord(buf[i])
-
- def iterbytes(buf):
- return (ord(byte) for byte in buf)
- import StringIO
- StringIO = BytesIO = StringIO.StringIO
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-if PY3:
- import builtins
- exec_ = getattr(builtins, "exec")
-
- def reraise(tp, value, tb=None):
- if value.__traceback__ is not tb:
- raise value.with_traceback(tb)
- raise value
-
- print_ = getattr(builtins, "print")
- del builtins
-
-else:
- def exec_(_code_, _globs_=None, _locs_=None):
- """Execute code in a namespace."""
- if _globs_ is None:
- frame = sys._getframe(1)
- _globs_ = frame.f_globals
- if _locs_ is None:
- _locs_ = frame.f_locals
- del frame
- elif _locs_ is None:
- _locs_ = _globs_
- exec("""exec _code_ in _globs_, _locs_""")
-
- exec_("""def reraise(tp, value, tb=None):
- raise tp, value, tb
-""")
-
- def print_(*args, **kwargs):
- """The new-style print function."""
- fp = kwargs.pop("file", sys.stdout)
- if fp is None:
- return
-
- def write(data):
- if not isinstance(data, basestring):
- data = str(data)
- fp.write(data)
- want_unicode = False
- sep = kwargs.pop("sep", None)
- if sep is not None:
- if isinstance(sep, unicode):
- want_unicode = True
- elif not isinstance(sep, str):
- raise TypeError("sep must be None or a string")
- end = kwargs.pop("end", None)
- if end is not None:
- if isinstance(end, unicode):
- want_unicode = True
- elif not isinstance(end, str):
- raise TypeError("end must be None or a string")
- if kwargs:
- raise TypeError("invalid keyword arguments to print()")
- if not want_unicode:
- for arg in args:
- if isinstance(arg, unicode):
- want_unicode = True
- break
- if want_unicode:
- newline = unicode("\n")
- space = unicode(" ")
- else:
- newline = "\n"
- space = " "
- if sep is None:
- sep = space
- if end is None:
- end = newline
- for i, arg in enumerate(args):
- if i:
- write(sep)
- write(arg)
- write(end)
-
-_add_doc(reraise, """Reraise an exception.""")
-
-
-def with_metaclass(meta, *bases):
- """Create a base class with a metaclass."""
- return meta("NewBase", bases, {})
-
-
-def add_metaclass(metaclass):
- """Class decorator for creating a class with a metaclass."""
- def wrapper(cls):
- orig_vars = cls.__dict__.copy()
- orig_vars.pop('__dict__', None)
- orig_vars.pop('__weakref__', None)
- for slots_var in orig_vars.get('__slots__', ()):
- orig_vars.pop(slots_var)
- return metaclass(cls.__name__, cls.__bases__, orig_vars)
- return wrapper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-ptrace-0.9.3/ptrace/syscall/syscall_argument.py
new/python-ptrace-0.9.4/ptrace/syscall/syscall_argument.py
--- old/python-ptrace-0.9.3/ptrace/syscall/syscall_argument.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/ptrace/syscall/syscall_argument.py 2019-07-30
17:30:46.000000000 +0200
@@ -13,7 +13,9 @@
from ptrace.syscall.socketcall_constants import SOCKETCALL
import os
import re
-from ptrace import six
+
+import six
+
from ptrace.os_tools import RUNNING_LINUX, RUNNING_FREEBSD
from ptrace.syscall import FILENAME_ARGUMENTS, DIRFD_ARGUMENTS
from ptrace.syscall.socketcall_constants import formatSocketType
@@ -26,6 +28,7 @@
else:
SYSCALL_ARG_DICT = {}
+
KNOWN_STRUCTS = []
if RUNNING_LINUX:
KNOWN_STRUCTS.extend(
@@ -134,7 +137,7 @@
return formatAddress(self.value)
# Array like "int[2]"
- match = re.match("(.*)\[([0-9])+\]", argtype)
+ match = re.match(r"(.*)\[([0-9])+\]", argtype)
if match:
basetype = match.group(1)
count = int(match.group(2))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/ptrace/version.py
new/python-ptrace-0.9.4/ptrace/version.py
--- old/python-ptrace-0.9.3/ptrace/version.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/ptrace/version.py 2019-07-30 17:30:46.000000000
+0200
@@ -1,4 +1,4 @@
PACKAGE = "python-ptrace"
-VERSION = "0.9.3"
+VERSION = "0.9.4"
WEBSITE = "http://python-ptrace.readthedocs.io/";
LICENSE = "GNU GPL v2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/runtests.py
new/python-ptrace-0.9.4/runtests.py
--- old/python-ptrace-0.9.3/runtests.py 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/runtests.py 2019-07-30 17:30:46.000000000 +0200
@@ -103,9 +103,9 @@
if os.path.isdir(path):
files.extend(list_dir('{0}{1}.'.format(prefix, name), path))
else:
- if (name != '__init__.py' and
- name.endswith(suffix) and
- not name.startswith(('.', '_'))):
+ if (name != '__init__.py'
+ and name.endswith(suffix)
+ and not name.startswith(('.', '_'))):
files.append(('{0}{1}'.format(prefix, name[:-3]), path))
return files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/setup.cfg
new/python-ptrace-0.9.4/setup.cfg
--- old/python-ptrace-0.9.3/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/python-ptrace-0.9.4/setup.cfg 2019-07-30 17:30:46.000000000 +0200
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/setup.py
new/python-ptrace-0.9.4/setup.py
--- old/python-ptrace-0.9.3/setup.py 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/setup.py 2019-07-30 17:30:46.000000000 +0200
@@ -8,16 +8,17 @@
# - check that "python setup.py sdist" contains all files tracked by
# the SCM (Git): update MANIFEST.in if needed
# - git commit -a -m "prepare release VERSION"
+# - Remove untracked files/dirs: git clean -fdx
# - run tests, type: tox
# - git push
# - check Travis status:
-# https://travis-ci.org/haypo/python-ptrace
+# https://travis-ci.org/vstinner/python-ptrace
#
# Release a new version:
#
# - git tag python-ptrace-VERSION
# - git push --tags
-# - rm -rf dist/
+# - Remove untracked files/dirs: git clean -fdx
# - python3 setup.py sdist bdist_wheel
# - twine upload dist/*
#
@@ -44,7 +45,7 @@
CLASSIFIERS = [
'Intended Audience :: Developers',
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 7 - Inactive',
'Environment :: Console',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Operating System :: OS Independent',
@@ -74,6 +75,7 @@
"packages": list(PACKAGES.keys()),
"package_dir": PACKAGES,
"scripts": SCRIPTS,
+ "install_requires": ["six"],
}
setup(**install_options)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/tests/test_gdb.py
new/python-ptrace-0.9.4/tests/test_gdb.py
--- old/python-ptrace-0.9.3/tests/test_gdb.py 2017-09-19 11:00:47.000000000
+0200
+++ new/python-ptrace-0.9.4/tests/test_gdb.py 2019-07-30 17:30:46.000000000
+0200
@@ -4,7 +4,8 @@
import subprocess
import sys
import unittest
-from ptrace import six
+
+import six
GDB = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', 'gdb.py'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/tests/test_strace.py
new/python-ptrace-0.9.4/tests/test_strace.py
--- old/python-ptrace-0.9.3/tests/test_strace.py 2017-09-19
11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/tests/test_strace.py 2019-07-30
17:30:46.000000000 +0200
@@ -5,7 +5,9 @@
import sys
import tempfile
import unittest
-from ptrace import six
+
+import six
+
STRACE = os.path.normpath(os.path.join(
os.path.dirname(__file__), '..', 'strace.py'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ptrace-0.9.3/tox.ini
new/python-ptrace-0.9.4/tox.ini
--- old/python-ptrace-0.9.3/tox.ini 2017-09-19 11:00:47.000000000 +0200
+++ new/python-ptrace-0.9.4/tox.ini 2019-07-30 17:30:46.000000000 +0200
@@ -2,12 +2,13 @@
envlist = py2, py3, pep8
[testenv]
+basepython = python3
commands=
python test_doc.py
python runtests.py
[testenv:py2]
-basepython = python
+basepython = python2
[testenv:py3]
basepython = python3
