Changeset 3573

Timestamp:

07/17/13 22:17:23 (11 years ago)

Author:

jerome

Message:

Removed all references to psyco

Location:

pkpgcounter/trunk

Files:

• pkpgpdls/inkcoverage.py (modified) (3 diffs)
• pkpgpdls/pcl345.py (modified) (1 diff)
• pkpgpdls/pdlparser.py (modified) (1 diff)
• README (modified) (1 diff)
• setup.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -33 +33 @@
 
 def getPercent(img, nbpix) :
-    """Extracts the percents per color component from a picture.
-
-       Faster without Psyco on my own machine.
-    """
+    """Extracts the percents per color component from a picture."""
     result = {}
     bands = img.split()
@@ -47 +44 @@
 
        PIL doesn't produce useable CMYK for our algorithm, so we use the algorithm from PrintBill.
-       Psyco speeds this function up by around 2.5 times on my computer.
     """
     if img.mode != "RGB" :
@@ -105 +101 @@
     colorspace = colorspace.upper()
     computation = globals()["getPercent%s" % colorspace]
-    if colorspace in ("CMYK", "GC") : # faster with psyco on my machine
-        try :
-            import psyco
-        except ImportError :
-            pass
-        else :
-            psyco.bind(getPercentCMYK)
-
     index = 0
     try :

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -102 +102 @@
             firstblock = self.firstblock[pos:]
             if firstblock.startswith("\033E\033") or \
+               firstblock.startswith("\033(") or \
                firstblock.startswith("\033%1BBPIN;") or \
                ((pos == 11000) and firstblock.startswith("\033")) or \

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -58 +58 @@
         else :
             self.logdebug("Input file is in the '%s' file format." % self.format)
-        try :
-            import psyco
-        except ImportError :
-            pass # Psyco is not installed
-        else :
-            # Psyco is installed, tell it to compile
-            # the CPU intensive methods : PCL and PCLXL
-            # parsing will greatly benefit from this.
-            psyco.bind(self.getJobSize)
         self.infile = open(self.filename, self.openmode)
         # self.logdebug("Opened %s in '%s' mode." % (self.filename, self.openmode))

pkpgcounter/trunk/README

@@ -155 +155 @@
   information you think is relevant.
 
-  If pkpgcounter complain about your system lacking the Python Psyco module,
-  please consider installing it to speedup file parsing. However, don't forget
-  that Psyco currently only runs on the 32 bits x86 platform, so no need to
-  install it if you've got another system type.
-
 =============================================================================
 

pkpgcounter/trunk/setup.py

@@ -39 +39 @@
     sys.exit(-1)
 
-try :
-    import psyco
-except ImportError :
-    sys.stderr.write("WARN: If you are running on a 32 Bits x86 platform, you should install the Python Psyco module if possible, this would greatly speedup parsing. NB : Psyco doesn't work on other platforms, so don't worry if you're in this case.\n")
-
 sys.path.insert(0, "pkpgpdls")
 from pkpgpdls.version import __version__, __doc__