fixes

Author: CITGuru

PyInquirer/prompt.py

@@ -18,6 +18,8 @@ def prompt(questions, answers=None, **kwargs):
     true_color = kwargs.pop('true_color', False)
     refresh_interval = kwargs.pop('refresh_interval', 0)
     eventloop = kwargs.pop('eventloop', None)
+    kbi_msg = kwargs.pop('keyboard_interrupt_msg', 'Cancelled by user')
+
 
     for question in questions:
         # import the question
@@ -82,7 +84,7 @@ def prompt(questions, answers=None, **kwargs):
             raise ValueError('No question type \'%s\'' % type)
         except KeyboardInterrupt:
             print('')
-            print('Cancelled by user')
+            print(kbi_msg)
             print('')
             return {}
     return answers

PyInquirer/prompts/checkbox.py

@@ -127,11 +127,12 @@ def question(message, **kwargs):
     style = kwargs.pop('style', default_style)
 
     ic = InquirerControl(choices)
+    qmark = kwargs.pop('qmark', '?')
 
     def get_prompt_tokens(cli):
         tokens = []
 
-        tokens.append((Token.QuestionMark, '?'))
+        tokens.append((Token.QuestionMark, qmark))
         tokens.append((Token.Question, ' %s ' % message))
         if ic.answered:
             nbr_selected = len(ic.selected_options)

PyInquirer/prompts/confirm.py

@@ -30,10 +30,12 @@ def question(message, **kwargs):
     }))
     status = {'answer': None}
 
+    qmark = kwargs.pop('qmark', '?')
+
     def get_prompt_tokens(cli):
         tokens = []
 
-        tokens.append((Token.QuestionMark, '?'))
+        tokens.append((Token.QuestionMark, qmark))
         tokens.append((Token.Question, ' %s ' % message))
         if isinstance(status['answer'], bool):
             tokens.append((Token.Answer, ' Yes' if status['answer'] else ' No'))

PyInquirer/prompts/expand.py

@@ -120,7 +120,7 @@ def question(message, **kwargs):
 
     choices = kwargs.pop('choices', None)
     default = kwargs.pop('default', None)
-
+    qmark = kwargs.pop('qmark', '?')
     # TODO style defaults on detail level
     style = kwargs.pop('style', default_style)
 
@@ -130,7 +130,7 @@ def get_prompt_tokens(cli):
         tokens = []
         T = Token
 
