[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.36.0-5-g71accf0

[X2Go dev team]

The branch, brokerclient has been updated
       via  71accf070a7b9be753aa5de36ccf567da266263b (commit)
      from  fc32cd5c04e797e15fb7a10686e75bcf230821af (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/dropbox.py |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/x2go/dropbox.py b/x2go/dropbox.py
index 858fcaa..dd3d736 100644
--- a/x2go/dropbox.py
+++ b/x2go/dropbox.py
@@ -95,7 +95,7 @@ class X2goDropboxQueue(threading.Thread):
 
         if dropbox_action is None:
             dropbox_action = dropbox_actions.X2goDropboxActionOPEN(client_instance=self.client_instance, logger=self.logger, **dropbox_action_args)
-        elif type(dropbox_action) is types.StringType:
+        elif type(dropbox_action) in (types.StringType, types.UnicodeType):
             dropbox_action = self.set_dropbox_action(dropbox_action)
         else:
             # hope it's already an instance...
@@ -181,7 +181,7 @@ class X2goDropboxQueue(threading.Thread):
                                                                   'dropbox_file': _job,
                                                                   'dropbox_extensions': self.dropbox_extensions,
                                                                   'dropbox_action': self.dropbox_action,
-                                                                  'parent_thread': self, 
+                                                                  'parent_thread': self,
                                                                   'logger': self.logger, 
                                                                 }
                                                                )
@@ -198,16 +198,16 @@ def x2go_dropboxjob_handler(dropbox_file=None,
                             dropbox_action=None,
                             parent_thread=None, logger=None, ):
     """\
-    This function is called as a handler function for each incoming X2go print job 
-    represented by the class L{X2goPrintJob}.
+    This function is called as a handler function for each incoming X2go dropbox file
+    represented by the class L{X2goDropboxJob}.
 
-    @param dropbox_file: PDF file name as placed in to the X2go spool directory
+    @param dropbox_file: dropbox file name as placed in to the X2go dropbox spool directory
     @type dropbox_file: C{str}
-    @param dropbox_action: an instance of either of the possible C{X2goPrintActionXXX} classes
-    @type dropbox_action: C{X2goPrintActionXXX} nstance
-    @param parent_thread: the L{X2goPrintQueue} thread that actually created this handler's L{X2goPrintJob} instance
+    @param dropbox_action: an instance of either of the possible C{X2goDropboxActionXXX} classes
+    @type dropbox_action: C{X2goDropboxActionXXX} nstance
+    @param parent_thread: the L{X2goDropboxQueue} thread that actually created this handler's L{X2goDropboxJob} instance
     @type parent_thread: C{instance}
-    @param logger: the L{X2goPrintQueue}'s logging instance
+    @param logger: the L{X2goDropboxQueue}'s logging instance
     @type logger: C{instance}
 
     """


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).