Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 1 | From 49b133d84e7a1471bf51d8d005b1ba8b78c37724 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bartosz Golaszewski <brgl@bgdev.pl> |
| 3 | Date: Sat, 20 Mar 2021 20:59:54 +0100 |
| 4 | Subject: [PATCH] cli: drop the second argument from @click.argument() |
| 5 | decorator |
| 6 | |
| 7 | @click.argument no longer takes two positional arguments. |
| 8 | |
| 9 | Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> |
| 10 | --- |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | wpa_supplicant/cli.py | 28 ++++++++++++++-------------- |
| 14 | 1 file changed, 14 insertions(+), 14 deletions(-) |
| 15 | |
| 16 | diff --git a/wpa_supplicant/cli.py b/wpa_supplicant/cli.py |
| 17 | index bad5b5b..1fb322d 100644 |
| 18 | --- a/wpa_supplicant/cli.py |
| 19 | +++ b/wpa_supplicant/cli.py |
| 20 | @@ -81,7 +81,7 @@ def root(ctx, debug): |
| 21 | |
| 22 | |
| 23 | @root.group() |
| 24 | -@click.argument('ifname', 'e.g. wlan0') |
| 25 | +@click.argument('ifname') |
| 26 | @click.pass_context |
| 27 | def interface(ctx, ifname): |
| 28 | """Access fi.w1.wpa_supplicant1.Interface object""" |
| 29 | @@ -101,7 +101,7 @@ def interface_p2p_device(): |
| 30 | |
| 31 | |
| 32 | @root.group() |
| 33 | -@click.argument('ifname', 'e.g. wlan0') |
| 34 | +@click.argument('ifname') |
| 35 | @click.option('--ssid', default=None, help='Look at scan results for BSS examples') |
| 36 | @click.option('--bssid', default=None, help='Look at scan results for BSS examples') |
| 37 | @click.pass_context |
| 38 | @@ -149,7 +149,7 @@ def persistent_group(): |
| 39 | # fi.w1.wpa_supplicant1 API |
| 40 | # |
| 41 | @root.command() |
| 42 | -@click.argument('ifname', 'e.g. wlan0') |
| 43 | +@click.argument('ifname') |
| 44 | @click.option('--bridge_if_name', default=None, help='Bridge to control, e.g., br0') |
| 45 | @click.option('--driver', default=None, help='e.g. nl80211') |
| 46 | @click.option('--config_file', default=None, help='Config file path') |
| 47 | @@ -161,7 +161,7 @@ def create_interface(ifname, bridge_if_name, driver, config_file): |
| 48 | |
| 49 | |
| 50 | @root.command() |
| 51 | -@click.argument('ifname', 'e.g. wlan0') |
| 52 | +@click.argument('ifname') |
| 53 | def remove_interface(ifname): |
| 54 | """Method: Deregisters a wireless interface from wpa_supplicant""" |
| 55 | with supplicant() as supp: |
| 56 | @@ -170,7 +170,7 @@ def remove_interface(ifname): |
| 57 | |
| 58 | |
| 59 | @root.command() |
| 60 | -@click.argument('ifname', 'e.g. wlan0') |
| 61 | +@click.argument('ifname') |
| 62 | def get_interface(ifname): |
| 63 | """Method: Returns a D-Bus path to an object related to an interface which wpa_supplicant already controls""" |
| 64 | with supplicant() as supp: |
| 65 | @@ -178,7 +178,7 @@ def get_interface(ifname): |
| 66 | |
| 67 | |
| 68 | @root.command(name='get') |
| 69 | -@click.argument('name', 'Name of property (case sensitive)') |
| 70 | +@click.argument('name') |
| 71 | def root_get(name): |
| 72 | """Method: Get Property (case sensitive)""" |
| 73 | with supplicant() as supp: |
| 74 | @@ -186,8 +186,8 @@ def root_get(name): |
| 75 | |
| 76 | |
| 77 | @root.command(name='set') |
| 78 | -@click.argument('name', 'Name of property (case sensitive)') |
| 79 | -@click.argument('value', 'Value to be set') |
| 80 | +@click.argument('name') |
| 81 | +@click.argument('value') |
| 82 | def root_set(name, value): |
| 83 | """Method: Set Property (case sensitive)""" |
| 84 | with supplicant() as supp: |
| 85 | @@ -217,7 +217,7 @@ def disconnect(ctx): |
| 86 | |
| 87 | |
| 88 | @interface.command(name='get') |
| 89 | -@click.argument('name', 'Name of property (case sensitive)') |
| 90 | +@click.argument('name') |
| 91 | @click.pass_context |
| 92 | def interface_get(ctx, name): |
| 93 | """Method: Get Property (case sensitive)""" |
| 94 | @@ -227,8 +227,8 @@ def interface_get(ctx, name): |
| 95 | |
| 96 | |
| 97 | @interface.command(name='set') |
| 98 | -@click.argument('name', 'Name of property (case sensitive)') |
| 99 | -@click.argument('value', 'Value to be set') |
| 100 | +@click.argument('name') |
| 101 | +@click.argument('value') |
| 102 | @click.pass_context |
| 103 | def interface_set(ctx, name, value): |
| 104 | """Method: Set Property (case sensitive)""" |
| 105 | @@ -241,7 +241,7 @@ def interface_set(ctx, name, value): |
| 106 | # fi.w1.wpa_supplicant1.BSS API |
| 107 | # |
| 108 | @bss.command(name='get') |
| 109 | -@click.argument('name', 'Name of property (case sensitive)') |
| 110 | +@click.argument('name') |
| 111 | @click.pass_context |
| 112 | def bss_get(ctx, name): |
| 113 | """Method: Get Property (case sensitive)""" |
| 114 | @@ -261,8 +261,8 @@ def bss_get(ctx, name): |
| 115 | |
| 116 | |
| 117 | @bss.command(name='set') |
| 118 | -@click.argument('name', 'Name of property (case sensitive)') |
| 119 | -@click.argument('value', 'Value to be set') |
| 120 | +@click.argument('name') |
| 121 | +@click.argument('value') |
| 122 | @click.pass_context |
| 123 | def bss_set(ctx, name, value): |
| 124 | """Method: Set Property (case sensitive)""" |
| 125 | -- |
| 126 | 2.25.1 |
| 127 | |