Merge pull request #843 from edx/adam/calc-refactor

Adam/calc refactor
openedx · Aug 30, 2013 · 8d7d819 · 8d7d819
2 parents ea36b83 + 5b0194d
commit 8d7d819
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/common/lib/calc/calc/__init__.py b/common/lib/calc/calc/__init__.py
@@ -0,0 +1,6 @@
+"""
+Ideally, we wouldn't need to pull in all the calc symbols here,
+but courses were using 'import calc', so we need this for
+backwards compatibility
+"""
+from calc import *
diff --git a/common/lib/calc/calc.py → common/lib/calc/calc/calc.py b/common/lib/calc/calc.py → common/lib/calc/calc/calc.py
@@ -9,7 +9,7 @@
 import numbers
 import numpy
 import scipy.constants
-import calcfunctions
+import functions
 
 from pyparsing import (
     Word, Literal, CaselessLiteral, ZeroOrMore, MatchFirst, Optional, Forward,
@@ -20,9 +20,9 @@
     'sin': numpy.sin,
     'cos': numpy.cos,
     'tan': numpy.tan,
-    'sec': calcfunctions.sec,
-    'csc': calcfunctions.csc,
-    'cot': calcfunctions.cot,
+    'sec': functions.sec,
+    'csc': functions.csc,
+    'cot': functions.cot,
     'sqrt': numpy.sqrt,
     'log10': numpy.log10,
     'log2': numpy.log2,
@@ -31,24 +31,24 @@
     'arccos': numpy.arccos,
     'arcsin': numpy.arcsin,
     'arctan': numpy.arctan,
-    'arcsec': calcfunctions.arcsec,
-    'arccsc': calcfunctions.arccsc,
-    'arccot': calcfunctions.arccot,
+    'arcsec': functions.arcsec,
+    'arccsc': functions.arccsc,
+    'arccot': functions.arccot,
     'abs': numpy.abs,
     'fact': math.factorial,
     'factorial': math.factorial,
     'sinh': numpy.sinh,
     'cosh': numpy.cosh,
     'tanh': numpy.tanh,
-    'sech': calcfunctions.sech,
-    'csch': calcfunctions.csch,
-    'coth': calcfunctions.coth,
+    'sech': functions.sech,
+    'csch': functions.csch,
+    'coth': functions.coth,
     'arcsinh': numpy.arcsinh,
     'arccosh': numpy.arccosh,
     'arctanh': numpy.arctanh,
-    'arcsech': calcfunctions.arcsech,
-    'arccsch': calcfunctions.arccsch,
-    'arccoth': calcfunctions.arccoth
+    'arcsech': functions.arcsech,
+    'arccsch': functions.arccsch,
+    'arccoth': functions.arccoth
 }
 DEFAULT_VARIABLES = {
     'i': numpy.complex(0, 1),

diff --git a/common/lib/calc/calcfunctions.py → common/lib/calc/calc/functions.py b/common/lib/calc/calcfunctions.py → common/lib/calc/calc/functions.py
diff --git a/common/lib/calc/preview.py → common/lib/calc/calc/preview.py b/common/lib/calc/preview.py → common/lib/calc/calc/preview.py
diff --git a/common/lib/calc/tests/test_calc.py → common/lib/calc/calc/tests/test_calc.py b/common/lib/calc/tests/test_calc.py → common/lib/calc/calc/tests/test_calc.py
diff --git a/common/lib/calc/tests/test_preview.py → common/lib/calc/calc/tests/test_preview.py b/common/lib/calc/tests/test_preview.py → common/lib/calc/calc/tests/test_preview.py
@@ -4,7 +4,7 @@
 """
 
 import unittest
-import preview
+from calc import preview
 import pyparsing
 
 

diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py
@@ -2,8 +2,8 @@
 
 setup(
     name="calc",
-    version="0.1.1",
-    py_modules=["calc"],
+    version="0.2",
+    packages=["calc"],
     install_requires=[
         "pyparsing==1.5.6",
         "numpy",

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
@@ -49,7 +49,7 @@
 
 from .registry import TagRegistry
 from chem import chemcalc
-from preview import latex_preview
+from calc.preview import latex_preview
 import xqueue_interface
 from datetime import datetime