Hello community, here is the log from the commit of package python3-smbc for openSUSE:Factory checked in at 2015-01-20 12:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-smbc (Old) and /work/SRC/openSUSE:Factory/.python3-smbc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-smbc" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-smbc/python3-smbc.changes 2014-07-16 16:22:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-smbc.new/python3-smbc.changes 2015-01-20 12:37:32.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Jan 17 18:16:22 UTC 2015 - [email protected] + +- specfile: update copyright year + +- removed pre_checking.sh: edited python-* files into python3 files, + but we only use python3 files to begin with nowadays + +- update to version 1.0.15.3: + * added smbc.ConnectionRefusedError + +- changes from version 1.0.15.1: + * Return direntry with unicode string + +- changes from version 1.0.15: + * Working with Python3 + +------------------------------------------------------------------- Old: ---- pre_checkin.sh pysmbc-1.0.14.1.tar.bz2 New: ---- pysmbc-1.0.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-smbc.spec ++++++ --- /var/tmp/diff_new_pack.ilQ4w4/_old 2015-01-20 12:37:34.000000000 +0100 +++ /var/tmp/diff_new_pack.ilQ4w4/_new 2015-01-20 12:37:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-smbc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-smbc BuildRequires: libsmbclient-devel -BuildRequires: python3-devel BuildRequires: pkg-config -Version: 1.0.14.1 +BuildRequires: python3-devel +Version: 1.0.15.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://cyberelk.net/tim/software/pysmbc/ ++++++ pysmbc-1.0.14.1.tar.bz2 -> pysmbc-1.0.15.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/NEWS new/pysmbc-1.0.15.3/NEWS --- old/pysmbc-1.0.14.1/NEWS 2014-03-27 20:32:55.000000000 +0100 +++ new/pysmbc-1.0.15.3/NEWS 2014-08-12 05:57:22.000000000 +0200 @@ -1,6 +1,18 @@ NEWS ---- +New in 1.0.15.3: +* added smbc.ConnectionRefusedError + +New in 1.0.15.1: +* Return direntry with unicode string + +New in 1.0.15: +* Working with Python3 + +New in 1.0.14.2: +* added smbc.NotDirectoryError + New in 1.0.14.1: * Fix for Python 2.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/PKG-INFO new/pysmbc-1.0.15.3/PKG-INFO --- old/pysmbc-1.0.14.1/PKG-INFO 2014-03-27 20:35:14.000000000 +0100 +++ new/pysmbc-1.0.15.3/PKG-INFO 2014-08-12 05:58:16.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pysmbc -Version: 1.0.14.1 +Version: 1.0.15.3 Summary: Python bindings for libsmbclient Home-page: http://cyberelk.net/tim/software/pysmbc/ Author: ['Tim Waugh <[email protected]>', 'Tsukasa Hamano <[email protected]>', 'Roberto Polli <[email protected]>'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/setup.py new/pysmbc-1.0.15.3/setup.py --- old/pysmbc-1.0.14.1/setup.py 2014-03-27 20:31:41.000000000 +0100 +++ new/pysmbc-1.0.15.3/setup.py 2014-08-12 05:57:31.000000000 +0200 @@ -58,13 +58,13 @@ c = subprocess.Popen (["pkg-config", "--cflags", pkg], stdout=subprocess.PIPE) (stdout, stderr) = c.communicate () - for p in stdout.decode (encoding='ascii').split (): + for p in stdout.decode ('ascii').split (): if p.startswith ("-I"): dirs.append (p[2:]) return dirs setup (name="pysmbc", - version="1.0.14.1", + version="1.0.15.3", description="Python bindings for libsmbclient", long_description=__doc__, author=["Tim Waugh <[email protected]>", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/smbc/__init__.py new/pysmbc-1.0.15.3/smbc/__init__.py --- old/pysmbc-1.0.14.1/smbc/__init__.py 2014-03-10 05:05:21.000000000 +0100 +++ new/pysmbc-1.0.15.3/smbc/__init__.py 2014-07-23 17:21:04.000000000 +0200 @@ -1,2 +1,3 @@ -import xattr +from smbc import xattr from _smbc import * + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/smbc/dir.c new/pysmbc-1.0.15.3/smbc/dir.c --- old/pysmbc-1.0.14.1/smbc/dir.c 2014-03-10 05:05:21.000000000 +0100 +++ new/pysmbc-1.0.15.3/smbc/dir.c 2014-07-24 08:53:29.000000000 +0200 @@ -139,16 +139,17 @@ dirp = (struct smbc_dirent *) dirbuf; while (dirlen > 0) { - PyObject *dent; - PyObject *largs = Py_BuildValue ("()"); - PyObject *lkwlist; - int len = dirp->dirlen; + PyObject *dent; + PyObject *largs = Py_BuildValue ("()"); + PyObject *lkwlist; + int len = dirp->dirlen; + int ret; - PyObject *name = PyBytes_FromStringAndSize (dirp->name, - strlen (dirp->name)); - PyObject *comment = PyBytes_FromStringAndSize (dirp->comment, - strlen(dirp->comment)); - PyObject *type = PyLong_FromLong (dirp->smbc_type); + PyObject *name = PyBytes_FromStringAndSize (dirp->name, + strlen (dirp->name)); + PyObject *comment = PyBytes_FromStringAndSize (dirp->comment, + strlen(dirp->comment)); + PyObject *type = PyLong_FromLong (dirp->smbc_type); lkwlist = PyDict_New (); PyDict_SetItemString (lkwlist, "name", name); PyDict_SetItemString (lkwlist, "comment", comment); @@ -157,10 +158,16 @@ Py_DECREF (comment); Py_DECREF (type); dent = smbc_DirentType.tp_new (&smbc_DirentType, largs, lkwlist); - smbc_DirentType.tp_init (dent, largs, lkwlist); - debugprintf ("%p\n", dent); + ret = smbc_DirentType.tp_init (dent, largs, lkwlist); Py_DECREF (largs); Py_DECREF (lkwlist); + if(ret < 0){ + PyErr_SetString (PyExc_RuntimeError, + "Cannot initialize smbc_DirentType"); + Py_DECREF (listobj); + Py_DECREF (dent); + return NULL; + } PyList_Append (listobj, dent); Py_DECREF (dent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/smbc/smbcdirent.c new/pysmbc-1.0.15.3/smbc/smbcdirent.c --- old/pysmbc-1.0.14.1/smbc/smbcdirent.c 2014-03-10 05:05:21.000000000 +0100 +++ new/pysmbc-1.0.15.3/smbc/smbcdirent.c 2014-07-24 08:53:50.000000000 +0200 @@ -55,7 +55,9 @@ Dirent_init (Dirent *self, PyObject *args, PyObject *kwds) { const char *name; + int name_len; const char *comment; + int comment_len; unsigned int smbc_type; static char *kwlist[] = { @@ -64,17 +66,16 @@ "smbc_type", NULL }; - debugprintf ("%p -> Dirent_init ()\n", self); - if (!PyArg_ParseTupleAndKeywords (args, kwds, "ssi", kwlist, - &name, &comment, &smbc_type)) - { - debugprintf ("<- Dirent_init() EXCEPTION\n"); - return -1; - } - - self->name = strdup (name); - self->comment = strdup (comment); + if (!PyArg_ParseTupleAndKeywords (args, kwds, "s#s#i", kwlist, + &name, &name_len, + &comment, &comment_len, + &smbc_type)) { + debugprintf ("<- Dirent_init() EXCEPTION\n"); + return -1; + } + self->name = strndup (name, name_len); + self->comment = strndup (comment, comment_len); self->smbc_type = smbc_type; debugprintf ("%p <- Dirent_init()\n", self); return 0; @@ -106,6 +107,13 @@ }; Dirent *dent = (Dirent *) self; +#if PY_MAJOR_VERSION >= 3 + return PyUnicode_FromFormat( + "<smbc.Dirent object \"%s\" (%s) at %p>", dent->name, + dent->smbc_type < (sizeof (types) / sizeof *(types)) ? + types[dent->smbc_type] : "?", + dent); +#else char s[1024]; snprintf (s, sizeof (s), "<smbc.Dirent object \"%s\" (%s) at %p>", dent->name, @@ -113,18 +121,19 @@ types[dent->smbc_type] : "?", dent); return PyBytes_FromStringAndSize (s, strlen (s)); +#endif } static PyObject * Dirent_getName (Dirent *self, void *closure) { - return PyBytes_FromStringAndSize (self->name, strlen (self->name)); + return PyUnicode_FromFormat("%s", self->name); } static PyObject * Dirent_getComment (Dirent *self, void *closure) { - return PyBytes_FromStringAndSize (self->comment, strlen (self->comment)); + return PyUnicode_FromFormat("%s", self->comment); } static PyObject * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/smbc/smbcmodule.c new/pysmbc-1.0.15.3/smbc/smbcmodule.c --- old/pysmbc-1.0.14.1/smbc/smbcmodule.c 2014-03-10 05:05:21.000000000 +0100 +++ new/pysmbc-1.0.15.3/smbc/smbcmodule.c 2014-08-12 05:57:16.000000000 +0200 @@ -43,6 +43,8 @@ PyObject *NotEmptyError; PyObject *TimedOutError; PyObject *NoSpaceError; +PyObject *NotDirectoryError; +PyObject *ConnectionRefusedError; #if PY_MAJOR_VERSION >= 3 #define PYSMBC_INIT_ERROR NULL @@ -54,7 +56,7 @@ SmbcMethods }; - #define PYSMBC_PROTOTYPE_HEADER PyObject * PyInit_smbc (void) + #define PYSMBC_PROTOTYPE_HEADER PyObject * PyInit__smbc (void) #define PYSMBC_MODULE_CREATOR PyModule_Create (&smbc_module) #else #define PYSMBC_INIT_ERROR @@ -146,6 +148,14 @@ Py_INCREF(NoSpaceError); PyModule_AddObject(m, "NoSpaceError", NoSpaceError); + NotDirectoryError = PyErr_NewException("smbc.NotDirectoryError", NULL, NULL); + Py_INCREF(NotDirectoryError); + PyModule_AddObject(m, "NotDirectoryError", NotDirectoryError); + + ConnectionRefusedError = PyErr_NewException("smbc.ConnectionRefusedError", NULL, NULL); + Py_INCREF(ConnectionRefusedError); + PyModule_AddObject(m, "ConnectionRefusedError", ConnectionRefusedError); + #if PY_MAJOR_VERSION >= 3 return m; #endif @@ -181,6 +191,12 @@ case EINVAL: PyErr_SetFromErrno(PyExc_ValueError); break; + case ENOTDIR: + PyErr_SetFromErrno(NotDirectoryError); + break; + case ECONNREFUSED: + PyErr_SetFromErrno(ConnectionRefusedError); + break; default: PyErr_SetFromErrno(PyExc_RuntimeError); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.14.1/tests/test_test.py new/pysmbc-1.0.15.3/tests/test_test.py --- old/pysmbc-1.0.14.1/tests/test_test.py 2011-06-30 09:39:07.000000000 +0200 +++ new/pysmbc-1.0.15.3/tests/test_test.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -def setUp(): - print "setUp" - pass - -def tearDown(): - print "tearDown" - pass - -def test_003(): - print "003" - pass - -def test_002(): - print "002" - pass - -def test_001(): - print "001" - pass - -def test_compare(): - assert 1==0 - -if __name__ == '__main__': - print "main" - import nose -# result = nose.run() - result = nose.main(["./"]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
