527 sourceuri = input('source identifier (a unique name used to ' |
527 sourceuri = input('source identifier (a unique name used to ' |
528 'tell sources apart): ').strip() |
528 'tell sources apart): ').strip() |
529 if not sourceuri: |
529 if not sourceuri: |
530 print('-> mandatory.') |
530 print('-> mandatory.') |
531 else: |
531 else: |
532 sourceuri = unicode(sourceuri, sys.stdin.encoding) |
532 sourceuri = str(sourceuri, sys.stdin.encoding) |
533 if sourceuri in used: |
533 if sourceuri in used: |
534 print('-> uri already used, choose another one.') |
534 print('-> uri already used, choose another one.') |
535 else: |
535 else: |
536 break |
536 break |
537 url = input('source URL (leave empty for none): ').strip() |
537 url = input('source URL (leave empty for none): ').strip() |
538 url = unicode(url) if url else None |
538 url = str(url) if url else None |
539 # XXX configurable inputlevel |
539 # XXX configurable inputlevel |
540 sconfig = ask_source_config(config, type, inputlevel=self.config.config_level) |
540 sconfig = ask_source_config(config, type, inputlevel=self.config.config_level) |
541 cfgstr = unicode(generate_source_config(sconfig), sys.stdin.encoding) |
541 cfgstr = str(generate_source_config(sconfig), sys.stdin.encoding) |
542 cnx.create_entity('CWSource', name=sourceuri, type=unicode(type), |
542 cnx.create_entity('CWSource', name=sourceuri, type=str(type), |
543 config=cfgstr, parser=unicode(parser), url=unicode(url)) |
543 config=cfgstr, parser=str(parser), url=str(url)) |
544 cnx.commit() |
544 cnx.commit() |
545 finally: |
545 finally: |
546 repo.hm.call_hooks('server_shutdown') |
546 repo.hm.call_hooks('server_shutdown') |
547 |
547 |
548 |
548 |