[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.36.1-34-g72e9bf3

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:11 CEST 2013


The branch, twofactorauth has been updated
       via  72e9bf3ca62180facdfc78ff4422617e321c4d21 (commit)
      from  a838bb55079f3394d601227fa9853d0a5672c439 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/printactions.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/x2go/printactions.py b/x2go/printactions.py
index 0f893c9..dfaa0a6 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -294,7 +294,7 @@ class X2goPrintActionPRINT(X2goPrintAction):
             _default_printer = win32print.GetDefaultPrinter()
             if self.printer:
                 _printer = self.printer
-		win32print.SetDefaultPrinter(_printer)
+                win32print.SetDefaultPrinter(_printer)
             else:
                 _printer = _default_printer
             self.logger('printing incoming PDF file %s' % pdf_file, loglevel=log.loglevel_NOTICE)
@@ -311,10 +311,10 @@ class X2goPrintActionPRINT(X2goPrintAction):
                                      stderr=subprocess.STDOUT,
                                      shell=_shell,
                                     )
-		# give gsprint.exe a little time to find our printer
-		time.sleep(10)
+                # give gsprint.exe a little time to find our printer
+                time.sleep(10)
 
-	    except:
+            except:
                 self.logger('Falling back to win32api printing...', loglevel=log.loglevel_DEBUG)
                 try:
                     win32api.ShellExecute (
@@ -325,8 +325,8 @@ class X2goPrintActionPRINT(X2goPrintAction):
                           ".",
                           0
                     )
-		    # give the win32api some time to find our printer...
-		    time.sleep(10)
+                    # give the win32api some time to find our printer...
+                    time.sleep(10)
                 except win32api.error, e:
                     if self.client_instance:
                         self.client_instance.HOOK_printaction_error(filename=_hr_filename, printer=_printer, err_msg=e.message, profile_name=self.profile_name, session_name=self.session_name)
@@ -335,7 +335,7 @@ class X2goPrintActionPRINT(X2goPrintAction):
 
             if self.printer:
                 win32print.SetDefaultPrinter(_default_printer)
-	    time.sleep(60)
+            time.sleep(60)
 
         else:
             _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir)


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list