Permalink
Browse files

Adds support for evepaste v0.7

  • Loading branch information...
1 parent 78247f2 commit 70960296817af34b676b6697cb81a311e3b0f602 @sudorandom sudorandom committed Jan 31, 2015
Showing with 42 additions and 3 deletions.
  1. +3 −3 evepraisal/parser.py
  2. +39 −0 setup.py
@@ -1,5 +1,6 @@
from collections import defaultdict
from itertools import takewhile
+from re import sub
import evepaste
from evepaste import parsers
@@ -13,8 +14,7 @@ def parse(raw_paste):
representative_kind = 'unknown'
largest_kind_num = 0
- parser_list = [('bill_of_materials', parsers.parse_bill_of_materials),
- ('loot_history', parsers.parse_loot_history),
+ parser_list = [('loot_history', parsers.parse_loot_history),
('survey_scanner', parsers.parse_survey_scanner),
('pi', parsers.parse_pi),
('dscan', dscan_parser),
@@ -183,6 +183,6 @@ def tryhard_parser(lines):
def int_convert(s):
try:
- return int(s.translate({"'": '', ',': '', '.': '', ' ': '', 'x': ''}))
+ return int(sub(r"[,'\. 'x]", '', s))
except ValueError:
return
View
@@ -0,0 +1,39 @@
+import os
+
+from setuptools import setup, find_packages
+
+
+description = ("Tool to use in Eve Online for evaluating the value of items "
+ "sourced from various places within the game and out.")
+
+if os.path.exists('README.rst'):
+ f = open('README.rst')
+ try:
+ long_description = f.read()
+ finally:
+ f.close()
+else:
+ long_description = description
+
+setup(
+ name='evepraisal',
+ version='2.0',
+ description=description,
+ long_description=long_description,
+ author='Kevin McDonald',
+ author_email='k3vinmcdonald@gmail.com',
+ packages=find_packages(exclude=["tests"]),
+ license='MIT',
+ install_requires=[
+ 'flask',
+ 'Flask-Cache',
+ 'Flask-Babel',
+ 'flask_openid',
+ 'flask-sqlalchemy',
+ 'sqlalchemy',
+ 'alembic',
+ 'pylibmc',
+ 'evepaste',
+ ],
+ zip_safe=False,
+)

0 comments on commit 7096029

Please sign in to comment.