-        tokens.append((T.QuestionMark, '?'))
+        tokens.append((T.QuestionMark, qmark))
         tokens.append((T.Question, ' %s ' % message))
         if not ic.answered:
             tokens.append((T.Instruction, ' (%s)' % ''.join(

PyInquirer/prompts/input.py

@@ -33,10 +33,12 @@ def validate(self, document):
 
     # TODO style defaults on detail level
     kwargs['style'] = kwargs.pop('style', default_style)
+    qmark = kwargs.pop('qmark', '?')
+
 
     def _get_prompt_tokens(cli):
         return [
-            (Token.QuestionMark, '?'),
+            (Token.QuestionMark, qmark),
             (Token.Question, ' %s  ' % message)
         ]
 

PyInquirer/prompts/list.py

@@ -110,7 +110,7 @@ def question(message, **kwargs):
 
     choices = kwargs.pop('choices', None)
     default = kwargs.pop('default', 0)  # TODO
-
+    qmark = kwargs.pop('qmark', '?')
     # TODO style defaults on detail level
     style = kwargs.pop('style', default_style)
 
@@ -119,7 +119,7 @@ def question(message, **kwargs):
     def get_prompt_tokens(cli):
         tokens = []
 
-        tokens.append((Token.QuestionMark, '?'))
+        tokens.append((Token.QuestionMark, qmark))
         tokens.append((Token.Question, ' %s ' % message))
         if ic.answered:
             tokens.append((Token.Answer, ' ' + ic.get_selection()[0]))

PyInquirer/prompts/rawlist.py

@@ -103,7 +103,7 @@ def question(message, **kwargs):
     #if 'default' in kwargs:
     #    raise ValueError('rawlist does not implement \'default\' '
     #                     'use \'checked\':True\' in choice!')
-
+    qmark = kwargs.pop('qmark', '?')
     choices = kwargs.pop('choices', None)
     if len(choices) > 9:
         raise ValueError('rawlist supports only a maximum of 9 choices!')
@@ -117,7 +117,7 @@ def get_prompt_tokens(cli):
         tokens = []
         T = Token
 
-        tokens.append((T.QuestionMark, '?'))
+        tokens.append((T.QuestionMark, qmark))
         tokens.append((T.Question, ' %s ' % message))
         if ic.answered:
             tokens.append((T.Answer, ' %s' % ic.get_selected_value()))

README.md

@@ -1,6 +1,6 @@
-# PythonInquirer?
+# PythonInquirer
 
-A collection of common interactive command line user interfaces. It is originally called whaaaaaat created by, but due to the author not active, outdated, bad naming and in need of fixes, I decided to rename and apply some fixes on it. I'll also carry out the author's TODO.
+A collection of common interactive command line user interfaces. It is originally called [whaaaaaat](https://github.com/finklabs/whaaaaat) created by **finklabs**, but due to bad naming and in need of fixes, I decided to rename and apply some necessary fixes on it. I'll also carry out the author's TODO.
 
 ## Table of Contents
 
@@ -13,7 +13,7 @@ A collection of common interactive command line user interfaces. It is originall
     6. [User Interfaces and Styles](#styles)
   2. [Windows Platform](#windows)
   3. [Support](#support)
-  4. [Contributing](#contributing)
+  4. [Contribution](#contribution)
   5. [Acknowledgments](#acknowledgements)
   6. [License](#license)
 
@@ -31,8 +31,6 @@ A collection of common interactive command line user interfaces. It is originall
 
 **Note:** **`PyInquirer`** provides the user interface and the inquiry session flow.
 > 
-If you're searching for a scaffolding utility, then check out [banana](https://github.com/finklabs/banana), the whaaaaat sister utility.
-
 
 ## Documentation
 <a name="documentation"></a>
@@ -104,7 +102,7 @@ Take `type`, `name`, `message`, `choices`[, `default`, `filter`] properties. (No
 default must be the choice `index` in the array or a choice `value`)
 
 ![List prompt](https://raw.githubusercontent.com/citguru/PyInquirer/develop/docs/images/input-prompt.png)
-
+s
 ---
 
 #### Raw List - `{type: 'rawlist'}`
@@ -214,26 +212,15 @@ Issue on Github TODO link
 
 For many issues like for example common Python programming issues stackoverflow might be a good place to search for an answer.  TODO link
 
-Visit the citguru slack channel for announcements and news. TODO link
-
-
-## Contributing
-<a name="contributing"></a>
-
-Unit test Unit test are written using pytest. Please add a unit test for every new feature or bug fix.
-
-Documentation Add documentation for every API change. Feel free to send typo fixes and better docs!
-
-We're looking to offer good support for multiple prompts and environments. If you want to help, we'd like to keep a list of testers for each terminal/OS so we can contact you and get feedback before release. Let us know if you want to be added to the list.
-
-
-## Acknowledgments
-<a name="acknowledgements"></a>
-
-Many thanks to our friends at Inquirer.js. We think they did a great job developing the tooling to support the nodejs technology.
+<a name="contribution"></a>
+## Contribution
 
+Yes, you can contribute to this.
 
 ## License
 <a name="license"></a>
 
-Copyright (c) 2016-2017 Mark Fink (twitter: @markfink) Licensed under the MIT license.
+Copyright (c) 2016-2017 
+Mark Fink (twitter: @markfink)
+Oyetoke Toby ((twitter: @oyetokeT))
+Licensed under the MIT license.

examples/checkbox.py

@@ -23,9 +23,10 @@
 questions = [
     {
         'type': 'checkbox',
+        'qmark': '[?]',
         'message': 'Select toppings',
         'name': 'toppings',
-        'choices': [
+        'choices': [ 
             Separator('= The Meats ='),
             {
                 'name': 'Ham'
@@ -76,4 +77,4 @@
 
 answers = prompt(questions, style=style)
 pprint(answers)
- 
+