python-bugzilla
diff --git a/‎bugzilla/_cli.py‎
Lines changed: 18 additions & 11 deletions b/‎bugzilla/_cli.py‎
Lines changed: 18 additions & 11 deletions
diff --git a/‎tests/data/mockargs/test_attach3.txt‎
Lines changed: 9 additions & 0 deletions b/‎tests/data/mockargs/test_attach3.txt‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎tests/test_cli_attach.py‎
Lines changed: 12 additions & 0 deletions b/‎tests/test_cli_attach.py‎
Lines changed: 12 additions & 0 deletions
@@ -185,6 +185,19 @@ def _parser_add_output_options(p):
                  "section 'Output options' for more details.")
 
 
+def _parser_add_field_passthrough_opts(p):
+    p.add_argument('--field',
+        metavar="FIELD=VALUE", action="append", dest="fields",
+        help="Manually specify a bugzilla API field. FIELD is "
+        "the raw name used by the bugzilla instance. For example, if your "
+        "bugzilla instance has a custom field cf_my_field, do:\n"
+        "  --field cf_my_field=VALUE")
+    p.add_argument('--field-json',
+        metavar="JSONSTRING", action="append", dest="field_jsons",
+        help="Specify --field data as a JSON string. Example: --field-json "
+             '\'{"cf_my_field": "VALUE", "cf_array_field": [1, 2]}\'')
+
+
 def _parser_add_bz_fields(rootp, command):
     cmd_new = (command == "new")
     cmd_query = (command == "query")
@@ -256,17 +269,7 @@ def _parser_add_bz_fields(rootp, command):
         p.add_argument('-F', '--fixed_in',
             help="RHBZ 'Fixed in version' field")
 
-    # Put this at the end, so it sticks out more
-    p.add_argument('--field',
-        metavar="FIELD=VALUE", action="append", dest="fields",
-        help="Manually specify a bugzilla API field. FIELD is "
-        "the raw name used by the bugzilla instance. For example, if your "
-        "bugzilla instance has a custom field cf_my_field, do:\n"
-        "  --field cf_my_field=VALUE")
-    p.add_argument('--field-json',
-        metavar="JSONSTRING", action="append", dest="field_jsons",
-        help="Specify --field data as a JSON string. Example: --field-json "
-             '\'{"cf_my_field": "VALUE", "cf_array_field": [1, 2]}\'')
+    _parser_add_field_passthrough_opts(p)
 
     if not cmd_modify:
         _parser_add_output_options(rootp)
@@ -405,6 +408,8 @@ def _setup_action_attach_parser(subparsers):
     p.add_argument('--private', action='store_true', default=False,
         help='Mark new comment as private')
 
+    _parser_add_field_passthrough_opts(p)
+
 
 def _setup_action_login_parser(subparsers):
     usage = 'bugzilla login [--api-key] [username [password]]'
@@ -1172,6 +1177,8 @@ def _do_set_attach(bz, opt, parser):
         kwargs["is_private"] = True
     desc = opt.desc or os.path.basename(fileobj.name)
 
+    _merge_field_opts(kwargs, opt.fields, opt.field_jsons, parser)
+
     # Upload attachments
     for bugid in opt.ids:
         attid = bz.attachfile(bugid, fileobj, desc, **kwargs)
 
@@ -0,0 +1,9 @@
+(['123456'],
+ 'STRIPPED-BY-TESTSUITE',
+ {'content_type': 'text/plain',
+  'file_name': 'bz-attach-get1.txt',
+  'flags': [{'name': 'review',
+             'requestee': 'crobinso@redhat.com',
+             'status': '-'}],
+  'is_obsolete': '1',
+  'summary': 'bz-attach-get1.txt'})
@@ -49,6 +49,18 @@ def test_attach(run_cli):
     out = run_cli(cmd, fakebz, stdin=attachcontent)
     assert "Created attachment 1557949 on bug 123456" in out
 
+    # Test --field passthrough
+    cmd = "bugzilla attach 123456 --file=%s " % attachfile
+    cmd += "--field=is_obsolete=1 "
+    cmd += "--field-json "
+    cmd += ('\'{"flags": [{"name": "review"'
+            ', "requestee": "crobinso@redhat.com", "status": "-"}]}\'')
+    fakebz = tests.mockbackend.make_bz(
+        bug_attachment_create_args="data/mockargs/test_attach3.txt",
+        bug_attachment_create_return={'ids': [1557949]})
+    out = run_cli(cmd, fakebz)
+    assert "Created attachment 1557949 on bug 123456" in out
+
 
 def _test_attach_get(run_cli):
     # Hit error when using ids with --get*