equal
deleted
inserted
replaced
106 passwd = getpass('password: ') |
106 passwd = getpass('password: ') |
107 # XXX decode password using stdin encoding then encode it using appl'encoding |
107 # XXX decode password using stdin encoding then encode it using appl'encoding |
108 return user, passwd |
108 return user, passwd |
109 |
109 |
110 |
110 |
111 _MARKER=object() |
111 _MARKER = object() |
112 def func_name(func): |
112 def func_name(func): |
113 name = getattr(func, '__name__', _MARKER) |
113 name = getattr(func, '__name__', _MARKER) |
114 if name is _MARKER: |
114 if name is _MARKER: |
115 name = getattr(func, 'func_name', _MARKER) |
115 name = getattr(func, 'func_name', _MARKER) |
116 if name is _MARKER: |
116 if name is _MARKER: |