[Python-modules-commits] [cookiecutter] 03/07: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository cookiecutter.

commit 75b11770fd2be80f095c592880cf951a7df5c951
Merge: a7997f6 cfc9bae
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat May 28 15:07:17 2016 +0200

    merge patched into master

 cookiecutter/config.py                             |  6 +--
 debian/.git-dpm                                    |  4 +-
 .../patches/0002-Use-PyYAML-instead-of-poyo.patch  | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index f7ca20b,0000000..22f8de6
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
- d189085cd62e6d083391e026349b2f6da56f3a5f
- d189085cd62e6d083391e026349b2f6da56f3a5f
++cfc9baee3a75ee9a55d074305970be0e222837a2
++cfc9baee3a75ee9a55d074305970be0e222837a2
 +2cff56151f5e99b0914d57e6202c4ce7abd84935
 +2cff56151f5e99b0914d57e6202c4ce7abd84935
 +cookiecutter_1.4.0.orig.tar.gz
 +b19b6fb4e912400514d2443be245536bc9cabfd5
 +226136
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
index 0000000,0000000..0c20dcb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
@@@ -1,0 -1,0 +1,49 @@@
++From cfc9baee3a75ee9a55d074305970be0e222837a2 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sat, 28 May 2016 15:06:44 +0200
++Subject: Use PyYAML instead of poyo
++
++There is no problem with PyYAML in Debian and therefore, we don't need
++to switch to poyo (a pure YAMLish parser).
++---
++ cookiecutter/config.py | 6 +++---
++ setup.py               | 2 +-
++ 2 files changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/cookiecutter/config.py b/cookiecutter/config.py
++index fb69b47e58b0..af9e83c33f99 100755
++--- a/cookiecutter/config.py
+++++ b/cookiecutter/config.py
++@@ -14,7 +14,7 @@ import logging
++ import os
++ import io
++ 
++-import poyo
+++import yaml
++ 
++ from .exceptions import ConfigDoesNotExistException
++ from .exceptions import InvalidConfiguration
++@@ -49,8 +49,8 @@ def get_config(config_path):
++     logger.debug('config_path is {0}'.format(config_path))
++     with io.open(config_path, encoding='utf-8') as file_handle:
++         try:
++-            yaml_dict = poyo.parse_string(file_handle.read())
++-        except poyo.exceptions.PoyoException as e:
+++            yaml_dict = yaml.safe_load(file_handle.read())
+++        except yaml.error.YAMLError as e:
++             raise InvalidConfiguration(
++                 'Unable to parse YAML file {}. Error: {}'
++                 ''.format(config_path, e)
++diff --git a/setup.py b/setup.py
++index 5baa19421705..01f1ca238a18 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -30,7 +30,7 @@ requirements = [
++     'jinja2>=2.7',
++     'click>=5.0',
++     'whichcraft>=0.1.1',
++-    'poyo>=0.1.0',
+++    'PyYAML',
++     'jinja2-time>=0.1.0'
++ ]
++ 
diff --cc debian/patches/series
index 5fd9ecc,0000000..1762e4a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Don-t-test-for-.DS_Store.patch
++0002-Use-PyYAML-instead-of-poyo.patch

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