kallithea Changeset - 5893414dea91

Changeset - 5893414dea91

Parent rev.

Child rev.

[Not reviewed]

beta

1 2 1

Marcin Kuzminski - 14 years ago 2012-05-17 00:53:20
marcin@python-works.com

renamed setup module into a setup_rhodecode.
setup is coliding with some namespaces

3 files changed with 3 insertions and 3 deletions:

rhodecode/config/setup_rhodecode.py

rhodecode/tests/functional/test_files.py

setup.py

0 comments (0 inline, 0 general)

rhodecode/config/setup_rhodecode.py

➞

Show inline comments

@@ @@ -75,13 +75,13 @@ class SetupCommand(AbstractInstallComman @@
         ep_name = conf.context.entry_point_name
         ep_group = conf.context.protocol
         dist = conf.context.distribution
         if dist is None:
             raise BadCommand(
                 "The section %r is not the application (probably a filter).  "
                 "You should add #section_name, where section_name is the "
                 "section that configures your application" % plain_section)
         installer = self.get_installer(dist, ep_group, ep_name)
         installer.setup_config(
             self, config_file, section, self.sysconfig_install_vars(installer))
         self.call_sysconfig_functions(
             'post_setup_hook', installer, config_file)
@@ \ No newline at end of file @@
             'post_setup_hook', installer, config_file)

rhodecode/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -184,25 +184,25 @@ class TestFilesController(TestController @@
 <option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
 </optgroup>""")
         response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
     def test_archival(self):
         self.log_user()
         for arch_ext, info in ARCHIVE_SPECS.items():
             short = '27cd5cce30c9%s' % arch_ext
             fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext
             filename = '%s-%s' % (HG_REPO, short)
-            response = self.app.get(url(controller='files',
             response = self.app.get(url(controller='files',
                                         action='archivefile',
                                         repo_name=HG_REPO,
                                         fname=fname))
             self.assertEqual(response.status, '200 OK')
             self.assertEqual(response.response._headers.items(),
              [('Pragma', 'no-cache'),
               ('Cache-Control', 'no-cache'),
               ('Content-Type', '%s; charset=utf-8' % info[0]),
               ('Content-Disposition', 'attachment; filename=%s' % filename),
+             ]
+            )

setup.py

➞

Show inline comments

@@ @@ -85,19 +85,19 @@ setup( @@
             ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
             ('public/**', 'ignore', None)]},
     zip_safe=False,
     paster_plugins=['PasteScript', 'Pylons'],
     entry_points="""
     [paste.app_factory]
     main = rhodecode.config.middleware:make_app
     [paste.app_install]
     main = pylons.util:PylonsInstaller
     [paste.global_paster_command]
-    setup-rhodecode=rhodecode.config.setup:SetupCommand
+    setup-rhodecode=rhodecode.config.setup_rhodecode:SetupCommand
     make-index=rhodecode.lib.indexers:MakeIndex
     make-rcext=rhodecode.config.rcextensions.make_rcextensions:MakeRcExt
     upgrade-db=rhodecode.lib.dbmigrate:UpgradeDb
     celeryd=rhodecode.lib.celerypylons.commands:CeleryDaemonCommand
     """,
+)

0 comments (0 inline, 0 general)