RedHatTraining/pyramid.git

parent: 8af8cf3b | patch | commit | ignore whitespace

Fenton Travers

2014-04-24 f3363c948f88ac4fcf45448416ec17da44167c2f

backport #1325

The copyright symbol causes this error:

UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 2559: ordinal not in range(128)

Replaced non-ascii copyright character with HTML equivalent.

Added required notes to changes/contributors file.

6 files modified

	CHANGES.txt	3 ●●●●● patch \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	2 ●●●●● patch \| view \| raw \| blame \| history
	docs/narr/MyProject/myproject/templates/mytemplate.pt	2 ●●●●● patch \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl	2 ●●●●● patch \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl	2 ●●●●● patch \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl	2 ●●●●● patch \| view \| raw \| blame \| history

 CHANGES.txt

@@ -16,6 +16,9 @@
  using the returned ``Configurator`` during testing. There is now a
  ``package`` argument that can override this behavior as well.

- Removed non-ascii copyright symbol from templates, as this was
  causing the scaffolds to fail for project generation.

1.5 (2014-04-08)
================


 CONTRIBUTORS.txt

@@ -230,3 +230,5 @@
- Antti Haapala, 2013/11/15

- Amit Mane, 2014/01/23

- Fenton Travers, 2014/05/06

 docs/narr/MyProject/myproject/templates/mytemplate.pt

@@ -50,7 +50,7 @@
        </div>
        <div class="row">
          <div class="copyright">
            Copyright © Pylons Project
            Copyright &copy; Pylons Project
          </div>
        </div>
      </div>

 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl

@@ -50,7 +50,7 @@
        </div>
        <div class="row">
          <div class="copyright">
            Copyright © Pylons Project
            Copyright &copy; Pylons Project
          </div>
        </div>
      </div>

 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl

@@ -50,7 +50,7 @@
        </div>
        <div class="row">
          <div class="copyright">
            Copyright © Pylons Project
            Copyright &copy; Pylons Project
          </div>
        </div>
      </div>

 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl

@@ -50,7 +50,7 @@
        </div>
        <div class="row">
          <div class="copyright">
            Copyright © Pylons Project
            Copyright &copy; Pylons Project
          </div>
        </div>
      </div>

			@@ -16,6 +16,9 @@
			using the returned ``Configurator`` during testing. There is now a
			``package`` argument that can override this behavior as well.

			- Removed non-ascii copyright symbol from templates, as this was
			causing the scaffolds to fail for project generation.

			1.5 (2014-04-08)
			================

			@@ -230,3 +230,5 @@
			- Antti Haapala, 2013/11/15

			- Amit Mane, 2014/01/23

			- Fenton Travers, 2014/05/06

			@@ -50,7 +50,7 @@
			</div>
			<div class="row">
			<div class="copyright">
			Copyright © Pylons Project
			Copyright © Pylons Project
			</div>
			</div>
			</div>