Merge branch 'master' into yumng

Conflicts:
	src/lib/Client/Tools/YUMng.py

1 files changed, 18 insertions, 6 deletions

diff --git a/doc/conf.py b/doc/conf.py
index 77ab6fd94..4b13579d7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,8 +40,13 @@ source_suffix = '.txt'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Bcfg2'
-copyright = u'2009-%s, Narayan Desai' % time.strftime('%Y')
+# py3k compatibility
+if sys.hexversion >= 0x03000000:
+    project = 'Bcfg2'
+    copyright = '2009-%s, Narayan Desai' % time.strftime('%Y')
+else:
+    project = u'Bcfg2'
+    copyright = u'2009-%s, Narayan Desai' % time.strftime('%Y')
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -174,10 +179,17 @@ latex_font_size = '11pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('contents', 'bcfg2.tex', u'Bcfg2 Documentation',
-   u'Narayan Desai et al.', 'manual', True),
-]
+# py3k compatibility
+if sys.hexversion >= 0x03000000:
+    latex_documents = [
+      ('contents', 'bcfg2.tex', 'Bcfg2 Documentation',
+       'Narayan Desai et al.', 'manual', True),
+    ]
+else:
+    latex_documents = [
+      ('contents', 'bcfg2.tex', u'Bcfg2 Documentation',
+       u'Narayan Desai et al.', 'manual', True),
+    ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.