summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/conf.py2
-rw-r--r--module/AddonManager.py4
-rw-r--r--module/config/ConfigManager.py2
-rw-r--r--pavement.py4
-rwxr-xr-xpyload-cli.py (renamed from pyLoadCli.py)0
-rwxr-xr-xpyload.py (renamed from pyLoadCore.py)4
6 files changed, 7 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py
index fc1876368..258dab745 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ master_doc = 'index'
# General information about the project.
project = u'pyLoad'
-copyright = u'2012, pyLoad Team'
+copyright = u'2013, pyLoad Team'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/module/AddonManager.py b/module/AddonManager.py
index ccb617dc6..7d3852274 100644
--- a/module/AddonManager.py
+++ b/module/AddonManager.py
@@ -43,7 +43,7 @@ class AddonManager:
self.lock = RLock()
self.createIndex()
- # manage addons an config change
+ # manage addons on config change
self.addEvent("configChanged", self.manageAddons)
@lock
@@ -224,8 +224,6 @@ class AddonManager:
def addEventListener(self, plugin, func, event):
""" add the event to the list """
-
-
if plugin not in self.events:
self.events[plugin] = []
self.events[plugin].append((func, event))
diff --git a/module/config/ConfigManager.py b/module/config/ConfigManager.py
index 3ee66bc85..872ce2e00 100644
--- a/module/config/ConfigManager.py
+++ b/module/config/ConfigManager.py
@@ -98,7 +98,7 @@ class ConfigManager(ConfigParser):
self.values[user, section][option] = value
self.saveValues(user, section)
- if changed: self.core.evm.dispatchEvent("configChanged", value)
+ if changed: self.core.evm.dispatchEvent("configChanged", section, option, value)
return changed
def saveValues(self, user, section):
diff --git a/pavement.py b/pavement.py
index e6e789882..7919cf52a 100644
--- a/pavement.py
+++ b/pavement.py
@@ -70,8 +70,8 @@ setup(
#setup_requires=["setuptools_hg"],
entry_points={
'console_scripts': [
- 'pyLoadCore = pyLoadCore:main',
- 'pyLoadCli = pyLoadCli:main'
+ 'pyload = pyload:main',
+ 'pyload-cli = pyload-cli:main'
]},
zip_safe=False,
classifiers=[
diff --git a/pyLoadCli.py b/pyload-cli.py
index cf8fabd1a..cf8fabd1a 100755
--- a/pyLoadCli.py
+++ b/pyload-cli.py
diff --git a/pyLoadCore.py b/pyload.py
index 8f939b861..865f29c8f 100755
--- a/pyLoadCore.py
+++ b/pyload.py
@@ -165,9 +165,9 @@ class Core(object):
print "pyLoad v%s 2008-2013 the pyLoad Team" % CURRENT_VERSION
print ""
if sys.argv[0].endswith(".py"):
- print "Usage: python pyLoadCore.py [options]"
+ print "Usage: python pyload.py [options]"
else:
- print "Usage: pyLoadCore [options]"
+ print "Usage: pyload [options]"
print ""
print "<Options>"
print " -v, --version", " " * 10, "Print version to terminal"