Fix missing x token for string formatting

Author: sdispater

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Fixed `from_format()` not recognizing input strings when the specified pattern had escaped elements.
+- Fixed missing `x` token for string formatting.
 
 
 ## [2.0.3] - 2018-07-30

pendulum/formatting/formatter.py

@@ -37,7 +37,23 @@
 
 class Formatter:
 
-    _TOKENS = "\[([^\[]*)\]|\\\(.)|" "(" "Mo|MM?M?M?" "|Do|DDDo|DD?D?D?|ddd?d?|do?" "|E{1,4}" "|w[o|w]?|W[o|W]?|Qo?" "|YYYY|YY|Y" "|gg(ggg?)?|GG(GGG?)?" "|a|A" "|hh?|HH?|kk?" "|mm?|ss?|S{1,9}" "|x|X" "|zz?|ZZ?" "|LTS|LT|LL?L?L?" ")"
+    _TOKENS = (
+        "\[([^\[]*)\]|\\\(.)|"
+        "("
+        "Mo|MM?M?M?"
+        "|Do|DDDo|DD?D?D?|ddd?d?|do?"
+        "|E{1,4}"
+        "|w[o|w]?|W[o|W]?|Qo?"
+        "|YYYY|YY|Y"
+        "|gg(ggg?)?|GG(GGG?)?"
+        "|a|A"
+        "|hh?|HH?|kk?"
+        "|mm?|ss?|S{1,9}"
+        "|x|X"
+        "|zz?|ZZ?"
+        "|LTS|LT|LL?L?L?"
+        ")"
+    )
 
     _FORMAT_RE = re.compile(_TOKENS)
 
@@ -106,6 +122,7 @@ class Formatter:
         "SSSSSS": lambda dt: "{:06d}".format(dt.microsecond),
         # Timestamp
         "X": lambda dt: "{:d}".format(dt.int_timestamp),
+        "x": lambda dt: "{:d}".format(dt.int_timestamp * 1000 + dt.microsecond // 1000),
         # Timezone
         "zz": lambda dt: "{}".format(dt.tzname() if dt.tzinfo is not None else ""),
         "z": lambda dt: "{}".format(dt.timezone_name or ""),

tests/formatting/test_formatter.py

@@ -209,6 +209,14 @@ def test_timestamp():
     assert f.format(d.add(days=1), "X") == "86400"
 
 
+def test_timestamp_milliseconds():
+    f = Formatter()
+    d = pendulum.datetime(1970, 1, 1)
+    assert f.format(d, "x") == "0"
+    assert f.format(d.add(days=1), "x") == "86400000"
+    assert f.format(d.add(days=1, microseconds=129123), "x") == "86400129"
+
+
 def test_date_formats():
     f = Formatter()
     d = pendulum.datetime(2016, 8, 28, 7, 3, 6, 123456)