Move setup.py requirements

* Moved requires for cryptotoken changes so that you don't have to install
  the dependencies if you aren't going to use cryptotokens

2 files changed, 10 insertions, 4 deletions

diff --git a/oauthlib/common.py b/oauthlib/common.py
index 044ba43..831f9eb 100644
--- a/oauthlib/common.py
+++ b/oauthlib/common.py
@@ -9,10 +9,8 @@ This module provides data structures and utilities common
 to all implementations of OAuth.
 """
 
-import Crypto.PublicKey.RSA as RSA
 import collections
 import datetime
-import jwt
 import logging
 import random
 import re
@@ -238,6 +236,9 @@ def generate_token(length=30, chars=UNICODE_ASCII_CHARACTER_SET):
 
 
 def generate_crypto_token(private_pem, request):
+    import Crypto.PublicKey.RSA as RSA
+    import jwt
+
     private_key = RSA.importKey(private_pem)
 
     now = datetime.datetime.utcnow()
@@ -256,6 +257,9 @@ def generate_crypto_token(private_pem, request):
 
 
 def verify_crypto_token(private_pem, token):
+    import Crypto.PublicKey.RSA as RSA
+    import jwt
+
     public_key = RSA.importKey(private_pem).publickey()
 
     try:
diff --git a/setup.py b/setup.py
index 073dc15..4beb592 100755
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,10 @@ if sys.version_info[0] == 3:
     tests_require = ['nose', 'pycrypto', 'pyjwt']
 else:
     tests_require = ['nose', 'unittest2', 'pycrypto', 'mock', 'pyjwt']
+rsa_require = ['pycrypto']
+cryptotoken_require = ['pycrypto', 'pyjwt']
 
-requires = ['pycrypto', 'pyjwt']
+requires = []
 
 setup(
     name='oauthlib',
@@ -39,7 +41,7 @@ setup(
     packages=find_packages(exclude=('docs', 'tests', 'tests.*')),
     test_suite='nose.collector',
     tests_require=tests_require,
-    extras_require={'test': tests_require},
+    extras_require={'test': tests_require, 'rsa': rsa_require, 'cryptotoken': cryptotoken_require},
     install_requires=requires,
     classifiers=[
         'Development Status :: 4 - Beta',