openstack/yaql
Code Issues Proposed changes

Merge branch 'master' into version-0.3

Browse Source 
Conflicts:
	setup.py
	yaql/cli/cli_functions.py
	yaql/functions/builtin.py
This commit is contained in:
ativelkov 2014-01-24 17:27:53 -08:00
commit f07215a2b1
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yaql/__init__.py
View File

@ -18,6 +18,9 @@ from yaql.language import parser, context
__versioninfo__ = (0, 3, 0) __versioninfo__ = (0, 3, 0)
__version__ = '.'.join(map(str, __versioninfo__)) __version__ = '.'.join(map(str, __versioninfo__))
__versioninfo__ = (0, 2, 1)
__version__ = '.'.join(map(str, __versioninfo__))
def parse(expression): def parse(expression):
return parser.parse(expression) return parser.parse(expression)

4
yaql/cli/cli_functions.py
View File

@ -33,12 +33,16 @@ PROMPT = "yaql> "
@context_aware @context_aware
def main(context, show_tokens): def main(context, show_tokens):
print "Yet Another Query Language - command-line query tool" print "Yet Another Query Language - command-line query tool"
print "Version {0}".format(version)
print "Copyright (c) 2013 Mirantis, Inc" print "Copyright (c) 2013 Mirantis, Inc"
print print
if not context.get_data(): if not context.get_data():
print "No data loaded into context " print "No data loaded into context "
print "Type '@load data-file.json' to load data" print "Type '@load data-file.json' to load data"
print print
readline.parse_and_bind('')
comm = True comm = True
while comm != 'exit': while comm != 'exit':
try: try: