new 1.0beta3, previous was unreleased
diff --git a/setup.py b/setup.py
index 87e54d9..4908cb8 100644
--- a/setup.py
+++ b/setup.py
@@ -19,12 +19,7 @@
"""
import setup_utils
-has_setuptools = False
-try:
- from setuptools import setup
- has_setuptools = True
-except ImportError:
- from distutils.core import setup
+from setuptools import setup
packages = [
'apiclient',
@@ -51,13 +46,7 @@
for import_name, requires, package, modules in REQUIREMENTS:
if setup_utils.is_missing(import_name):
- if has_setuptools:
- install_requires.append(requires)
- else:
- if package is not None:
- packages.append(package)
- else:
- py_modules.extend(modules)
+ install_requires.append(requires)
long_desc = """The Google API Client for Python is a client library for
diff --git a/setup_oauth2client.py b/setup_oauth2client.py
index 6090c1a..ab5bed2 100644
--- a/setup_oauth2client.py
+++ b/setup_oauth2client.py
@@ -19,12 +19,7 @@
"""
import setup_utils
-has_setuptools = False
-try:
- from setuptools import setup
- has_setuptools = True
-except ImportError:
- from distutils.core import setup
+from setuptools import setup
packages = [
'oauth2client',
@@ -43,13 +38,7 @@
for import_name, requires, package, modules in REQUIREMENTS:
if setup_utils.is_missing(import_name):
- if has_setuptools:
- install_requires.append(requires)
- else:
- if package is not None:
- packages.append(package)
- else:
- py_modules.extend(modules)
+ install_requires.append(requires)
long_desc = """The oauth2client is a client library for OAuth 2.0."""