[Python-modules-commits] [python-udatetime] 04/04: merge patched into master

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository python-udatetime.

commit 8f9341ece9e3a08c55372e4ca4f4a6f1ad544f1e
Merge: 1528b8f 5a73920
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Thu Aug 3 19:33:47 2017 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0001-Move-rfc3339-module-under-udatetime.patch | 81 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 src/rfc3339.c                                      |  8 +--
 udatetime/__init__.py                              |  2 +-
 6 files changed, 90 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 81bf76a,0000000..00920cd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3c87a48a34973547fff234b76daa1091c32df144
- 3c87a48a34973547fff234b76daa1091c32df144
++5a73920f21b04d1a6f17d739bb2e252cc767bb8c
++5a73920f21b04d1a6f17d739bb2e252cc767bb8c
 +3c87a48a34973547fff234b76daa1091c32df144
 +3c87a48a34973547fff234b76daa1091c32df144
 +python-udatetime_0.0.12.orig.tar.gz
 +eeb31acb493ddc240fc2950b26ab7b8cf7e020e4
 +13621
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Move-rfc3339-module-under-udatetime.patch
index 0000000,0000000..8c64317
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Move-rfc3339-module-under-udatetime.patch
@@@ -1,0 -1,0 +1,81 @@@
++From 5a73920f21b04d1a6f17d739bb2e252cc767bb8c Mon Sep 17 00:00:00 2001
++From: Ilias Tsitsimpis <iliastsi at debian.org>
++Date: Thu, 3 Aug 2017 19:33:41 +0300
++Subject: Move rfc3339 module under udatetime
++
++There is already an rfc3339 module, provided by the rfc3339 Python
++package, so move ours under udatetime.
++
++Bug: https://github.com/freach/udatetime/issues/19
++---
++ setup.py              | 2 +-
++ src/rfc3339.c         | 8 ++++----
++ udatetime/__init__.py | 2 +-
++ 3 files changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 97ddf04..3269288 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -30,7 +30,7 @@ elif sys.version_info.major == 3:
++     macros.append(('_PYTHON3', '1'))
++ 
++ rfc3339 = Extension(
++-    'rfc3339',
+++    'udatetime.rfc3339',
++     ['./src/rfc3339.c'],
++     define_macros=macros,
++     extra_compile_args=['-Ofast', '-std=c99']
++diff --git a/src/rfc3339.c b/src/rfc3339.c
++index e637c4f..16b80ed 100644
++--- a/src/rfc3339.c
+++++ b/src/rfc3339.c
++@@ -615,7 +615,7 @@ static PyMethodDef FixedOffset_methods[] = {
++ #ifdef _PYTHON3
++ static PyTypeObject FixedOffset_type = {
++     PyVarObject_HEAD_INIT(NULL, 0)
++-    "rfc3339.FixedOffset_type",             /* tp_name */
+++    "udatetime.rfc3339.FixedOffset_type",   /* tp_name */
++     sizeof(FixedOffset),                    /* tp_basicsize */
++     0,                                      /* tp_itemsize */
++     0,                                      /* tp_dealloc */
++@@ -640,7 +640,7 @@ static PyTypeObject FixedOffset_type = {
++ static PyTypeObject FixedOffset_type = {
++     PyObject_HEAD_INIT(NULL)
++     0,                         /*ob_size*/
++-    "rfc3339.FixedOffset_type", /*tp_name*/
+++    "udatetime.rfc3339.FixedOffset_type", /*tp_name*/
++     sizeof(FixedOffset),       /*tp_basicsize*/
++     0,                         /*tp_itemsize*/
++     0,                         /*tp_dealloc*/
++@@ -973,7 +973,7 @@ static PyMethodDef rfc3339_methods[] = {
++ #ifdef _PYTHON3
++ static struct PyModuleDef Python3_module = {
++     PyModuleDef_HEAD_INIT,
++-    "rfc3339",
+++    "udatetime.rfc3339",
++     NULL,
++     -1,
++     rfc3339_methods,
++@@ -1001,7 +1001,7 @@ initrfc3339(void)
++ #ifdef _PYTHON3
++     m = PyModule_Create(&Python3_module);
++ #else
++-    m = Py_InitModule("rfc3339", rfc3339_methods);
+++    m = Py_InitModule("udatetime.rfc3339", rfc3339_methods);
++ #endif
++ 
++     if (m == NULL)
++diff --git a/udatetime/__init__.py b/udatetime/__init__.py
++index 5e71a2e..ca6fd42 100644
++--- a/udatetime/__init__.py
+++++ b/udatetime/__init__.py
++@@ -17,7 +17,7 @@ if __pypy__:
++         TZFixedOffset
++     )
++ else:
++-    from rfc3339 import (
+++    from udatetime.rfc3339 import (
++         utcnow,
++         now,
++         from_rfc3339_string as from_string,
diff --cc debian/patches/series
index 0000000,0000000..5332971
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Move-rfc3339-module-under-udatetime.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-udatetime.git