From c40b6a6ebe7c2ec1c003091bfdd6c604cee9e55f Mon Sep 17 00:00:00 2001
From: Ryan McGrath <ryan@venodesigns.net>
Date: Thu, 17 Dec 2009 03:27:23 -0500
Subject: [PATCH] import oauth as oauth to avoid namespacing conflicts in
 builds; setup.py now properly includes all necessary modules, fixes build
 problems people reported

---
 setup.py           | 2 +-
 twython/twyauth.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index e21d0fc..3af5b8a 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ __version__ = '1.0'
 METADATA = dict(
 	name = "twython",
 	version = __version__,
-	py_modules = ['twython/core', 'twython/twyauth', 'twython/streaming', 'twython/oauth'],
+	py_modules = ['twython/__init__', 'twython/core', 'twython/twyauth', 'twython/streaming', 'twython/oauth'],
 	author = 'Ryan McGrath',
 	author_email = 'ryan@venodesigns.net',
 	description = 'An easy (and up to date) way to access Twitter data with Python.',
diff --git a/twython/twyauth.py b/twython/twyauth.py
index 4d88b1f..bf4183f 100644
--- a/twython/twyauth.py
+++ b/twython/twyauth.py
@@ -13,7 +13,7 @@ from urlparse import urlparse
 from urllib2 import HTTPError
 
 try:
-	import oauth as oauthlib
+	import oauth
 except ImportError:
 	pass