The branch, master has been updated via afd1e9684b2722ce4a3239f7a8c55f7114157460 (commit) from 9cabef241b1d1e91abebece3c54c0397a6b6c9fd (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 ----------------------------------------------------------------- commit afd1e9684b2722ce4a3239f7a8c55f7114157460 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 21 00:29:06 2011 +0200 Renamed/restructured NX compression pack method names. ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 64 +++++++++++++++++++++++++++--------------------------- x2go/utils.py | 4 +- 2 files changed, 34 insertions(+), 34 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 00db623..17be0f1 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -289,19 +289,19 @@ X2GO_SESSIONPROFILE_DEFAULTS = { # here is a list of NX 3.x compression methods, this is the "%"-hashed list that # can also be used for printing in help texts, docs etc. # The "%"-sign can be replaced by digits 0-9. -pack_methods_nx3 = ['nopack','8','64','256','512','4k','32k','64k','256k','2m','16m', - '256-rdp','256-rdp-compressed','32k-rdp','32k-rdp-compressed','64k-rdp', - '64k-rdp-compressed','16m-rdp','16m-rdp-compressed', - 'rfb-hextile','rfb-tight','rfb-tight-compressed', - '8-tight','64-tight','256-tight','512-tight','4k-tight','32k-tight', - '64k-tight','256k-tight','2m-tight','16m-tight', - '8-jpeg-%','64-jpeg','256-jpeg','512-jpeg','4k-jpeg','32k-jpeg', - '64k-jpeg','256k-jpeg','2m-jpeg','16m-jpeg-%', - '8-png-jpeg-%','64-png-jpeg','256-png-jpeg','512-png-jpeg','4k-png-jpeg', - '32k-png-jpeg','64k-png-jpeg','256k-png-jpeg','2m-png-jpeg','16m-png-jpeg-%', - '8-png-%','64-png','256-png','512-png','4k-Apng', - '32k-png','64k-png','256k-png','2m-png','16m-png-%', - '16m-rgb-%','16m-rle-%',] +pack_methods_nx3_noqual = ['nopack','8','64','256','512','4k','32k','64k','256k','2m','16m', + '256-rdp','256-rdp-compressed','32k-rdp','32k-rdp-compressed','64k-rdp', + '64k-rdp-compressed','16m-rdp','16m-rdp-compressed', + 'rfb-hextile','rfb-tight','rfb-tight-compressed', + '8-tight','64-tight','256-tight','512-tight','4k-tight','32k-tight', + '64k-tight','256k-tight','2m-tight','16m-tight', + '8-jpeg-%','64-jpeg','256-jpeg','512-jpeg','4k-jpeg','32k-jpeg', + '64k-jpeg','256k-jpeg','2m-jpeg','16m-jpeg-%', + '8-png-jpeg-%','64-png-jpeg','256-png-jpeg','512-png-jpeg','4k-png-jpeg', + '32k-png-jpeg','64k-png-jpeg','256k-png-jpeg','2m-png-jpeg','16m-png-jpeg-%', + '8-png-%','64-png','256-png','512-png','4k-png', + '32k-png','64k-png','256k-png','2m-png','16m-png-%', + '16m-rgb-%','16m-rle-%',] """Available NX3 compression methods.""" # use for printing on screen... @@ -319,26 +319,26 @@ pack_methods_nx3_formatted=""" \'%s\' \'%s\' \'%s\' -""" % ('\', \''.join(pack_methods_nx3[0:11]), \ - '\', \''.join(pack_methods_nx3[11:16]), \ - '\', \''.join(pack_methods_nx3[16:19]), \ - '\', \''.join(pack_methods_nx3[19:22]), \ - '\', \''.join(pack_methods_nx3[22:28]), \ - '\', \''.join(pack_methods_nx3[28:32]), \ - '\', \''.join(pack_methods_nx3[32:38]), \ - '\', \''.join(pack_methods_nx3[38:42]), \ - '\', \''.join(pack_methods_nx3[42:47]), \ - '\', \''.join(pack_methods_nx3[47:52]), \ - '\', \''.join(pack_methods_nx3[52:57]), \ - '\', \''.join(pack_methods_nx3[57:62]), \ - '\', \''.join(pack_methods_nx3[62:])) - -# _pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options +""" % ('\', \''.join(pack_methods_nx3_noqual[0:11]), \ + '\', \''.join(pack_methods_nx3_noqual[11:16]), \ + '\', \''.join(pack_methods_nx3_noqual[16:19]), \ + '\', \''.join(pack_methods_nx3_noqual[19:22]), \ + '\', \''.join(pack_methods_nx3_noqual[22:28]), \ + '\', \''.join(pack_methods_nx3_noqual[28:32]), \ + '\', \''.join(pack_methods_nx3_noqual[32:38]), \ + '\', \''.join(pack_methods_nx3_noqual[38:42]), \ + '\', \''.join(pack_methods_nx3_noqual[42:47]), \ + '\', \''.join(pack_methods_nx3_noqual[47:52]), \ + '\', \''.join(pack_methods_nx3_noqual[52:57]), \ + '\', \''.join(pack_methods_nx3_noqual[57:62]), \ + '\', \''.join(pack_methods_nx3_noqual[62:])) + +# pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options # against -_pack_methods_nx3 = [ m for m in pack_methods_nx3 if "%" not in m ] -for meth in [ m for m in pack_methods_nx3 if "%" in m ]: - _pack_methods_nx3 += [ meth.replace('%','%s' % str(i)) for i in range(0,10) ] - +pack_methods_nx3 = [ m for m in pack_methods_nx3_noqual if "%" not in m ] +for meth in [ m for m in pack_methods_nx3_noqual if "%" in m ]: + pack_methods_nx3 += [ meth.replace('%','%s' % str(i)) for i in range(0,10) ] +pack_methods_nx3.sort() ## ## X2go session defaults ## diff --git a/x2go/utils.py b/x2go/utils.py index a200437..866abaa 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -40,7 +40,7 @@ import subprocess from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS from defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS from defaults import X2GO_MIMEBOX_ACTIONS as _X2GO_MIMEBOX_ACTIONS -from defaults import _pack_methods_nx3 +from defaults import pack_methods_nx3 if _X2GOCLIENT_OS == 'Windows': import win32api @@ -51,7 +51,7 @@ def is_in_nx3packmethods(method): Test if a given compression method is valid for NX3 Proxy. """ - return method in _pack_methods_nx3 + return method in pack_methods_nx3 def find_session_line_in_x2golistsessions(session_name, x2go_stdout): 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).