Skip to content
Prev Previous commit
Merge remote-tracking branch 'reference/master' into feature/ipaddres…
…s-fix

Conflicts:
	docs/api-guide/fields.md
  • Loading branch information
xordoquy committed Jun 4, 2015
commit dee5fb56479edc05cd0dcc827607696e58710eda
9 changes: 9 additions & 0 deletions docs/api-guide/fields.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ A field that ensures the input is a valid UUID string. The `to_internal_value` m

"de305d54-75b4-431b-adb2-eb6b9e546013"

**Signature:** `UUIDField(format='hex_verbose')`

- `format`: Determines the representation format of the uuid value
- `'hex_verbose'` - The cannoncical hex representation, including hyphens: `"5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
- `'hex'` - The compact hex representation of the UUID, not including hyphens: `"5ce0e9a55ffa654bcee01238041fb31a"`
- `'int'` - A 128 bit integer representation of the UUID: `"123456789012312313134124512351145145114"`
- `'urn'` - RFC 4122 URN representation of the UUID: `"urn:uuid:5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
Changing the `format` parameters only affects representation values. All formats are accepted by `to_internal_value`

## IPAddressField

A field that ensures the input is a valid IPv4 or IPv6 string.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.