added missing close parens
added six dependency
swap out urlparse for six parse
merged