From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-362059-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QgjOe-0007sw-Ai
for garchives@archives.gentoo.org; Tue, 12 Jul 2011 20:17:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6D82D21C0C8;
Tue, 12 Jul 2011 20:17:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2E9FC21C0C8
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 20:17:24 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 782EA2AC229
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 20:17:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 9567B8003D
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 20:17:22 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <f0b19822bace8a04fd2b5c2797ecfe387faf5ac7.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/filter-bash-environment.py
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: f0b19822bace8a04fd2b5c2797ecfe387faf5ac7
Date: Tue, 12 Jul 2011 20:17:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 760b57c1558928d8fbf99df223144b21
commit: f0b19822bace8a04fd2b5c2797ecfe387faf5ac7
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 20:16:56 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:16:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Df0b19822
filter-bash-environment.py: move imports to top
---
bin/filter-bash-environment.py | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment=
.py
index 5038c07..b9aec96 100755
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@ -1,9 +1,13 @@
#!/usr/bin/python
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
import codecs
-import os, re, sys
+import io
+import optparse
+import os
+import re
+import sys
=20
here_doc_re =3D re.compile(r'.*\s<<[-]?(\w+)$')
func_start_re =3D re.compile(r'^[-\w]+\s*\(\)\s*$')
@@ -122,8 +126,7 @@ if __name__ =3D=3D "__main__":
"intact. The PATTERN is a space separated list of variable names" + \
" and it supports python regular expression syntax."
usage =3D "usage: %s PATTERN" % os.path.basename(sys.argv[0])
- from optparse import OptionParser
- parser =3D OptionParser(description=3Ddescription, usage=3Dusage)
+ parser =3D optparse.OptionParser(description=3Ddescription, usage=3Dusa=
ge)
options, args =3D parser.parse_args(sys.argv[1:])
if len(args) !=3D 1:
parser.error("Missing required PATTERN argument.")
@@ -132,7 +135,6 @@ if __name__ =3D=3D "__main__":
if sys.hexversion >=3D 0x3000000:
file_in =3D codecs.iterdecode(sys.stdin.buffer.raw,
'utf_8', errors=3D'replace')
- import io
file_out =3D io.TextIOWrapper(sys.stdout.buffer,
'utf_8', errors=3D'backslashreplace')
=20