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 ) id 1QhkwK-0000Ws-0x for garchives@archives.gentoo.org; Fri, 15 Jul 2011 16:08:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BF7F21C311; Fri, 15 Jul 2011 16:08:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 280CF21C310 for ; Fri, 15 Jul 2011 16:08:23 +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 95FDC2AC319 for ; Fri, 15 Jul 2011 16:08:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB6808003F for ; Fri, 15 Jul 2011 16:08:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/bash/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/bash/bashserver.py X-VCS-Directories: gentoopm/bash/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fc0681e6122c0e1da42d9082d4337d434580d471 Date: Fri, 15 Jul 2011 16:08:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 22ba69ffffad90ce68ff527150787098 commit: fc0681e6122c0e1da42d9082d4337d434580d471 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jul 15 14:57:48 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jul 15 14:57:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Dfc0681e6 BashServer: commonize command writing code. --- gentoopm/bash/bashserver.py | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gentoopm/bash/bashserver.py b/gentoopm/bash/bashserver.py index f8740fd..1690627 100644 --- a/gentoopm/bash/bashserver.py +++ b/gentoopm/bash/bashserver.py @@ -48,8 +48,7 @@ class BashServer(BashParser): shutil.copyfileobj(envf, f) f.flush() =20 - self._bashproc.stdin.write('set --\n'.encode('ASCII')) - self._bashproc.stdin.flush() + self._write('set --') =20 def _read1(self): f =3D self._bashproc.stdout @@ -58,16 +57,19 @@ class BashServer(BashParser): buf +=3D f.read(1) return buf[1:-1].decode('utf-8') =20 - def __getitem__(self, k): - self._bashproc.stdin.write(('set -- "${%s}"\n' % k).encode('ASCII')) + def _write(self, *cmds): + for cmd in cmds: + self._bashproc.stdin.write(('%s\n' % cmd).encode('ASCII')) self._bashproc.stdin.flush() =20 - return self._read1() - - def copy(self, *varlist): + def _cmd_print(self, *varlist): q =3D ' '.join(['"${%s}"' % v for v in varlist]) - self._bashproc.stdin.write(('set -- %s\n' % q).encode('ASCII')) - self._bashproc.stdin.flush() + self._write('set -- %s' % q) + return [self._read1() for v in varlist] + + def __getitem__(self, k): + return self._cmd_print(k)[0] =20 - ret =3D [self._read1() for v in varlist] + def copy(self, *varlist): + ret =3D self._cmd_print(*varlist) return dict(zip(varlist, ret))