diff --git a/remote.py b/remote.py index 9e5cd52..407851a 100755 --- a/remote.py +++ b/remote.py @@ -12,7 +12,7 @@ ## to model names in L being a list with comma and no spaces. -from __future__ import print_function + import os import json import odoorpc # pip install odoorpc @@ -110,12 +110,12 @@ def login( server = None, port = None, db = None, user = None, passwd = None ): if server: tsv( 'Server:', server ) else: - server = raw_input('Server address: ') + server = input('Server address: ') if port: tsv( 'Port:', port ) else: - port = raw_input('Port: ') + port = input('Port: ') odoo = odoorpc.ODOO( server, port=port ) print( 'Connected to ' + server + ':' + port ) @@ -127,17 +127,17 @@ def login( server = None, port = None, db = None, user = None, passwd = None ): if db: tsv( 'Database:', db ) else: - db = raw_input('Choose database: ') + db = input('Choose database: ') if user: tsv( 'User:', user ) else: - user = raw_input('User: ') + user = input('User: ') if passwd: tsv( 'Password:', '****************' ) else: - passwd = raw_input('Password: ') + passwd = input('Password: ') eprint( server, port, user, passwd ) @@ -272,9 +272,9 @@ def flatten_stack( data ): def flatten( obj ): if type(obj) == dict: # eprint( 'is a dict') - key = obj.keys()[0] if obj.keys()[0] != 'file' else obj.keys()[1] + key = list(obj.keys())[0] if list(obj.keys())[0] != 'file' else list(obj.keys())[1] flat.append( key ) - for field in obj[key].keys(): + for field in list(obj[key].keys()): # eprint( 'go flat key', field ) flatten( obj[key][field] ) @@ -409,7 +409,7 @@ def save( model, domains, recurse = False, force = False ): jlog( unique_models ) to_browse = groupby_model( unique_models ) - for mod in to_browse.keys(): + for mod in list(to_browse.keys()): print('loading %s %s' % (len(to_browse[mod]), mod) ) if mod in odoo.env: try: @@ -537,3 +537,4 @@ if __name__ == "__main__": get_schema( METHOD ) + diff --git a/renderers.py b/renderers.py index 8969854..e6d7197 100644 --- a/renderers.py +++ b/renderers.py @@ -1,4 +1,3 @@ -from __future__ import print_function import json as JSON from config import * @@ -15,7 +14,7 @@ import os os.environ["PYTHONIOENCODING"] = "utf-8" def tsv( *fields ): - fields = [ f.encode('utf-8') if type(f) == unicode else f for f in fields ] + fields = [ f.encode('utf-8') if type(f) == str else f for f in fields ] # fields = [ str(f) if type(f) != str else f for f in fields ] # fields = [ '"' + s.replace('"','\\"').replace(',','\\,') + '"' for s in fields ] print( *fields, sep='\t' ) @@ -23,7 +22,7 @@ def tsv( *fields ): def csv( *fields ): # print( [ type(s) for s in fields ] ) # print( fields ) - fields = [ f.encode('utf-8') if type(f) == unicode else f for f in fields ] + fields = [ f.encode('utf-8') if type(f) == str else f for f in fields ] # print( [ type(s) for s in fields ] ) # print( fields ) fields = [ str(f) if type(f) != str else f for f in fields ] @@ -83,3 +82,4 @@ def render( opts, model, list ): # +format=json,xml,csv +json +tsv # render_xml( model, list ) else: render_tsv( model, list ) + diff --git a/utils.py b/utils.py index 3ae7a0c..a175bcb 100644 --- a/utils.py +++ b/utils.py @@ -1,4 +1,3 @@ -from __future__ import print_function import os import sys import json @@ -66,3 +65,4 @@ def groupby_model( arr ): res[model] = [] res[model].append( int(id) ) return res +