Use six.moves instead of try/except ImportError, reorder imports (#…

…129)

* Use `six.moves` instead of `try/except ImportError`, reorder imports

* Update test_datatable.py

quandl/model/database.py

@@ -1,21 +1,16 @@
-try:
-    from urllib.parse import urlparse
-    from urllib.parse import urlencode
-except ImportError:
-    from urlparse import urlparse
-    from urllib import urlencode
-
 import os
 
+from six.moves.urllib.parse import urlencode, urlparse
+
+import quandl.model.dataset
 from quandl.api_config import ApiConfig
 from quandl.connection import Connection
-from quandl.util import Util
 from quandl.errors.quandl_error import QuandlError
+from quandl.message import Message
 from quandl.operations.get import GetOperation
 from quandl.operations.list import ListOperation
+from quandl.util import Util
 from .model_base import ModelBase
-from quandl.message import Message
-import quandl.model.dataset
 
 
 class Database(GetOperation, ListOperation, ModelBase):

quandl/model/datatable.py

@@ -1,21 +1,17 @@
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib import urlopen
-
-from time import sleep
 import os
+from time import sleep
+
+from six.moves.urllib.request import urlopen
 
 from quandl.connection import Connection
-from quandl.util import Util
 from quandl.errors.quandl_error import QuandlError
+from quandl.message import Message
 from quandl.operations.get import GetOperation
 from quandl.operations.list import ListOperation
+from quandl.util import Util
 from quandl.utils.request_type_util import RequestType
-
-from .model_base import ModelBase
-from quandl.message import Message
 from .data import Data
+from .model_base import ModelBase
 
 
 class Datatable(GetOperation, ListOperation, ModelBase):

test/test_database.py

@@ -1,23 +1,19 @@
-try:
-    from urllib.parse import urlparse
-    from urllib.parse import parse_qs
-except ImportError:
-    from urlparse import urlparse
-    from cgi import parse_qs
-
+import json
 import re
 import unittest
-from test.helpers.httpretty_extension import httpretty
-import json
+
 import six
-from quandl.errors.quandl_error import (InternalServerError, QuandlError)
+from mock import call, mock_open, patch
+from six.moves.urllib.parse import parse_qs, urlparse
+
 from quandl.api_config import ApiConfig
-from quandl.model.database import Database
 from quandl.connection import Connection
-from test.test_retries import ModifyRetrySettingsTestCase
-from mock import patch, call, mock_open
+from quandl.errors.quandl_error import (InternalServerError, QuandlError)
+from quandl.model.database import Database
 from test.factories.database import DatabaseFactory
 from test.factories.meta import MetaFactory
+from test.helpers.httpretty_extension import httpretty
+from test.test_retries import ModifyRetrySettingsTestCase
 
 
 class GetDatabaseTest(unittest.TestCase):

test/test_datatable.py

@@ -1,20 +1,18 @@
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
+import json
 import re
 import unittest
+
 import httpretty
-import json
 import six
+from mock import call, mock_open, patch
+from six.moves.urllib.parse import urlparse
+
+from quandl.api_config import ApiConfig
+from quandl.errors.quandl_error import (InternalServerError, QuandlError)
 from quandl.model.datatable import Datatable
-from mock import patch, call, mock_open
 from test.factories.datatable import DatatableFactory
 from test.test_retries import ModifyRetrySettingsTestCase
-from quandl.api_config import ApiConfig
 from quandl.utils.request_type_util import RequestType
-from quandl.errors.quandl_error import (InternalServerError, QuandlError)
 from parameterized import parameterized