diff options
| author | Pepper <pepper@scannerjammer.com> | 2016-02-04 03:24:32 -0500 |
|---|---|---|
| committer | Pepper <pepper@scannerjammer.com> | 2016-02-04 03:24:32 -0500 |
| commit | 1097c275b727d4c55d6243aef3c6849e8f7d126f (patch) | |
| tree | 32bd76f68073e5634d574c63683a7962096e6060 | |
| parent | 57ab941fcaa47605e49367bfea4ac066d726a9ca (diff) | |
| parent | 488e3740c904270226dcc40afbc78d134311c0ba (diff) | |
Merge branch 'master' of ghghgh.us:photoblaster/photoblaster
| -rwxr-xr-x | photoblaster/modules/pbgenerate.py | 3 | ||||
| -rw-r--r-- | run_module_examples.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/photoblaster/modules/pbgenerate.py b/photoblaster/modules/pbgenerate.py index 1cab3fd..d857562 100755 --- a/photoblaster/modules/pbgenerate.py +++ b/photoblaster/modules/pbgenerate.py @@ -2,7 +2,6 @@ from photoblaster.config import BIN_CONVERT, OUTPUT_IMAGE_TYPES,\ DEFAULT_FINALFORMAT from photoblaster.modules import Pb -_DEFAULT_TAG = "PbGenerate" _GRAVITY_PARAMS = [ "NorthWest", "North", "NorthEast", "West", @@ -118,7 +117,7 @@ class PbGenerate(Pb): """Used for the database tag column. Allows for tracking of the type of overlay method used.""" - self.tag = _DEFAULT_TAG + self.tag = self.__class__.__name__ if self.params.background: self.tag = "%s:%s" % (self.tag, str(self.params.compose)) elif self.params.transparent: diff --git a/run_module_examples.py b/run_module_examples.py index 838934d..82d35ea 100644 --- a/run_module_examples.py +++ b/run_module_examples.py @@ -7,4 +7,4 @@ for cls in Pb.__subclasses__(): instance = cls.example_run() instance.file_s3move() print instance.file_dict() - instance.db_send(); + instance.db_send() |