setting.py (pymol-v2.1.0.tar.bz2) | : | setting.py (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 628 | skipping to change at line 628 | |||
traceback.print_exc() | traceback.print_exc() | |||
print("Error: unable to get_bond info.") | print("Error: unable to get_bond info.") | |||
raise QuietException | raise QuietException | |||
finally: | finally: | |||
_self.unlock(r,_self) | _self.unlock(r,_self) | |||
if _self._raising(r,_self): raise QuietException | if _self._raising(r,_self): raise QuietException | |||
if not quiet: | if not quiet: | |||
name = name_dict.get(index, name) | name = name_dict.get(index, name) | |||
suffix = ' state %d' % state if state > 0 else '' | suffix = ' state %d' % state if state > 0 else '' | |||
for model, vlist in r: | for model, vlist in r: | |||
print(' %s = %s for object %s' % (name, cmd.get(name, model), mo del)) | print(' %s = %s for object %s' % (name, _self.get(name, model), model)) | |||
for idx1, idx2, value in vlist: | for idx1, idx2, value in vlist: | |||
if value is None: | if value is None: | |||
continue | continue | |||
print(' %s = %s between (%s`%d)-(%s`%d%s)' % (name, | print(' %s = %s between (%s`%d)-(%s`%d%s)' % (name, | |||
value, model, idx1, model, idx2, suffix)) | value, model, idx1, model, idx2, suffix)) | |||
return r | return r | |||
def unset_deep(settings='', object='*', updates=1, quiet=1, _self=cmd): | def unset_deep(settings='', object='*', updates=1, quiet=1, _self=cmd): | |||
''' | ''' | |||
DESCRIPTION | DESCRIPTION | |||
skipping to change at line 676 | skipping to change at line 676 | |||
else: | else: | |||
selection = None | selection = None | |||
try: | try: | |||
if _self.get_type(object) in ( | if _self.get_type(object) in ( | |||
'object:group', 'object:molecule'): | 'object:group', 'object:molecule'): | |||
selection = '(' + object + ')' | selection = '(' + object + ')' | |||
except: | except: | |||
pass | pass | |||
# 0 (object-level) and 1-N (object-state-level) | # 0 (object-level) and 1-N (object-state-level) | |||
states = range(cmd.count_states(object) + 1) | states = range(_self.count_states(object) + 1) | |||
for setting in settings: | for setting in settings: | |||
try: | try: | |||
for state in states: | for state in states: | |||
unset(setting, object, state=state, **kwargs) | unset(setting, object, state=state, **kwargs) | |||
if selection: | if selection: | |||
unset(setting, selection, **kwargs) | unset(setting, selection, **kwargs) | |||
except: | except: | |||
if not quiet: | if not quiet: | |||
print(' Setting: %s unset failed' % setting) | print(' Setting: %s unset failed' % setting) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |