From adc8dff01f1f7d6e739869bd370b98d8cc16256e Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Mon, 21 Jul 2014 03:34:19 +0200 Subject: [PATCH] Imported Upstream version 0.5.2 --- Makefile | 12 ++++++++---- NEWS | 9 +++++++++ PKG-INFO | 2 +- README | 6 +++--- doc/conf.py | 6 +++--- doc/index.rst | 2 +- pyxattr.egg-info/PKG-INFO | 2 +- setup.py | 11 ++++++++--- test/test_xattr.py | 2 +- xattr.c | 6 +++--- 10 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 2fb3d2e..97cad8c 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,16 @@ dist: fakeroot ./setup.py sdist test: - for ver in 2.4 2.5 2.6 2.7 3.0 3.1 3.2; do \ + @for ver in 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3; do \ if type python$$ver >/dev/null; then \ echo Testing with python$$ver; \ - python$$ver ./setup.py test; \ - fi; \ - done + python$$ver ./setup.py test -q; \ + fi; \ + done; + @if type pypy >/dev/null; then \ + echo Testing with pypy; \ + pypy ./setup.py test -q; \ + fi clean: rm -rf $(DOCHTML) $(DOCTREES) diff --git a/NEWS b/NEWS index aace59c..84d4ca4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,15 @@ News ==== +Version 0.5.2 +------------- + +Bug-fix release. Thanks to Michał Górny, it looked like the library had +problem running under pypy, but actually there was a bug in the +PyArg_ParseTuple use of et# (signed vs. unsigned, and lack of compiler +warnings). This was fixed, and now the test suite passed with many +CPython versions and PyPy (version 1.9). + Version 0.5.1 ------------- diff --git a/PKG-INFO b/PKG-INFO index 15f09a5..c63cad3 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyxattr -Version: 0.5.1 +Version: 0.5.2 Summary: Filesystem extended attributes for python Home-page: http://pyxattr.k1024.org/ Author: Iustin Pop diff --git a/README b/README index dfa7578..5988580 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ This is the pyxattr module, a Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems. -Downloads: go to https://github.com/iustin/pyxattr/downloads. Latest -version is 0.5.1. The source repository is either at +Downloads: go to http://pyxattr.k1024.org/downloads/. Latest +version is 0.5.2. The source repository is either at http://git.k1024.org/pyxattr.git or at https://github.com/iustin/pyxattr. @@ -24,7 +24,7 @@ installed in order to build and install the module. License ------- -pyxattr is Copyright 2002-2008, 2012 Iustin Pop. +pyxattr is Copyright 2002-2008, 2012, 2013 Iustin Pop. pyxattr is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free diff --git a/doc/conf.py b/doc/conf.py index 0031d00..0d2e64b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -41,16 +41,16 @@ master_doc = 'index' # General information about the project. project = u'pyxattr' -copyright = u'2002, 2003, 2006, 2008, 2012, Iustin Pop' +copyright = u'2002, 2003, 2006, 2008, 2012, 2013, Iustin Pop' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.5.1' +version = '0.5.2' # The full version, including alpha/beta/rc tags. -release = '0.5.1' +release = '0.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/index.rst b/doc/index.rst index 336e191..e639155 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,5 +1,5 @@ ====================================== - Welcome to pylibacl's documentation! + Welcome to pyxattr's documentation! ====================================== .. include:: ../README diff --git a/pyxattr.egg-info/PKG-INFO b/pyxattr.egg-info/PKG-INFO index 15f09a5..c63cad3 100644 --- a/pyxattr.egg-info/PKG-INFO +++ b/pyxattr.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyxattr -Version: 0.5.1 +Version: 0.5.2 Summary: Filesystem extended attributes for python Home-page: http://pyxattr.k1024.org/ Author: Iustin Pop diff --git a/setup.py b/setup.py index 17326bc..c18e054 100755 --- a/setup.py +++ b/setup.py @@ -1,12 +1,15 @@ #!/usr/bin/python import distutils -from setuptools import setup, Extension +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup, Extension long_desc = """This is a C extension module for Python which implements extended attributes manipulation. It is a wrapper on top of the attr C library - see attr(5).""" -version = "0.5.1" +version = "0.5.2" author = "Iustin Pop" author_email = "iusty@k1024.org" macros = [ @@ -25,7 +28,9 @@ setup(name = "pyxattr", license = "LGPL", ext_modules = [Extension("xattr", ["xattr.c"], libraries=["attr"], - define_macros=macros)], + define_macros=macros, + extra_compile_args=["-Wall", "-Werror"], + )], test_suite = "test", platforms = ["Linux"], ) diff --git a/test/test_xattr.py b/test/test_xattr.py index 8df00b9..0bca576 100644 --- a/test/test_xattr.py +++ b/test/test_xattr.py @@ -12,7 +12,7 @@ from xattr import NS_USER, XATTR_CREATE, XATTR_REPLACE if sys.hexversion >= 0x03000000: PY3K = True - EMPTY_NS = b'' + EMPTY_NS = bytes() else: PY3K = False EMPTY_NS = '' diff --git a/xattr.c b/xattr.c index f88d116..57257bb 100644 --- a/xattr.c +++ b/xattr.c @@ -1,7 +1,7 @@ /* xattr - a python module for manipulating filesystem extended attributes - Copyright (C) 2002, 2003, 2006, 2008, 2012 Iustin Pop + Copyright (C) 2002, 2003, 2006, 2008, 2012, 2013 Iustin Pop This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -593,7 +593,7 @@ pysetxattr(PyObject *self, PyObject *args) int nofollow = 0; char *attrname = NULL; char *buf = NULL; - Py_ssize_t bufsize; + int bufsize; int nret; int flags = 0; target_t tgt; @@ -659,7 +659,7 @@ xattr_set(PyObject *self, PyObject *args, PyObject *keywds) int nofollow = 0; char *attrname = NULL; char *buf = NULL; - Py_ssize_t bufsize; + int bufsize; int nret; int flags = 0; target_t tgt; -- 2.39.2