Skip to content

Removed re which was used to strip web responce #32

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
Niyakiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed re which was used to strip web responce #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions ec2instancespricing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import urllib2
import argparse
import datetime
import re
import demjson

EC2_REGIONS = [
Expand Down Expand Up @@ -288,12 +287,8 @@ def _load_data(url, use_cache=False, cache_class=SimpleResultsCache):
f = urllib2.urlopen(url)
request = f.read()

# strip initial comment (with newline)
modified_request = re.sub(re.compile(r'/\*.*\*/\n', re.DOTALL), '', request)
# strip from front of request
modified_request = re.sub(r'^callback\(', '', modified_request)
# strip from end of request
modified_request = re.sub(r'\);*$', '', modified_request)
# strip non JSON data from responce
modified_request = request.split('\n')[-1][:-2][9:]

json = demjson.decode(modified_request)

Expand Down