1 files changed, 9 insertions, 9 deletions
diff --git a/modules/language/python/compile.scm b/modules/language/python/compile.scm
index 7afbc5b..354b39d 100644
--- a/modules/language/python/compile.scm
+++ b/modules/language/python/compile.scm
@@ -81,18 +81,18 @@
     (eval-when (compile)
       (catch #t
         (lambda ()
-          (if (not p) (reload-module (resolve-module l)))
+          (if (not p) (reload-module (resolve-module 'l)))
           (use-modules a ...))
         (lambda x
           #f)))
     (eval-when (eval load)
       (catch #t
         (lambda ()
-          (if (not p) (reload-module (resolve-module l)))
+          (if (not p) (reload-module (resolve-module 'l)))
           (use-modules a ...))
         (lambda x
           (raise (ImportError ((@ (guile) format)
-                               #f "failed to import ~a ~a" l x))))))))
+                               #f "failed to import ~a ~a" 'l x))))))))
 
 (define level (make-fluid 0))
 
@@ -139,7 +139,7 @@
     code ...))
 
 (define (get-warns)
-   (list 'quote (fluid-ref (@@ (system base message) %dont-warn-list))))
+   (list (G 'quote) (fluid-ref (@@ (system base message) %dont-warn-list))))
 
 (define (dont-warn v)
   (catch #t
@@ -699,7 +699,7 @@
       ("&="  (G 'logand))
       ("|="  (G 'logior))
       ("^="  (G 'logxor))
-      ("**=" (G 'expt))
+      ("**=" (N 'expt))
       ("<<=" (C '<<))
       (">>=" (C '>>))
       ("//=" (G 'floor-quotient))))
@@ -847,7 +847,7 @@
           (fast?   (not (eq? vf 'super))))
      (define (pw x)
        (if **
-           `(,(G expt) ,x ,(exp vs **))
+           `(,(N 'expt) ,x ,(exp vs **))
            x))
      (pw
       (let ((trailer (get-addings vs trailer fast?)))
@@ -1066,14 +1066,14 @@
                 (lambda () (Module (reverse l) (reverse xl)) #t)
                 (lambda x #f))))
        (if (eq? ? #t) (for-each dont-warn (get-exported-symbols l)))       
-       `(,(C 'use) ,? ',l ,l))))
+       `(,(C 'use) ,? ,l ,l))))
   
   ((_ (#:from (() . nm)  l))
    ;; Make sure to load the module in
    (let* ((xl  (map (lambda (nm) (exp vs nm)) nm))
           (ll `(language python module ,@xl)))
      
-     `(,(C 'use) #t (,(G 'quote) ())
+     `(,(C 'use) #t ()
        (,ll
         #:select
         ,(map (lambda (x)
@@ -1381,7 +1381,7 @@
          (,(G 'let) ((,o (,(G 'if) (,(O 'pyclass?) ,c)
                        (,c)
                        ,c)))
-           (,(O 'set) ,o '__cause__ ,(exp vs from))
+           (,(O 'set) ,o (,(G 'quote) __cause__) ,(exp vs from))
            ,o))))))