Skip to content

Compatibilidad con Python 3 #7

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compatibilidad con Python 3 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e252906
Update core.py
paskyorg Nov 28, 2015
855820e
Update optfunc.py
paskyorg Nov 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions simperium/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import os
import sys
import uuid
import urllib
import urllib2
import httplib
import urllib.request
import urllib.parse
import urllib.error
import http.client

try:
import simplejson as json
Expand Down Expand Up @@ -33,11 +34,12 @@ def _request(self, url, data=None, headers=None, method=None):
if not headers:
headers = {}
if data:
data = urllib.urlencode(data)
request = urllib2.Request(url, data, headers=headers)
#data = urllib.parse.urlencode(data)
data = urllib.parse.urlencode(data).encode('utf8') #Hack Python 2to3
request = urllib.request.Request(url, data, headers=headers)
if method:
request.get_method = lambda: method
response = urllib2.urlopen(request)
response = urllib.request.urlopen(request)
return response

def create(self, username, password):
Expand All @@ -47,8 +49,8 @@ def create(self, username, password):
'password': password, }
try:
response = self._request(self.appname+'/create/', data)
return json.loads(response.read())['access_token']
except urllib2.HTTPError:
return json.loads(response.read().decode('utf-8'))['access_token']
except urllib.error.HTTPError:
return None

def authorize(self, username, password):
Expand All @@ -57,7 +59,8 @@ def authorize(self, username, password):
'username': username,
'password': password, }
response = self._request(self.appname+'/authorize/', data)
return json.loads(response.read())['access_token']
#return json.loads(response.read())['access_token']
return json.loads(response.read().decode('utf-8'))['access_token'] #Hack Python 2to3


class Bucket(object):
Expand Down Expand Up @@ -108,13 +111,16 @@ def _request(self, url, data=None, headers=None, method=None, timeout=None):
url = '%s://%s/1/%s' % (self.scheme, self.host, url)
if not headers:
headers = {}
request = urllib2.Request(url, data, headers=headers)
if data:
request = urllib.request.Request(url, data.encode('utf8'), headers=headers)
else:
request = urllib.request.Request(url, data, headers=headers)
if method:
request.get_method = lambda: method
if sys.version_info < (2, 6):
response = urllib2.urlopen(request)
response = urllib.request.urlopen(request)
else:
response = urllib2.urlopen(request, timeout=timeout)
response = urllib.request.urlopen(request, timeout=timeout)
return response

def index(self, data=False, mark=None, limit=None, since=None):
Expand Down Expand Up @@ -155,12 +161,12 @@ def index(self, data=False, mark=None, limit=None, since=None):
args['limit'] = str(limit)
if since:
args['since'] = str(since)
args = urllib.urlencode(args)
args = urllib.parse.urlencode(args)
if len(args):
url += '?'+args

response = self._request(url, headers=self._auth_header())
return json.loads(response.read())
return json.loads(response.read().decode('utf-8')) #Hack Python 2to3

def get(self, item, default=None, version=None):
"""retrieves either the latest version of item from this bucket, or the
Expand All @@ -170,12 +176,12 @@ def get(self, item, default=None, version=None):
url += '/v/%s' % version
try:
response = self._request(url, headers=self._auth_header())
except urllib2.HTTPError, e:
except urllib.error.HTTPError as e:
if getattr(e, 'code') == 404:
return default
raise

return json.loads(response.read())
return json.loads(response.read().decode('utf-8'))

def post(self, item, data, version=None, ccid=None, include_response=False, replace=False):
"""posts the supplied data to item
Expand All @@ -196,10 +202,10 @@ def post(self, item, data, version=None, ccid=None, include_response=False, repl
data = json.dumps(data)
try:
response = self._request(url, data, headers=self._auth_header())
except urllib2.HTTPError:
except urllib.error.HTTPError:
return None
if include_response:
return item, json.loads(response.read())
return item, json.loads(response.read().decode('utf-8'))
else:
return item

Expand Down Expand Up @@ -239,7 +245,7 @@ def bulk_post(self, bulk_data, wait=True):
return True

# check each change response for 'error'
return json.loads(response.read())
return json.loads(response.read().decode('utf-8'))


def new(self, data, ccid=None):
Expand All @@ -256,7 +262,7 @@ def delete(self, item, version=None):
url += '/v/%s' % version
url += '?clientid=%s&ccid=%s' % (self.clientid, ccid)
response = self._request(url, headers=self._auth_header(), method='DELETE')
if not response.read().strip():
if not response.read().decode('utf-8').strip():
return ccid

def changes(self, cv=None, timeout=None):
Expand All @@ -277,14 +283,14 @@ def changes(self, cv=None, timeout=None):
headers = self._auth_header()
try:
response = self._request(url, headers=headers, timeout=timeout)
except httplib.BadStatusLine:
except http.client.BadStatusLine:
return []
except Exception, e:
except Exception as e:
if any(msg in str(e) for msg in ['timed out', 'Connection refused', 'Connection reset']) or \
getattr(e, 'code', None) in [502, 504]:
return []
raise
return json.loads(response.read())
return json.loads(response.read().decode('utf-8'))

def all(self, cv=None, data=False, username=False, most_recent=False, timeout=None):
"""retrieves *all* updates for this bucket, regardless of the user
Expand Down Expand Up @@ -322,14 +328,14 @@ def all(self, cv=None, data=False, username=False, most_recent=False, timeout=No
headers = self._auth_header()
try:
response = self._request(url, headers=headers, timeout=timeout)
except httplib.BadStatusLine:
except http.client.BadStatusLine:
return []
except Exception, e:
except Exception as e:
if any(msg in str(e) for msg in ['timed out', 'Connection refused', 'Connection reset']) or \
getattr(e, 'code', None) in [502, 504]:
return []
raise
return json.loads(response.read())
return json.loads(response.read().decode('utf-8'))


class SPUser(object):
Expand Down
4 changes: 2 additions & 2 deletions simperium/optfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):

def parse_args(self, argv):
options, args = OptionParser.parse_args(self, argv)
for k,v in options.__dict__.iteritems():
for k,v in options.__dict__.items():
if k in self._custom_names:
options.__dict__[self._custom_names[k]] = v
del options.__dict__[k]
Expand All @@ -42,7 +42,7 @@ def parse_args(self, argv):
def error(self, msg):
self._errors.append(msg)

optypes=[int,long,float,complex] # not type='choice' choices='a|b'
optypes=[int,float,complex] # not type='choice' choices='a|b'
def optype(t):
if t is bool:
return None
Expand Down