Created
March 15, 2011 14:09
-
-
Save fredrik/870760 to your computer and use it in GitHub Desktop.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cli/parser.py b/cli/parser.py | |
index ec1a435..7d7d48d 100644 | |
--- a/cli/parser.py | |
+++ b/cli/parser.py | |
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
See the License for the specific language governing permissions and | |
limitations under the License.""" | |
-from graphite.thirdparty.pyparsing import * | |
+from pyparsing import * | |
grammar = Forward() | |
diff --git a/render/grammar.py b/render/grammar.py | |
index d9a1ce1..ee937c5 100644 | |
--- a/render/grammar.py | |
+++ b/render/grammar.py | |
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
See the License for the specific language governing permissions and | |
limitations under the License.""" | |
-from graphite.thirdparty.pyparsing import * | |
+from pyparsing import * | |
ParserElement.enablePackrat() | |
grammar = Forward() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
graphite-web version 0.9.7c as present on pypi does not manage to bring in the graphite.thirdparty module, resulting in bork.
the cure (one of them) is to install pyparsing separately (pip install pyparsing) and fix graphite-web's imports by applying this patch.