Changeset 3773

Timestamp:

11/27/07 03:24:40 (8 months ago)

Author:

deets

Message:

fixed #1501 & #1620

Files:

• branches/1.0/turbogears/command/quickstart.py (modified) (3 diffs)

branches/1.0/turbogears/command/quickstart.py

@@ -101 +101 @@
-
-
+def get_requirement(name):
+    dist = pkg_resources.get_distribution("TurboGears")
+    with_reqs = set(dist.requires((name,)))
+    without_reqs = set(dist.requires())
+    reqs = with_reqs - without_reqs
+    try:
+        return [r for r in reqs if r.project_name.lower() == name][0]
+    except IndexError:
+        raise ValueError("Did not find matching %s requirement in the TurboGears setup.py:extras_require." % name)
+
+
-class quickstart:
-    "Implementation of quickstart."
@@ -227 +238 @@
-        # it's extracted from our own requirements, so looking
-        # them up must be in sync (there must be the extras_require named sqlobject/sqlalchemy)
-        def get_requirement(name):
-            dist = pkg_resources.get_distribution("TurboGears")
-            with_reqs = set(dist.requires((name,)))
-            without_reqs = set(dist.requires())
-            reqs = with_reqs - without_reqs
-            try:
-                return [r for r in reqs if r.project_name.lower() == name][0]
-            except IndexError:
-                raise ValueError("Did not find matching %s requirement in the TurboGears setup.py:extras_require." % name)
-
-        if self.sqlobject:
-            sqlobjectversion = str(get_requirement('sqlobject'))
@@ -359 +360 @@
-        cmd_args.append("identity=%s" % self.identity)
-        cmd_args.append("package=%s" % self.package)
-
-        # set the exact ORM-version for the proper requirements
+        # it's extracted from our own requirements, so looking
+        # them up must be in sync (there must be the extras_require named sqlobject/sqlalchemy)
-        if self.sqlobject:
-
-
-
-
+
-            cmd_args.append("sqlobjectversion=%s" % sqlobjectversion)
-
-        if self.sqlalchemy:
-"SQLAlchemy"
+str(get_requirement('sqlalchemy'))
-            cmd_args.append("sqlalchemyversion=%s" % sqlalchemyversion)
-