Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for the double forward slash issue with the request url and added django 1.8 to travis #536

Merged
merged 2 commits into from May 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
Expand Up @@ -7,10 +7,12 @@ notifications:
- thierryschellenbach@gmail.com
env:
# test the standalone functionality
- DJANGO=1.6.8 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.6.8 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.7.1 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.7.1 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.6.11 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.6.11 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.7.8 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.7.8 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.8.2 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
- DJANGO=1.8.2 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
postgres:
adapter: sqlite3
database: django_fb_test
Expand Down
27 changes: 21 additions & 6 deletions open_facebook/api.py
Expand Up @@ -649,7 +649,7 @@ class OpenFacebook(FacebookConnection):
**Example**::

graph = OpenFacebook(access_token)
print graph.get('me')
print(graph.get('me'))

'''

Expand Down Expand Up @@ -927,15 +927,30 @@ def my_image_url(self, size='large'):
return url

def request(self, path='', post_data=None, old_api=False, version=None, **params):
url = self.get_request_url(path=path, old_api=old_api, version=version,
**params)
logger.info('requesting url %s', url)
response = self._request(url, post_data)
return response

def get_request_url(self, path='', old_api=False, version=None, **params):
'''
Gets the url for the request.
'''
api_base_url = self.old_api_url if old_api else self.api_url
version = version or self.version

if getattr(self, 'access_token', None):
params['access_token'] = self.access_token
url = '%s%s/%s?%s' % (api_base_url, self.version,
path, urlencode(params))
logger.info('requesting url %s', url)
response = self._request(url, post_data)
return response

if api_base_url.endswith('/'):
api_base_url = api_base_url[:-1]

if path and path.startswith('/'):
path = path[1:]

url = '/'.join([api_base_url, version, path])
return '%s?%s' % (url, urlencode(params))


class TestUser(object):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,2 +1,2 @@
django>=1.3
django>=1.5
unidecode