Skip to content

Commit 1fabd58

Browse files
committed
include library version as part of user-agent
1 parent c430b28 commit 1fabd58

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

scrapinghub.py

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
"""Scrapinghub API Client Library"""
1+
"""
2+
Scrapinghub API Client Library
3+
"""
24

35
import os
46
import json
57
import warnings
6-
import requests
7-
from cStringIO import StringIO
8-
9-
from requests.compat import urljoin
10-
from requests.models import urlencode
118

129

1310
__all__ = ["APIError", "Connection"]
11+
__version__ = '1.0'
1412

1513

1614
class Connection(object):
@@ -46,13 +44,14 @@ def __init__(self, username_or_apikey=None, password='', _old_passwd='', url='ht
4644
self.url = url
4745
self.username_or_apikey = username_or_apikey
4846
self.auth = (username_or_apikey, password)
49-
self._request_headers = {'User-Agent': 'python-scrapinghub/1.0'}
47+
self._request_headers = {'User-Agent': 'python-scrapinghub/{0}'.format(__version__)}
5048

5149
def __repr__(self):
5250
return "Connection(%r)" % self.username_or_apikey
5351

5452
def _build_url(self, method, format):
5553
"""Returns full url for given method and format"""
54+
from requests.compat import urljoin
5655
# TODO: verify method's format support
5756
try:
5857
base_path = self.API_METHODS[method]
@@ -64,6 +63,7 @@ def _build_url(self, method, format):
6463

6564
def _get(self, method, format, params=None, headers=None, raw=False):
6665
"""Performs GET request"""
66+
from requests.models import urlencode
6767
url = self._build_url(method, format)
6868
if params:
6969
url = "{0}?{1}".format(url, urlencode(params, True))
@@ -84,6 +84,7 @@ def _request(self, url, data, headers, format, raw, files=None):
8484
8585
Raises APIError if json response have error status.
8686
"""
87+
import requests
8788
if format not in ('json', 'jl'):
8889
raise APIError("format must be either json or jl")
8990

@@ -282,6 +283,7 @@ def delete(self):
282283
return result['count']
283284

284285
def add_report(self, key, content, content_type='text/plain'):
286+
from requests.compat import StringIO
285287
params = {
286288
'project': self.project.name,
287289
'job': self.id,

setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
from scrapinghub import __version__
12
try:
23
from setuptools import setup
34
except ImportError:
45
from distutils.core import setup
56

7+
68
setup(name='scrapinghub',
7-
version='0.2',
9+
version=__version__,
810
license='BSD',
911
description='Client interface for Scrapinghub API',
1012
author='Scrapinghub',

0 commit comments

Comments
 (0)