From ccc617e97e7041e439cafa2a4400c335825a9820 Mon Sep 17 00:00:00 2001
From: Steven Zeck <steven.zeck@gmail.com>
Date: Wed, 15 Nov 2017 13:34:25 -0600
Subject: [PATCH 1/3] Add MagicPython grammar to python language

---
 src/languages/python.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/languages/python.coffee b/src/languages/python.coffee
index b8d8f4d..46e9463 100644
--- a/src/languages/python.coffee
+++ b/src/languages/python.coffee
@@ -8,7 +8,8 @@ module.exports = {
   Supported Grammars
   ###
   grammars: [
-    "Python"
+    "Python",
+    "MagicPython"
   ]
 
   ###

From b91fa81ca442f811dde3e6f790910a31fe3c9797 Mon Sep 17 00:00:00 2001
From: Steven Zeck <steven.zeck@gmail.com>
Date: Wed, 15 Nov 2017 14:53:04 -0600
Subject: [PATCH 2/3] Update changelog and other docs

---
 CHANGELOG.md     | 2 +-
 README.md        | 2 +-
 src/options.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e79819..509f883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Next
-- ...
+- Add support for MagicPython grammar [#1851](https://github.com/Glavin001/atom-beautify/issues/1851)
 
 # v0.30.6 (2017-10-30)
 - See [#645](https://github.com/Glavin001/atom-beautify/issues/645). Add support for Terraform fmt.
diff --git a/README.md b/README.md
index c47e015..efc62f7 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ See [all supported options in the documentation at  `docs/options.md`](docs/opti
 | Perl | `Perl`, `Perl 6` |`.pl`, `.PL`, `.pm`, `.pod`, `.t` | **[`Perltidy`](http://perltidy.sourceforge.net/)** |
 | PHP | `PHP` |`.php`, `.module`, `.inc` | **[`PHP-CS-Fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer)**, [`PHPCBF`](http://php.net/manual/en/install.php), [`hh_format`](http://hhvm.com/) |
 | Puppet | `Puppet` |`.pp` | **[`puppet-lint`](http://puppet-lint.com/)** |
-| Python | `Python` |`.py` | **[`autopep8`](https://github.com/hhatto/autopep8)**, [`pybeautifier`](https://github.com/guyskk/pybeautifier), [`yapf`](https://github.com/google/yapf) |
+| Python | `Python`, `MagicPython` |`.py` | **[`autopep8`](https://github.com/hhatto/autopep8)**, [`pybeautifier`](https://github.com/guyskk/pybeautifier), [`yapf`](https://github.com/google/yapf) |
 | R | `R` |`.r`, `.R` | **[`formatR`](https://github.com/yihui/formatR)** |
 | Riot.js | `Riot.js`, `HTML (Riot Tag)` |`.tag` | **[`Pretty Diff`](https://github.com/prettydiff/prettydiff)** |
 | Ruby | `Ruby`, `Ruby on Rails` |`.rb` | **[`Rubocop`](https://github.com/bbatsov/rubocop)**, [`Ruby Beautify`](https://github.com/erniebrodeur/ruby-beautify) |
diff --git a/src/options.json b/src/options.json
index 0eca25e..84c4313 100644
--- a/src/options.json
+++ b/src/options.json
@@ -6051,7 +6051,8 @@
       "yapf"
     ],
     "grammars": [
-      "Python"
+      "Python",
+      "MagicPython"
     ],
     "extensions": [
       "py"

From 217e193aef80aac8a398e3e3f47bb898c1a09317 Mon Sep 17 00:00:00 2001
From: Steven Zeck <steven.zeck@gmail.com>
Date: Thu, 16 Nov 2017 00:22:47 -0600
Subject: [PATCH 3/3] Install aspcud on Linux CI build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0b2e4ca..4d6263a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,7 @@ addons:
     - ocaml
     - camlp4
     - opam
+    - aspcud
     - php5-cli
     - golang