gentoo/dev-python/docutils/files/docutils-0.10-optparser.patch
Robin H. Johnson 56bd759df1
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
2015-08-08 17:38:18 -07:00

35 lines
1.2 KiB
Diff

Patch by Arfrever
http://sourceforge.net/tracker/?func=detail&aid=3598893&group_id=38414&atid=422030
Index: docutils/frontend.py
===================================================================
--- docutils/frontend.py (revision 7578)
+++ docutils/frontend.py (working copy)
@@ -158,7 +158,7 @@
def validate_colon_separated_string_list(
setting, value, option_parser, config_parser=None, config_section=None):
- if isinstance(value, unicode):
+ if isinstance(value, basestring):
value = value.split(':')
else:
last = value.pop()
@@ -171,7 +171,7 @@
"""
# `value` is already a list when given as command line option
# and "action" is "append"
- if isinstance(value, unicode):
+ if isinstance(value, basestring):
value = [value]
# this function is called for every option added to `value`
# -> split the last item and apped the result:
@@ -731,7 +731,7 @@
"""Wrapper around sys.stderr catching en-/decoding errors"""
def read(self, filenames, option_parser):
- if type(filenames) in (str, unicode):
+ if isinstance(filenames, basestring):
filenames = [filenames]
for filename in filenames:
try: