updated v20 version, other minor changes

Author: Dave Pettypiece

requirements/base.txt

@@ -2,4 +2,4 @@ pyyaml==3.11
 tabulate==0.7.5
 requests==2.11.1
 ujson==1.35
-v20==3.0.9.0
+v20==3.0.10.0

src/common/config.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import yaml
 import os
 import sys
@@ -98,7 +99,7 @@ def dump(self, path):
         path = os.path.expanduser(path)
 
         with open(path, "w") as f:
-            print >>f, str(self)
+            print(str(self), file=f)
 
     def load(self, path):
         """
@@ -281,13 +282,11 @@ def create_context(self):
             self.hostname,
             self.port,
             self.ssl,
-            application="sample_code"
+            application="sample_code",
+            token=self.token,
+            datetime_format=self.datetime_format
         )
 
-        ctx.set_token(self.token)
-
-        ctx.set_datetime_format(self.datetime_format)
-
         return ctx
 
     def create_streaming_context(self):
@@ -297,13 +296,12 @@ def create_streaming_context(self):
         ctx = v20.Context(
             self.streaming_hostname,
             self.port,
-            self.ssl
+            self.ssl,
+            application="sample_code",
+            token=self.token,
+            datetime_format=self.datetime_format
         )
 
-        ctx.set_token(self.token)
-
-        ctx.set_datetime_format(self.datetime_format)
-
         return ctx
 
 

src/common/input.py

@@ -10,11 +10,14 @@ def get_string(prompt, default=None):
         "" if default is None else " [{}]".format(default)
     )
 
+    try: i = raw_input
+    except NameError: i = input
+
     value = None
 
     while value is None or len(value) == 0:
         try:
-            value = raw_input(prompt) or default
+            value = i(prompt) or default
         except KeyboardInterrupt:
             print("")
             sys.exit()
@@ -58,9 +61,12 @@ def get_yn(prompt, default=True):
         choices
     )
 
+    try: i = raw_input
+    except NameError: i = input
+
     while choice is None:
         try:
-            s = raw_input(prompt)
+            s = i(prompt)
 
             if len(s) == 0 and default is not None:
                 return default
@@ -100,9 +106,12 @@ def get_from_list(choices, title, prompt, default=0):
     for i, c in enumerate(choices):
         print("[{}] {}".format(i, c))
 
+    try: i = raw_input
+    except NameError: i = input
+
     while choice is None:
         try:
-            s = raw_input(prompt) or default
+            s = i(prompt) or default
 
             i = int(s)
 

src/instrument/candles.py

@@ -24,9 +24,8 @@ def main():
     common.config.add_argument(parser)
 
     parser.add_argument(
-        "--instrument",
+        "instrument",
         type=common.args.instrument,
-        required=True,
         help="The instrument to get candles for"
     )
 

src/instrument/candles_poll.py

@@ -141,10 +141,8 @@ def main():
     common.config.add_argument(parser)
 
     parser.add_argument(
-        "--instrument",
+        "instrument",
         type=common.args.instrument,
-        default=None,
-        required=True,
         help="The instrument to get candles for"
     )
 

src/market_order_full_example.py

@@ -34,30 +34,26 @@ def main():
     # Add Account arguments
     #
     parser.add_argument(
-        "--account-id",
-        required=True,
+        "accountid",
         help="v20 Account ID"
     )
 
     parser.add_argument(
-        "--token",
-        required=True,
+        "token",
         help="v20 Auth Token"
     )
 
     #
     # Add arguments for minimal Market Order
     #
     parser.add_argument(
-        "--instrument",
+        "instrument",
         type=common.args.instrument,
-        required=True,
         help="The instrument to place the Market Order for"
     )
 
     parser.add_argument(
-        "--units",
-        required=True,
+        "units",
         help="The number of units for the Market Order"
     )
 
@@ -69,24 +65,14 @@ def main():
     api = v20.Context(
         args.hostname,
         args.port,
-        True
+        token=args.token
     )
 
-    #
-    # Set the auth token to use
-    #
-    api.set_token(args.token)
-
-    #
-    # Extract the Account ID from the arguments
-    #
-    account_id = args.account_id
-
     #
     # Submit the request to create the Market Order
     #
     response = api.order.market(
-        account_id,
+        args.accountid,
         instrument=args.instrument,
         units=args.units
     )

src/order/list_pending.py

@@ -14,7 +14,7 @@ def main():
         dest="summary",
         action="store_true",
         help="Print a summary of the orders",
-        default=False
+        default=True
     )
 
     parser.add_argument(

src/pricing/stream.py

@@ -36,6 +36,8 @@ def main():
 
     api = args.config.create_streaming_context()
 
+    # api.set_convert_decimal_number_to_native(False)
+
     # api.set_stream_timeout(3)
 
     #

src/trade/close.py

@@ -19,8 +19,7 @@ def main():
     common.config.add_argument(parser)
 
     parser.add_argument(
-        "--trade-id",
-        required=True,
+        "tradeid",
         help=(
             "The ID of the Trade to close. If prepended "
             "with an '@', this will be interpreted as a client Trade ID"
@@ -50,7 +49,7 @@ def main():
 
     response = api.trade.close(
         account_id,
-        args.trade_id,
+        args.tradeid,
         units=args.units
     )
 

src/trade/get.py

@@ -63,7 +63,7 @@ def main():
     if args.all:
         response = api.trade.list_open(account_id)
 
-        for trade in response.get("trades", 200):
+        for trade in reversed(response.get("trades", 200)):
             if args.summary:
                 print(trade.title())
             else: