From db56dba89fdf490b81fabdf8e259c09463a95950 Mon Sep 17 00:00:00 2001 From: Devan Franchini Date: Sun, 1 Jun 2014 20:31:17 -0400 Subject: Imports unicode_literals from __future__ Adds py2 unicode compatibility to py3. --- layman/__init__.py | 2 ++ layman/api.py | 2 ++ layman/argsparser.py | 1 + layman/cli.py | 2 ++ layman/compatibility.py | 1 + layman/config.py | 2 ++ layman/constants.py | 2 ++ layman/db.py | 1 + layman/dbbase.py | 2 ++ layman/makeconf.py | 2 ++ layman/output.py | 1 + layman/overlays/bzr.py | 2 ++ layman/overlays/cvs.py | 2 ++ layman/overlays/darcs.py | 2 ++ layman/overlays/g_common.py | 2 ++ layman/overlays/g_sorcery.py | 2 ++ layman/overlays/git.py | 2 ++ layman/overlays/mercurial.py | 2 ++ layman/overlays/overlay.py | 2 ++ layman/overlays/rsync.py | 2 ++ layman/overlays/source.py | 2 ++ layman/overlays/svn.py | 2 ++ layman/overlays/tar.py | 2 ++ layman/remotedb.py | 1 + layman/updater.py | 2 ++ layman/utils.py | 2 ++ layman/version.py | 2 ++ 27 files changed, 49 insertions(+) (limited to 'layman') diff --git a/layman/__init__.py b/layman/__init__.py index 7a6bff5..3f70381 100644 --- a/layman/__init__.py +++ b/layman/__init__.py @@ -5,6 +5,8 @@ on all gentoo repositories and overlays """ +from __future__ import unicode_literals + import sys try: diff --git a/layman/api.py b/layman/api.py index 475691b..02cc363 100755 --- a/layman/api.py +++ b/layman/api.py @@ -13,6 +13,8 @@ # Brian Dolbec # +from __future__ import unicode_literals + import os from layman.config import BareConfig diff --git a/layman/argsparser.py b/layman/argsparser.py index 3e3d6f6..9d78dcc 100644 --- a/layman/argsparser.py +++ b/layman/argsparser.py @@ -20,6 +20,7 @@ # '''Defines the configuration options and provides parsing functionality.''' +from __future__ import unicode_literals __version__ = "$Id: config.py 286 2007-01-09 17:48:23Z wrobel $" diff --git a/layman/cli.py b/layman/cli.py index 258e3b9..476a080 100644 --- a/layman/cli.py +++ b/layman/cli.py @@ -19,6 +19,8 @@ # ''' Provides the command line actions that can be performed by layman.''' +from __future__ import unicode_literals + __version__ = "$Id: cli.py 2011-01-15 23:52 PST Brian Dolbec$" diff --git a/layman/compatibility.py b/layman/compatibility.py index e6206db..2ef4d8c 100644 --- a/layman/compatibility.py +++ b/layman/compatibility.py @@ -6,6 +6,7 @@ Distributed under the terms of the GNU General Public License v2 """ +from __future__ import unicode_literals def encode(text, enc="UTF-8"): """py2, py3 compatibility function""" diff --git a/layman/config.py b/layman/config.py index bf33f50..aef0cc8 100644 --- a/layman/config.py +++ b/layman/config.py @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +from __future__ import unicode_literals + """ LAYMAN CONFIGURATION diff --git a/layman/constants.py b/layman/constants.py index 9a2af40..6f1fa89 100644 --- a/layman/constants.py +++ b/layman/constants.py @@ -19,6 +19,8 @@ # ''' Provides the command line actions that can be performed by layman.''' +from __future__ import unicode_literals + __version__ = "$Id: constants.py 2011-01-16 23:52 PST Brian Dolbec$" diff --git a/layman/db.py b/layman/db.py index 6530147..3c8b6d7 100644 --- a/layman/db.py +++ b/layman/db.py @@ -16,6 +16,7 @@ # '''Handles different storage files.''' +from __future__ import unicode_literals from __future__ import with_statement __version__ = "$Id: db.py 309 2007-04-09 16:23:38Z wrobel $" diff --git a/layman/dbbase.py b/layman/dbbase.py index 475ce44..37dbed2 100644 --- a/layman/dbbase.py +++ b/layman/dbbase.py @@ -20,6 +20,8 @@ # '''Main handler for overlays.''' +from __future__ import unicode_literals + __version__ = "$Id: overlay.py 273 2006-12-30 15:54:50Z wrobel $" #=============================================================================== diff --git a/layman/makeconf.py b/layman/makeconf.py index 1abe318..f14da54 100644 --- a/layman/makeconf.py +++ b/layman/makeconf.py @@ -15,6 +15,8 @@ # Gunnar Wrobel # +from __future__ import unicode_literals + import os import codecs import re diff --git a/layman/output.py b/layman/output.py index 48b44a1..6722d5b 100644 --- a/layman/output.py +++ b/layman/output.py @@ -6,6 +6,7 @@ Distributed under the terms of the GNU General Public License v2 """ +from __future__ import unicode_literals __version__ = "0.1" diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py index 5bda251..9cfa8b5 100644 --- a/layman/overlays/bzr.py +++ b/layman/overlays/bzr.py @@ -18,6 +18,8 @@ '''Should work with any version of Bzr equal to or better than 0.7 -- caution: tested only with 0.8 and 0.8.2...''' +from __future__ import unicode_literals + __version__ = "$Id: bzr.py 236 2006-09-05 20:39:37Z wrobel $" #=============================================================================== diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py index 2bb6791..b166dc8 100644 --- a/layman/overlays/cvs.py +++ b/layman/overlays/cvs.py @@ -16,6 +16,8 @@ # ''' Cvs overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id$" #=============================================================================== diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py index 634681b..6bacb7b 100644 --- a/layman/overlays/darcs.py +++ b/layman/overlays/darcs.py @@ -17,6 +17,8 @@ # ''' Darcs overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: darcs.py 236 2006-09-05 20:39:37Z wrobel $" #=============================================================================== diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py index 5f0e9bc..2f33803 100644 --- a/layman/overlays/g_common.py +++ b/layman/overlays/g_common.py @@ -16,6 +16,8 @@ # ''' G-common repository support.''' +from __future__ import unicode_literals + #=============================================================================== # # Dependencies diff --git a/layman/overlays/g_sorcery.py b/layman/overlays/g_sorcery.py index b35111c..6156008 100644 --- a/layman/overlays/g_sorcery.py +++ b/layman/overlays/g_sorcery.py @@ -17,6 +17,8 @@ # ''' g-sorcery repository support.''' +from __future__ import unicode_literals + #=============================================================================== # # Dependencies diff --git a/layman/overlays/git.py b/layman/overlays/git.py index 81e650c..f3790ca 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -16,6 +16,8 @@ # Stefan Schweizer ''' Git overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: git.py 146 2006-05-27 09:52:36Z wrobel $" #=============================================================================== diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index 5034993..c188381 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -17,6 +17,8 @@ # ''' Mercurial overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: mercurial.py 236 2006-09-05 20:39:37Z wrobel $" #=============================================================================== diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py index 0c2d042..ab2c96f 100755 --- a/layman/overlays/overlay.py +++ b/layman/overlays/overlay.py @@ -20,6 +20,8 @@ # ''' Basic overlay class.''' +from __future__ import unicode_literals + __version__ = "0.2" #=============================================================================== diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py index f87a7e0..0fa5b06 100644 --- a/layman/overlays/rsync.py +++ b/layman/overlays/rsync.py @@ -16,6 +16,8 @@ # ''' Rsync overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: rsync.py 236 2006-09-05 20:39:37Z wrobel $" #=============================================================================== diff --git a/layman/overlays/source.py b/layman/overlays/source.py index 69c59bb..5044156 100644 --- a/layman/overlays/source.py +++ b/layman/overlays/source.py @@ -13,6 +13,8 @@ # Author(s): # Sebastian Pipping +from __future__ import unicode_literals + import os import copy import sys diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index 20c09fb..0244dd4 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -16,6 +16,8 @@ # ''' Subversion overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: svn.py 236 2006-09-05 20:39:37Z wrobel $" diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index e57096d..fcd260b 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -16,6 +16,8 @@ # ''' Tar overlay support.''' +from __future__ import unicode_literals + __version__ = "$Id: tar.py 310 2007-04-09 16:30:40Z wrobel $" #=============================================================================== diff --git a/layman/remotedb.py b/layman/remotedb.py index 38d9fa8..1b6e997 100644 --- a/layman/remotedb.py +++ b/layman/remotedb.py @@ -16,6 +16,7 @@ # '''Handles different storage files.''' +from __future__ import unicode_literals from __future__ import with_statement __version__ = "$Id: db.py 309 2007-04-09 16:23:38Z wrobel $" diff --git a/layman/updater.py b/layman/updater.py index 7c46707..26aeed2 100644 --- a/layman/updater.py +++ b/layman/updater.py @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from sys import stderr import os import argparse diff --git a/layman/utils.py b/layman/utils.py index f174215..4c9423e 100644 --- a/layman/utils.py +++ b/layman/utils.py @@ -21,6 +21,8 @@ '''Utility functions to deal with xml nodes. ''' +from __future__ import unicode_literals + __version__ = '$Id: utils.py 236 2006-09-05 20:39:37Z wrobel $' #=============================================================================== diff --git a/layman/version.py b/layman/version.py index 90c7412..67b4bf0 100644 --- a/layman/version.py +++ b/layman/version.py @@ -19,6 +19,8 @@ # Brian Dolbec # +from __future__ import unicode_literals + __version__ = "$Id: version.py 309 2007-04-09 16:23:38Z wrobel $" -- cgit v1.2.3-65-gdbad