fixed extension bug, fixed print userinfo bug when missing password

This commit is contained in:
RussellBallestrini 2012-02-14 14:23:07 -05:00
parent c5df423af4
commit ae5dc75bb8

View file

@ -76,19 +76,22 @@ class Uri( object ):
@property
def userinfo( self ):
"""return username:password"""
return self.username + ':' + self.password
if self.username and self.password:
return self.username + ':' + self.password
if self.username: return self.username
else: return None
@userinfo.setter
def userinfo( self, info ):
"""set username and password"""
self.username, self.password = info, None
if ':' in self.username:
self.username, self.password = self.username.split( ':' )
if ':' in info:
self.username, self.password = info.split( ':' )
@property
def extension( self ):
"""return extension"""
if '.' in self.filename: return self.filename.split('.')[1]
if '.' in self.filename: return self.filename.split('.')[-1]
else: return None
@property