From 4f69918eba07f5c8852aacc6a2494824782dc827 Mon Sep 17 00:00:00 2001 From: Antoine Durand-Gasselin Date: Tue, 9 Jun 2009 15:46:24 +0200 Subject: [PATCH] [impression] corrections diverses darcs-hash:20090609134624-bd074-089e88f81793ae08fbe817a5b97df9089ba1dda1.gz --- impression/etat_imprimante.py | 2 +- impression/gen_code.py | 2 +- impression/impression_canon.py | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/impression/etat_imprimante.py b/impression/etat_imprimante.py index 92c2e4a5..555cf9d2 100644 --- a/impression/etat_imprimante.py +++ b/impression/etat_imprimante.py @@ -43,7 +43,7 @@ def etat_canon(): msg = _dico['\n'.join(msg)].split('\n') if raw_msg[1] == 'warning(3)': - msg += (comm.walk('mib-2.43.18.1.1.8').values() + msg += [v.replace('"', '') for v in comm.walk('mib-2.43.18.1.1.8').values()] except Exception,err: msg.append("[%s]" % unicode(err)) diff --git a/impression/gen_code.py b/impression/gen_code.py index 54255611..557aa2db 100644 --- a/impression/gen_code.py +++ b/impression/gen_code.py @@ -9,4 +9,4 @@ from user_tests import getuser if __name__ == '__main__': # génère un nouveau code et l'affiche - print new_code('%s via %s'%(getuser(),os.path.abspath(__file__))) + print gen_code('%s via %s'%(getuser(),os.path.abspath(__file__))) diff --git a/impression/impression_canon.py b/impression/impression_canon.py index 64a2e9b9..253b9ed2 100755 --- a/impression/impression_canon.py +++ b/impression/impression_canon.py @@ -268,7 +268,7 @@ class impression: print u"Agrafage: Livret (piqûre à cheval)" else: print "Agrafage: " + DICT_AGRAFAGE[self._settings['agrafage']] - if self._setting['recto_verso']: + if self._settings['recto_verso']: print "Disposition: recto/verso" else: print "Disposition: recto" @@ -450,13 +450,12 @@ class impression: options += ' -o OutputBin=TrayA' options += ' -o Collate=StapleCollate -o StapleLocation=%s' % self._settings['agrafage'] - cmd = "lpr %s -# %d %s" % (options, self._settings['copies'], - self._fichier) - (status, rep) = getstatusoutput(cmd) - self.log.info("printing: %s" % cmd) - if status != 0: - self.log.error("erreur impression") - self.log.error("lpr status:%d | rep: %s" % (status, rep)) - raise PrintError, "%s \n status:%d rep: %s" % (cmp, status, rep) - + for i in range(self._settings['copies']): + cmd = "lpr %s %s" % (options, self._fichier) + (status, rep) = getstatusoutput(cmd) + self.log.info("printing: %s" % cmd) + if status != 0: + self.log.error("erreur impression") + self.log.error("lpr status:%d | rep: %s" % (status, rep)) + raise PrintError, "%s \n status:%d rep: %s" % (cmp, status, rep)