Use package relative imports.

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index 8b01bb7dcc10d52d55ff58a2b616e1f5f6c572ff..d3d67d95efff6b8075c70c5c3d1805b630c90772 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -7,12 +7,12 @@ Tweepy Twitter API library
 """
 __version__ = '1.0'
 
-from models import *
-from error import TweepError
-from api import API
-from cache import *
-from auth import BasicAuthHandler, OAuthHandler
-from streaming import Stream
+from . models import *
+from . error import TweepError
+from . api import API
+from . cache import *
+from . auth import BasicAuthHandler, OAuthHandler
+from . streaming import Stream
 
 # Global, unauthenticated instance of API
 api = API()

diff --git a/tweepy/api.py b/tweepy/api.py
index 5448cb84a76e961bc3abcf82fd91eddbbcadfbb4..0a74ab177a6647a771996c758b926e7d541b4a2b 100644 (file)
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@ -2,9 +2,9 @@
 # Copyright 2009 Joshua Roesslein
 # See LICENSE
 
-from binder import bind_api
-from parsers import *
-from error import TweepError
+from . binder import bind_api
+from . parsers import *
+from . error import TweepError
 
 """Twitter API"""
 class API(object):

diff --git a/tweepy/auth.py b/tweepy/auth.py
index 52aced56fd83726b4f349ddd6c1ba9e83202d8fd..49826ee248a9dd09343826b867df716384d2e573 100644 (file)
--- a/tweepy/auth.py
+++ b/tweepy/auth.py
@@ -6,8 +6,8 @@ from urllib2 import Request, urlopen
 from urllib import quote
 import base64
 
-import oauth
-from error import TweepError
+from . import oauth
+from . error import TweepError
 
 class AuthHandler(object):
 

diff --git a/tweepy/binder.py b/tweepy/binder.py
index 47a27319a30ca0a29ac3a5ed21a440734ebf83f7..5608aa9c110137d1d6bb4b16e3a1c0305e668faa 100644 (file)
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -5,8 +5,8 @@
 import httplib
 import urllib
 
-from parsers import parse_error
-from error import TweepError
+from . parsers import parse_error
+from . error import TweepError
 
 def bind_api(path, parser, allowed_param=None, method='GET', require_auth=False,
               timeout=None, host=None):

diff --git a/tweepy/cache.py b/tweepy/cache.py
index e7f9e050b97fb2d2138c275dc94d6f0cd5aeb106..28f218d5561c81e44f3e654189c7f707356e13e3 100644 (file)
--- a/tweepy/cache.py
+++ b/tweepy/cache.py
@@ -2,7 +2,7 @@
 # Copyright 2009 Joshua Roesslein
 # See LICENSE
 
-from __future__ import with_statement
+from __future__ import with_statement  # need this for py2.5
 
 import time
 import threading
@@ -11,7 +11,7 @@ import hashlib
 import fcntl
 import cPickle as pickle
 
-from error import TweepError
+from . error import TweepError
 
 """Cache interface"""
 class Cache(object):

diff --git a/tweepy/models.py b/tweepy/models.py
index 82ca9e20c2a97fa832ac2d2fd389ac3bdbdc8739..eb5ec14afacaa6893f970b851563a68f7194c5f2 100644 (file)
--- a/tweepy/models.py
+++ b/tweepy/models.py
@@ -2,7 +2,7 @@
 # Copyright 2009 Joshua Roesslein
 # See LICENSE
 
-from error import TweepError
+from . error import TweepError
 
 class Model(object):
 

diff --git a/tweepy/parsers.py b/tweepy/parsers.py
index 12167859b56f6a85db3a5bad11083cc0fc1e4a11..a2cda3a95261cf9dcd4e8be457e151fa2ba3f558 100644 (file)
--- a/tweepy/parsers.py
+++ b/tweepy/parsers.py
@@ -4,7 +4,7 @@
 
 from datetime import datetime
 
-from models import models
+from . models import models
 
 try:
   import json