2.0.3

Solve pfcf bugs

Author: eanorambuena

pyforchange/pfcf/code.py

@@ -1,12 +1,17 @@
 from pyforchange.pfcf.utils import *
 import pyforchange.pfcf.codel.qiskit as q
+import pyforchange.pfcf.codel.wolfram as w
 
 def codef(codel: str,text: str): #code function
   form="_compile.py"
   f=open(codel+form,"w")
   t=""
   if codel=="qiskit":
     t=qiskit(text)
+  elif codel=="wolfram":
+    t=wolfram(text)
+  elif codel=="python":
+    t=text
   f.write(t)
   f.close()
 
@@ -61,3 +66,36 @@ def qiskit(text: str):
       Q+=1
   return T
 
+def wolfram(text: str):
+  T=""
+  T+="from wolframclient.evaluation import WolframLanguageSession\n"
+  T+="from wolframclient.language import wl, wlexpr\n"
+  T+="session = WolframLanguageSession()\n"
+  s=0
+  command=""
+  param=""
+  t=""
+  for i in text:
+    if i==",":
+      pass
+    elif s==1: #settings mode on
+      if i!=" ":
+        command+=i
+      else:
+        s=2
+    elif s==2:
+      if i!=" " and i!="\n":
+        param+=i
+      else:
+        T+=w.settings(command,param)
+        command=""
+        param=""
+        s=0
+    elif i=="$":
+      s=1
+    elif i=="\n" and t!="":
+      T+="session.evaluate(wlexpr(\'"+t+"\'))\n"
+      t=""
+    elif i!="\n":
+      t+=i
+  return T

pyforchange/pfcf/codel/__init__.py

@@ -1 +0,0 @@
-from pyforchange.pfcf.codel.qiskit import *

pyforchange/pfcf/codel/qiskit.py

@@ -1,5 +1,4 @@
 from pyforchange.pfcf.utils import *
-
 def settings(command: str,param):
   t=""
   if command=="host":

pyforchange/pfcf/codel/wolfram.py

@@ -0,0 +1,5 @@
+def settings(command: str,param):
+  t=""
+  if command=="inject":
+    t=param+"\n"
+  return t

pyforchange/pfcf/read.py

@@ -7,7 +7,6 @@ def read(name: str,printYesOrNo: int =1,returnText: int =0):
   t=""
   code=""
   codel="" #code language
-  codel2=""
   m=0
   codem=0
   p=Parser()
@@ -31,16 +30,15 @@ def read(name: str,printYesOrNo: int =1,returnText: int =0):
       elif j=="<" or j==">":
         codem+=1
       elif codem==4:
-        if codel2==codel:
+        try:
           codef(codel,code)
           codem==0
           codel=""
-          codel2=""
-        else:
+          code=""
+        except:
           print("Sintax error")
       elif codem==3:
-        if j!="/":
-          codel2+=j
+        pass
       elif codem==2:
         code+=j
       elif codem==1: #Code mode on

pyforchange/pfcf/utils.py

@@ -53,4 +53,4 @@ def execute(name):
     t="/usr/bin/python "+name+".py"
     os.system(t)
   except:
-    print("Execute error in: "+"/usr/bin/python "+name+".py")
+    print("Execute error in: "+"/usr/bin/python "+name+".py")

setup.py

@@ -6,17 +6,17 @@
 
 setup(
     name = 'pyforchange',
-  packages = ['pyforchange'], # this must be the same as the name above   
+    packages=find_packages(), 
     include_package_data=True,    # muy importante para que se incluyan archivos sin extension .py
-    version = '2.0.2',
+    version = '2.0.3',
     description ="pythonforchange.github.io",
     long_description=README1,
     long_description_content_type='text/markdown',
     author = 'Python For Change',
     author_email = 'pythonforchange@gmail.com',
     license="MIT",
     url = 'https://github.com/PythonForChange/pyforchange', # use the URL to the github repo
-    download_url = 'https://github.com/PythonForChange/pyforchange/archive/refs/tags/v2.0.2.tar.gz',
-    keywords = ['covid', 'logging', 'language', 'plot', 'life'],
-    classifiers = ['Programming Language :: Python :: 3'],
+    download_url = 'https://github.com/PythonForChange/pyforchange/archive/refs/tags/v2.0.3.tar.gz',
+    keywords = ['covid', 'qiskit', 'language', 'plot', 'files'],
+    classifiers = ['Programming Language :: Python :: 3','Intended Audience :: Developers','License :: OSI Approved :: MIT License','Natural Language :: English','Operating System :: OS Independent','Topic :: Text Processing :: Markup :: PFCF'],
     )