updated uri.py to remove reference to OrderedDict